From ff1ea8549a9740dcf16da2699eb2791710682eca Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Mon, 2 Oct 2023 09:45:38 +0100
Subject: [PATCH] userpage: register routes on reverse proxy subfolder

fixes #289.
---
 router.go  | 39 +++++++++++++++++++--------------------
 ts/user.ts |  1 -
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/router.go b/router.go
index e2426cc..875ad20 100644
--- a/router.go
+++ b/router.go
@@ -160,12 +160,11 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
 
 	api := router.Group("/", app.webAuth())
 
-	var user *gin.RouterGroup
-	if userPageEnabled {
-		user = router.Group("/my", app.userAuth())
-	}
-
 	for _, p := range routePrefixes {
+		var user *gin.RouterGroup
+		if userPageEnabled {
+			user = router.Group(p+"/my", app.userAuth())
+		}
 		router.POST(p+"/logout", app.Logout)
 		api.DELETE(p+"/users", app.DeleteUsers)
 		api.GET(p+"/users", app.GetUsers)
@@ -234,22 +233,22 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
 		}
 
 		if userPageEnabled {
-			user.GET(p+"/details", app.MyDetails)
-			user.POST(p+"/contact", app.SetMyContactMethods)
-			user.POST(p+"/logout", app.LogoutUser)
-			user.POST(p+"/email", app.ModifyMyEmail)
-			user.GET(p+"/discord/invite", app.MyDiscordServerInvite)
-			user.GET(p+"/pin/:service", app.GetMyPIN)
-			user.GET(p+"/discord/verified/:pin", app.MyDiscordVerifiedInvite)
-			user.GET(p+"/telegram/verified/:pin", app.MyTelegramVerifiedInvite)
-			user.POST(p+"/matrix/user", app.MatrixSendMyPIN)
-			user.GET(p+"/matrix/verified/:userID/:pin", app.MatrixCheckMyPIN)
-			user.DELETE(p+"/discord", app.UnlinkMyDiscord)
-			user.DELETE(p+"/telegram", app.UnlinkMyTelegram)
-			user.DELETE(p+"/matrix", app.UnlinkMyMatrix)
-			user.POST(p+"/password", app.ChangeMyPassword)
+			user.GET("/details", app.MyDetails)
+			user.POST("/contact", app.SetMyContactMethods)
+			user.POST("/logout", app.LogoutUser)
+			user.POST("/email", app.ModifyMyEmail)
+			user.GET("/discord/invite", app.MyDiscordServerInvite)
+			user.GET("/pin/:service", app.GetMyPIN)
+			user.GET("/discord/verified/:pin", app.MyDiscordVerifiedInvite)
+			user.GET("/telegram/verified/:pin", app.MyTelegramVerifiedInvite)
+			user.POST("/matrix/user", app.MatrixSendMyPIN)
+			user.GET("/matrix/verified/:userID/:pin", app.MatrixCheckMyPIN)
+			user.DELETE("/discord", app.UnlinkMyDiscord)
+			user.DELETE("/telegram", app.UnlinkMyTelegram)
+			user.DELETE("/matrix", app.UnlinkMyMatrix)
+			user.POST("/password", app.ChangeMyPassword)
 			if app.config.Section("user_page").Key("referrals").MustBool(false) {
-				user.GET(p+"/referral", app.GetMyReferral)
+				user.GET("/referral", app.GetMyReferral)
 			}
 		}
 	}
diff --git a/ts/user.ts b/ts/user.ts
index d11dfeb..00b105c 100644
--- a/ts/user.ts
+++ b/ts/user.ts
@@ -556,7 +556,6 @@ changePasswordButton.addEventListener("click", () => {
         }
     });
 });
-// FIXME: Submit & Validate
 
 document.addEventListener("details-reload", () => {
     _get("/my/details", null, (req: XMLHttpRequest) => {