Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: force login subdomain for signup process (#518)

Guilherme Oenningd0b7e10b4ad1
diff --git a/app/handlers/signup.go b/app/handlers/signup.go
index 4eda9124b..070ae8bae 100644
--- a/app/handlers/signup.go
+++ b/app/handlers/signup.go
@@ -106,6 +106,11 @@ func SignUp() web.HandlerFunc {
if tenant != nil {
return c.Redirect("/")
}
+ } else {
+ baseURL := webutil.GetOAuthBaseURL(c)
+ if !strings.HasPrefix(c.Request.URL.String(), baseURL) {
+ return c.Redirect(baseURL + "/signup")
+ }
}
return c.Page(web.Props{
diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.go
index 47c6e1bb6..7b8eba018 100644
--- a/app/handlers/signup_test.go
+++ b/app/handlers/signup_test.go
@@ -21,11 +21,25 @@ func TestSignUpHandler_MultiTenant(t *testing.T) {
RegisterT(t)
server, _ := mock.NewServer()
- code, _ := server.Execute(handlers.SignUp())
+ code, _ := server.
+ WithURL("http://login.test.fider.io/signup").
+ Execute(handlers.SignUp())
Expect(code).Equals(http.StatusOK)
}
+func TestSignUpHandler_MultiTenant_WrongURL(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ code, response := server.
+ WithURL("http://demo.test.fider.io/signup").
+ Execute(handlers.SignUp())
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("http://login.test.fider.io/signup")
+}
+
func TestSignUpHandler_SingleTenant_NoTenants(t *testing.T) {
RegisterT(t)