From 129699275202689e437aef245f303cbdc6181f72 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Thu, 27 Nov 2025 18:10:28 +0000 Subject: [PATCH] userpage: fix login saving, url rewriting on subpath Fixes #437. --- ts/user.ts | 2 +- user-auth.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ts/user.ts b/ts/user.ts index 0ebbe5a..006a9f9 100644 --- a/ts/user.ts +++ b/ts/user.ts @@ -25,7 +25,7 @@ interface userWindow extends GlobalWindow { declare var window: userWindow; // const basePath = window.location.pathname.replace("/password/reset", ""); -const basePath = window.pages.MyAccount; +const basePath = window.pages.Base + window.pages.MyAccount; const theme = new ThemeManager(document.getElementById("button-theme")); diff --git a/user-auth.go b/user-auth.go index d76140e..e3fe98c 100644 --- a/user-auth.go +++ b/user-auth.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "strings" "github.com/gin-gonic/gin" lm "github.com/hrfee/jfa-go/logmessages" @@ -68,9 +67,9 @@ func (app *appContext) getUserTokenLogin(gc *gin.Context) { host := app.ExternalDomainNoPort(gc) uri := "/my" // FIXME: This seems like a bad idea? I think it's to deal with people having Reverse proxy subfolder/URL base set to /accounts. - if strings.HasPrefix(gc.Request.RequestURI, PAGES.Base) { - uri = "/accounts/my" - } + // if strings.HasPrefix(gc.Request.RequestURI, PAGES.Base) { + // uri = "/accounts/my" + // } gc.SetCookie("user-refresh", refresh, REFRESH_TOKEN_VALIDITY_SEC, uri, host, true, true) gc.JSON(200, getTokenDTO{token}) }