Fix URL

diff --git a/src/jvmMain/kotlin/starshipfights/auth/providers.kt b/src/jvmMain/kotlin/starshipfights/auth/providers.kt
index b3599a1082a53046905d211f4bc4424870bfa1ae..d3d9221ac354dc50db315d9379143a19c9221dd1 100644 (file)
--- a/src/jvmMain/kotlin/starshipfights/auth/providers.kt
+++ b/src/jvmMain/kotlin/starshipfights/auth/providers.kt
@@ -494,7 +494,7 @@ class ProductionAuthProvider(private val discordLogin: DiscordLogin) : AuthProvi
        
        override fun installAuth(conf: Authentication.Configuration) {
                conf.oauth("auth-oauth-discord") {
-                       urlProvider = { discordLogin.redirectUrlOrigin.removeSuffix("/") + "/login/discord/callback" }
+                       urlProvider = { "https://starshipfights.net/login/discord/callback" }
                        providerLookup = {
                                OAuthServerSettings.OAuth2ServerSettings(
                                        name = "discord",

diff --git a/src/jvmMain/kotlin/starshipfights/info/view_tpl.kt b/src/jvmMain/kotlin/starshipfights/info/view_tpl.kt
index aed4f316455e96f96c6aeae5cd873a17a16d841d..f537fdd6061b495eb9e8c47da018e3d9487eaf8f 100644 (file)
--- a/src/jvmMain/kotlin/starshipfights/info/view_tpl.kt
+++ b/src/jvmMain/kotlin/starshipfights/info/view_tpl.kt
@@ -8,7 +8,7 @@ fun ApplicationCall.page(pageTitle: String? = null, navBar: List<NavItem>? = nul
        head {
                meta(charset = "utf-8")
                
-               metadata(pageData, url())
+               metadata(pageData, url { host = "starshipfights.net" })
                
                link(rel = "icon", type = "image/svg+xml", href = "/static/images/icon.svg")
                link(rel = "preconnect", href = "https://fonts.googleapis.com")

diff --git a/src/jvmMain/kotlin/starshipfights/server_conf.kt b/src/jvmMain/kotlin/starshipfights/server_conf.kt
index d84356f5618b88565997ce0f589f40d9bcd93423..c0a58833a7b9600a1bda9a5c657eae075b13d096 100644 (file)
--- a/src/jvmMain/kotlin/starshipfights/server_conf.kt
+++ b/src/jvmMain/kotlin/starshipfights/server_conf.kt
@@ -21,8 +21,6 @@ data class Configuration(
 
 @Serializable
 data class DiscordLogin(
-       val redirectUrlOrigin: String,
-       
        val clientId: String,
        //val clientPubKey: String,
        val clientSecret: String,