From: TheSaminator <TheSaminator@users.noreply.github.com>
Date: Sun, 20 Feb 2022 18:28:56 +0000 (-0500)
Subject: Fix URL
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=1fa16d7375118c7e1984480beb782a8e931a6f56;p=starship-fights

Fix URL
---

diff --git a/src/jvmMain/kotlin/starshipfights/auth/providers.kt b/src/jvmMain/kotlin/starshipfights/auth/providers.kt
index b3599a1..d3d9221 100644
--- 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 aed4f31..f537fdd 100644
--- 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 d84356f..c0a5883 100644
--- 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,