Open platform to collect and prioritize feedback
Improved redirect handling on oauth signin page (#1321) (#1322)
JimKnoxxe24c5832b6d3
diff --git a/app/middlewares/tenant.go b/app/middlewares/tenant.goindex 0aa3a3ed1..890875e43 100644--- a/app/middlewares/tenant.go+++ b/app/middlewares/tenant.go@@ -1,7 +1,11 @@package middlewaresimport (+ "path"+ "strings"+"net/http"+ "net/url""github.com/getfider/fider/app/models/enum""github.com/getfider/fider/app/models/query"@@ -107,6 +111,24 @@ func CheckTenantPrivacy() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c *web.Context) error {if c.Tenant().IsPrivate && !c.IsAuthenticated() {+ parsedURL, err := url.Parse(c.Request.URL.String())+ if err != nil {+ return c.Failure(err)+ }++ cleanPath := path.Clean(parsedURL.RequestURI())+ redirectTarget := ""+ if strings.HasPrefix(cleanPath, "/") &&+ cleanPath != "/" &&+ !strings.HasPrefix(cleanPath, "/signin") &&+ !strings.HasPrefix(cleanPath, "/signout") &&+ !strings.Contains(cleanPath, "..") {+ redirectTarget = cleanPath+ }++ if redirectTarget != "" {+ return c.Redirect("/signin?redirect=" + url.QueryEscape(redirectTarget))+ }return c.Redirect("/signin")}return next(c)diff --git a/public/pages/SignIn/SignIn.page.tsx b/public/pages/SignIn/SignIn.page.tsxindex cc17cabef..ac5392d8e 100644--- a/public/pages/SignIn/SignIn.page.tsx+++ b/public/pages/SignIn/SignIn.page.tsx@@ -45,6 +45,17 @@ export const SignInPage = () => {)}+ const getRedirectToUrl = () => {+ const fider = useFider()+ const redirect = new URLSearchParams(window.location.search).get("redirect")++ if (redirect && redirect.startsWith("/")) {+ return fider.settings.baseURL + redirect+ }++ return fider.settings.baseURL+ }+return (<div id="p-signin" className="page container w-max-6xl"><div className="h-20 text-center mb-4">@@ -52,7 +63,7 @@ export const SignInPage = () => {</div><div className="text-center w-max-4xl mx-auto mb-4">{fider.session.tenant.isPrivate ? <Private /> : <Locked />}</div>- <SignInControl onEmailSent={onEmailSent} useEmail={true} redirectTo={fider.settings.baseURL} />+ <SignInControl onEmailSent={onEmailSent} useEmail={true} redirectTo={getRedirectToUrl()} /><LegalNotice /></div>)