Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: harden security of OAuth (#444)

Guilherme Oenning0ee3f3524171
diff --git a/app/actions/actions_test.go b/app/actions/actions_test.go
index 2916563fb..8c4aec62d 100644
--- a/app/actions/actions_test.go
+++ b/app/actions/actions_test.go
@@ -8,7 +8,7 @@ import (
"github.com/getfider/fider/app/storage/inmemory"
)
-var jonSnowToken, _ = jwt.Encode(&jwt.OAuthClaims{
+var jonSnowToken, _ = jwt.Encode(jwt.OAuthClaims{
OAuthID: "123",
OAuthName: "Jon Snow",
OAuthEmail: "[email protected]",
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index c4e9bf208..7eb6f85f3 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -61,6 +61,9 @@ func routes(r *web.Engine) *web.Engine {
{
open.Get("/-/ui", handlers.Page("UI Toolkit", "A preview of Fider UI elements"))
open.Get("/signup/verify", handlers.VerifySignUpKey())
+ open.Get("/oauth/facebook/token", handlers.OAuthToken(oauth.FacebookProvider))
+ open.Get("/oauth/google/token", handlers.OAuthToken(oauth.GoogleProvider))
+ open.Get("/oauth/github/token", handlers.OAuthToken(oauth.GitHubProvider))
open.Use(middlewares.OnlyActiveTenants())
open.Get("/signin", handlers.SignInPage())
open.Get("/not-invited", handlers.NotInvitedPage())
@@ -70,8 +73,7 @@ func routes(r *web.Engine) *web.Engine {
open.Post("/api/signin", handlers.SignInByEmail())
}
- r.Use(middlewares.JwtGetter())
- r.Use(middlewares.JwtSetter())
+ r.Use(middlewares.User())
page := r.Group()
{
diff --git a/app/handlers/signin.go b/app/handlers/signin.go
index 1fbc4d0ca..54a5f208e 100644
--- a/app/handlers/signin.go
+++ b/app/handlers/signin.go
@@ -1,20 +1,19 @@
package handlers
import (
+ "fmt"
"net/http"
"net/url"
"strings"
"time"
- jwtgo "github.com/dgrijalva/jwt-go"
-
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/models"
- "github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/errors"
"github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/web"
+ "github.com/getfider/fider/app/pkg/web/util"
"github.com/getfider/fider/app/tasks"
)
@@ -24,19 +23,12 @@ type oauthUserProfile struct {
Email string
}
-// OAuthCallback handles OAuth callbacks
-func OAuthCallback(provider string) web.HandlerFunc {
+// OAuthToken exchanges Authorization Code for Authentication Token
+func OAuthToken(provider string) web.HandlerFunc {
return func(c web.Context) error {
-
- redirect := c.QueryParam("state")
- redirectURL, err := url.ParseRequestURI(redirect)
- if err != nil {
- return c.Failure(err)
- }
-
code := c.QueryParam("code")
if code == "" {
- return c.Redirect(redirect)
+ return c.Redirect(c.BaseURL())
}
oauthUser, err := c.Services().OAuth.GetProfile(c.AuthEndpoint(), provider, code)
@@ -44,87 +36,102 @@ func OAuthCallback(provider string) web.HandlerFunc {
return c.Failure(err)
}
- var claims jwtgo.Claims
- if redirectURL.Path != "/signup" {
+ users := c.Services().Users
+
+ user, err := users.GetByProvider(provider, oauthUser.ID.String())
+ if errors.Cause(err) == app.ErrNotFound && oauthUser.Email != "" {
+ user, err = users.GetByEmail(oauthUser.Email)
+ }
+ if err != nil {
+ if errors.Cause(err) == app.ErrNotFound {
+ if c.Tenant().IsPrivate {
+ return c.Redirect(c.BaseURL() + "/not-invited")
+ }
- var (
- tenant *models.Tenant
- err error
- )
- if env.IsSingleHostMode() {
- tenant, err = c.Services().Tenants.First()
+ user = &models.User{
+ Name: oauthUser.Name,
+ Tenant: c.Tenant(),
+ Email: oauthUser.Email,
+ Role: models.RoleVisitor,
+ Providers: []*models.UserProvider{
+ &models.UserProvider{
+ UID: oauthUser.ID.String(),
+ Name: provider,
+ },
+ },
+ }
+
+ err = users.Register(user)
+ if err != nil {
+ return c.Failure(err)
+ }
} else {
- tenant, err = c.Services().Tenants.GetByDomain(redirectURL.Hostname())
+ return c.Failure(err)
}
+ } else if !user.HasProvider(provider) {
+ err = users.RegisterProvider(user.ID, &models.UserProvider{
+ UID: oauthUser.ID.String(),
+ Name: provider,
+ })
if err != nil {
return c.Failure(err)
}
+ }
- c.Services().SetCurrentTenant(tenant)
- users := c.Services().Users
+ webutil.AddAuthUserCookie(c, user)
- user, err := users.GetByProvider(provider, oauthUser.ID.String())
- if errors.Cause(err) == app.ErrNotFound && oauthUser.Email != "" {
- user, err = users.GetByEmail(oauthUser.Email)
- }
- if err != nil {
- if errors.Cause(err) == app.ErrNotFound {
- if tenant.IsPrivate {
- return c.Redirect(c.TenantBaseURL(tenant) + "/not-invited")
- }
+ redirectURL, _ := url.Parse(c.Request.URL.String())
+ var query = redirectURL.Query()
+ query.Del("code")
+ query.Del("path")
+ redirectURL.RawQuery = query.Encode()
+ redirectURL.Path = c.QueryParam("path")
+ return c.Redirect(redirectURL.String())
+ }
+}
- user = &models.User{
- Name: oauthUser.Name,
- Tenant: tenant,
- Email: oauthUser.Email,
- Role: models.RoleVisitor,
- Providers: []*models.UserProvider{
- &models.UserProvider{
- UID: oauthUser.ID.String(),
- Name: provider,
- },
- },
- }
+// OAuthCallback handles OAuth callbacks
+func OAuthCallback(provider string) web.HandlerFunc {
+ return func(c web.Context) error {
+ redirect := c.QueryParam("state")
+ redirectURL, err := url.ParseRequestURI(redirect)
+ if err != nil {
+ return c.Failure(err)
+ }
- err = users.Register(user)
- if err != nil {
- return c.Failure(err)
- }
- } else {
- return c.Failure(err)
- }
- } else if !user.HasProvider(provider) {
- err = users.RegisterProvider(user.ID, &models.UserProvider{
- UID: oauthUser.ID.String(),
- Name: provider,
- })
- if err != nil {
- return c.Failure(err)
- }
- }
+ code := c.QueryParam("code")
+ if code == "" {
+ return c.Redirect(redirect)
+ }
- claims = jwt.FiderClaims{
- UserID: user.ID,
- UserName: user.Name,
- UserEmail: user.Email,
- Metadata: jwt.Metadata{
- ExpiresAt: time.Now().Add(365 * 24 * time.Hour).Unix(),
- },
- }
- } else {
- claims = jwt.OAuthClaims{
- OAuthID: oauthUser.ID.String(),
- OAuthProvider: provider,
- OAuthName: oauthUser.Name,
- OAuthEmail: oauthUser.Email,
- Metadata: jwt.Metadata{
- ExpiresAt: time.Now().Add(10 * time.Minute).Unix(),
- },
- }
+ //Sign in process
+ if redirectURL.Path != "/signup" {
+ var query = redirectURL.Query()
+ query.Set("code", code)
+ query.Set("path", redirectURL.Path)
+ redirectURL.RawQuery = query.Encode()
+ redirectURL.Path = fmt.Sprintf("/oauth/%s/token", provider)
+ return c.Redirect(redirectURL.String())
}
- var token string
- if token, err = jwt.Encode(claims); err != nil {
+ //Sign up process
+ oauthUser, err := c.Services().OAuth.GetProfile(c.AuthEndpoint(), provider, code)
+ if err != nil {
+ return c.Failure(err)
+ }
+
+ claims := jwt.OAuthClaims{
+ OAuthID: oauthUser.ID.String(),
+ OAuthProvider: provider,
+ OAuthName: oauthUser.Name,
+ OAuthEmail: oauthUser.Email,
+ Metadata: jwt.Metadata{
+ ExpiresAt: time.Now().Add(10 * time.Minute).Unix(),
+ },
+ }
+
+ token, err := jwt.Encode(claims)
+ if err != nil {
return c.Failure(err)
}
@@ -135,6 +142,15 @@ func OAuthCallback(provider string) web.HandlerFunc {
}
}
+// SignInByOAuth handles OAuth sign in
+func SignInByOAuth(provider string) web.HandlerFunc {
+ return func(c web.Context) error {
+ c.Logger().Info(c.QueryParam("redirect"))
+ authURL := c.Services().OAuth.GetAuthURL(c.AuthEndpoint(), provider, c.QueryParam("redirect"))
+ return c.Redirect(authURL)
+ }
+}
+
// SignInPage renders the sign in page
func SignInPage() web.HandlerFunc {
return func(c web.Context) error {
@@ -158,14 +174,6 @@ func NotInvitedPage() web.HandlerFunc {
}
}
-// SignInByOAuth handles OAuth sign in
-func SignInByOAuth(provider string) web.HandlerFunc {
- return func(c web.Context) error {
- authURL := c.Services().OAuth.GetAuthURL(c.AuthEndpoint(), provider, c.QueryParam("redirect"))
- return c.Redirect(authURL)
- }
-}
-
// SignInByEmail sends a new email with verification key
func SignInByEmail() web.HandlerFunc {
return func(c web.Context) error {
@@ -240,10 +248,7 @@ func VerifySignInKey(kind models.EmailVerificationKind) web.HandlerFunc {
return c.Failure(err)
}
- _, err = c.AddAuthCookie(user)
- if err != nil {
- return c.Failure(err)
- }
+ webutil.AddAuthUserCookie(c, user)
return c.Redirect(c.BaseURL())
}
@@ -278,10 +283,7 @@ func CompleteSignInProfile() web.HandlerFunc {
return c.Failure(err)
}
- _, err = c.AddAuthCookie(user)
- if err != nil {
- return c.Failure(err)
- }
+ webutil.AddAuthUserCookie(c, user)
return c.Ok(web.Map{})
}
diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.go
index 0bf143c46..e63507341 100644
--- a/app/handlers/signin_test.go
+++ b/app/handlers/signin_test.go
@@ -1,11 +1,12 @@
package handlers_test
import (
- "net/url"
"testing"
"time"
"net/http"
+ "net/http/httptest"
+ "net/url"
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/handlers"
@@ -58,6 +59,7 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {
RegisterT(t)
server, _ := mock.NewServer()
+
code, response := server.
WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io").
Execute(handlers.OAuthCallback(oauth.FacebookProvider))
@@ -66,21 +68,28 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {
Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io")
}
-func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
+func TestCallbackHandler_SignIn(t *testing.T) {
RegisterT(t)
server, _ := mock.NewServer()
code, response := server.
- WithURL("http://demo.test.fider.io/oauth/callback?state=http://demo.test.fider.io&code=123").
+ WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io&code=123").
Execute(handlers.OAuthCallback(oauth.FacebookProvider))
Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/oauth/facebook/token?code=123&path=")
+}
- location, _ := url.Parse(response.Header().Get("Location"))
- Expect(location.Host).Equals("demo.test.fider.io")
- Expect(location.Scheme).Equals("http")
- Expect(location.Path).Equals("")
- ExpectFiderToken(location.Query().Get("token"), mock.JonSnow)
+func TestCallbackHandler_SignIn_WithPath(t *testing.T) {
+ RegisterT(t)
+ server, _ := mock.NewServer()
+
+ code, response := server.
+ WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io/some-page&code=123").
+ Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/oauth/facebook/token?code=123&path=%2Fsome-page")
}
func TestCallbackHandler_SignUp(t *testing.T) {
@@ -88,9 +97,8 @@ func TestCallbackHandler_SignUp(t *testing.T) {
server, _ := mock.NewServer()
code, response := server.
- WithURL("http://demo.test.fider.io/oauth/callback?state=http://demo.test.fider.io/signup&code=123").
+ WithURL("http://login.test.fider.io/oauth/callback?state=http://demo.test.fider.io/signup&code=123").
Execute(handlers.OAuthCallback(oauth.FacebookProvider))
-
Expect(code).Equals(http.StatusTemporaryRedirect)
location, _ := url.Parse(response.Header().Get("Location"))
@@ -105,28 +113,40 @@ func TestCallbackHandler_SignUp(t *testing.T) {
})
}
-func TestCallbackHandler_NewUser(t *testing.T) {
+func TestOAuthTokenHandler_ExistingUserAndProvider(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ code, response := server.
+ WithURL("http://demo.test.fider.io/oauth/facebook/token?code=123").
+ OnTenant(mock.DemoTenant).
+ Execute(handlers.OAuthToken(oauth.FacebookProvider))
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("http://demo.test.fider.io")
+ ExpectFiderAuthCookie(response, mock.JonSnow)
+}
+
+func TestOAuthTokenHandler_NewUser(t *testing.T) {
RegisterT(t)
server, services := mock.NewServer()
code, response := server.
- WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io&code=456").
- Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ WithURL("http://demo.test.fider.io/oauth/facebook/token?code=456&path=/hello").
+ OnTenant(mock.DemoTenant).
+ Execute(handlers.OAuthToken(oauth.FacebookProvider))
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("http://demo.test.fider.io/hello")
user, err := services.Users.GetByEmail("[email protected]")
Expect(err).IsNil()
Expect(user.Name).Equals("Some Facebook Guy")
- Expect(code).Equals(http.StatusTemporaryRedirect)
-
- location, _ := url.Parse(response.Header().Get("Location"))
- Expect(location.Host).Equals("avengers.test.fider.io")
- Expect(location.Scheme).Equals("http")
- Expect(location.Path).Equals("")
- ExpectFiderToken(location.Query().Get("token"), user)
+ ExpectFiderAuthCookie(response, user)
}
-func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {
+func TestOAuthTokenHandler_NewUserWithoutEmail(t *testing.T) {
RegisterT(t)
server, services := mock.NewServer()
@@ -140,8 +160,9 @@ func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {
})
code, response := server.
- WithURL("http://login.test.fider.io/oauth/callback?state=http://demo.test.fider.io&code=798").
- Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ WithURL("http://demo.test.fider.io/oauth/facebook/token?code=798").
+ OnTenant(mock.DemoTenant).
+ Execute(handlers.OAuthToken(oauth.FacebookProvider))
user, err := services.Users.GetByID(3)
Expect(err).IsNil()
@@ -157,17 +178,14 @@ func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {
Expect(code).Equals(http.StatusTemporaryRedirect)
- location, _ := url.Parse(response.Header().Get("Location"))
- Expect(location.Host).Equals("demo.test.fider.io")
- Expect(location.Scheme).Equals("http")
- Expect(location.Path).Equals("")
- ExpectFiderToken(location.Query().Get("token"), &models.User{
+ Expect(response.Header().Get("Location")).Equals("http://demo.test.fider.io")
+ ExpectFiderAuthCookie(response, &models.User{
ID: 4,
Name: "Mark",
})
}
-func TestCallbackHandler_ExistingUser_WithoutEmail(t *testing.T) {
+func TestOAuthTokenHandler_ExistingUser_WithoutEmail(t *testing.T) {
RegisterT(t)
server, services := mock.NewServer()
@@ -181,19 +199,17 @@ func TestCallbackHandler_ExistingUser_WithoutEmail(t *testing.T) {
})
code, response := server.
- WithURL("http://login.test.fider.io/oauth/callback?state=http://demo.test.fider.io&code=456").
- Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ WithURL("http://demo.test.fider.io/oauth/facebook/token?code=456").
+ OnTenant(mock.DemoTenant).
+ Execute(handlers.OAuthToken(oauth.FacebookProvider))
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
_, err := services.Users.GetByID(4)
Expect(errors.Cause(err)).Equals(app.ErrNotFound)
- Expect(code).Equals(http.StatusTemporaryRedirect)
-
- location, _ := url.Parse(response.Header().Get("Location"))
- Expect(location.Host).Equals("demo.test.fider.io")
- Expect(location.Scheme).Equals("http")
- Expect(location.Path).Equals("")
- ExpectFiderToken(location.Query().Get("token"), &models.User{
+ Expect(response.Header().Get("Location")).Equals("http://demo.test.fider.io")
+ ExpectFiderAuthCookie(response, &models.User{
ID: 3,
Name: "Some Facebook Guy",
})
@@ -204,42 +220,37 @@ func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {
server, services := mock.NewServer()
code, response := server.
- WithURL("http://login.test.fider.io/oauth/callback?state=http://demo.test.fider.io&code=123").
- Execute(handlers.OAuthCallback(oauth.GoogleProvider))
+ WithURL("http://demo.test.fider.io/oauth/facebook/token?code=123").
+ OnTenant(mock.DemoTenant).
+ Execute(handlers.OAuthToken(oauth.GoogleProvider))
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
user, err := services.Users.GetByEmail("[email protected]")
Expect(err).IsNil()
Expect(user.Providers).HasLen(2)
- Expect(code).Equals(http.StatusTemporaryRedirect)
-
- location, _ := url.Parse(response.Header().Get("Location"))
- Expect(location.Host).Equals("demo.test.fider.io")
- Expect(location.Scheme).Equals("http")
- Expect(location.Path).Equals("")
- ExpectFiderToken(location.Query().Get("token"), mock.JonSnow)
+ Expect(response.Header().Get("Location")).Equals("http://demo.test.fider.io")
+ ExpectFiderAuthCookie(response, mock.JonSnow)
}
func TestCallbackHandler_NewUser_PrivateTenant(t *testing.T) {
RegisterT(t)
-
server, services := mock.NewServer()
mock.AvengersTenant.IsPrivate = true
code, response := server.
- WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io&code=456").
- Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ WithURL("http://ideas.theavengers.com/oauth/facebook/token?code=456").
+ OnTenant(mock.AvengersTenant).
+ Execute(handlers.OAuthToken(oauth.FacebookProvider))
user, err := services.Users.GetByEmail("[email protected]")
Expect(errors.Cause(err)).Equals(app.ErrNotFound)
Expect(user).IsNil()
Expect(code).Equals(http.StatusTemporaryRedirect)
- location, _ := url.Parse(response.Header().Get("Location"))
- Expect(location.Host).Equals("ideas.theavengers.com")
- Expect(location.Scheme).Equals("http")
- Expect(location.Path).Equals("/not-invited")
- Expect(location.Query().Get("token")).IsEmpty()
+ Expect(response.Header().Get("Location")).Equals("http://ideas.theavengers.com/not-invited")
+ ExpectFiderAuthCookie(response, nil)
}
func TestSignInByEmailHandler_WithoutEmail(t *testing.T) {
@@ -326,13 +337,7 @@ func TestVerifySignInKeyHandler_CorrectKey_ExistingUser(t *testing.T) {
Expect(code).Equals(http.StatusTemporaryRedirect)
Expect(response.Header().Get("Location")).Equals("http://demo.test.fider.io")
- cookies := web.ParseCookies(response.Header().Get("Set-Cookie"))
- Expect(cookies).HasLen(1)
- Expect(cookies[0].Name).Equals(web.CookieAuthName)
- ExpectFiderToken(cookies[0].Value, mock.JonSnow)
- Expect(cookies[0].HttpOnly).IsTrue()
- Expect(cookies[0].Path).Equals("/")
- Expect(cookies[0].Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)
+ ExpectFiderAuthCookie(response, mock.JonSnow)
}
func TestVerifySignInKeyHandler_CorrectKey_NewUser(t *testing.T) {
@@ -502,13 +507,7 @@ func TestCompleteSignInProfileHandler_CorrectKey(t *testing.T) {
Expect(user.Name).Equals("Hot Pie")
Expect(user.Email).Equals("[email protected]")
- cookies := web.ParseCookies(response.Header().Get("Set-Cookie"))
- Expect(cookies).HasLen(1)
- Expect(cookies[0].Name).Equals(web.CookieAuthName)
- ExpectFiderToken(cookies[0].Value, user)
- Expect(cookies[0].HttpOnly).IsTrue()
- Expect(cookies[0].Path).Equals("/")
- Expect(cookies[0].Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)
+ ExpectFiderAuthCookie(response, user)
request, err := services.Tenants.FindVerificationByKey(models.EmailVerificationKindSignIn, "1234567890")
Expect(err).IsNil()
@@ -556,6 +555,19 @@ func TestSignInPageHandler_PrivateTenant_UnauthenticatedUser(t *testing.T) {
Expect(code).Equals(http.StatusOK)
}
+func ExpectFiderAuthCookie(response *httptest.ResponseRecorder, expected *models.User) {
+ cookie := web.ParseCookie(response.Header().Get("Set-Cookie"))
+ if expected == nil {
+ Expect(cookie).IsNil()
+ } else {
+ Expect(cookie.Name).Equals(web.CookieAuthName)
+ ExpectFiderToken(cookie.Value, expected)
+ Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.Path).Equals("/")
+ Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)
+ }
+}
+
func ExpectFiderToken(token string, expected *models.User) {
user, err := jwt.DecodeFiderClaims(token)
Expect(err).IsNil()
diff --git a/app/handlers/signup.go b/app/handlers/signup.go
index f2a033efe..fc378d7e6 100644
--- a/app/handlers/signup.go
+++ b/app/handlers/signup.go
@@ -3,6 +3,8 @@ package handlers
import (
"time"
+ "github.com/getfider/fider/app/pkg/web/util"
+
"github.com/getfider/fider/app/tasks"
"strings"
@@ -64,6 +66,17 @@ func CreateTenant() web.HandlerFunc {
user.Providers = []*models.UserProvider{
{UID: input.Model.UserClaims.OAuthID, Name: input.Model.UserClaims.OAuthProvider},
}
+
+ if err := c.Services().Users.Register(user); err != nil {
+ return c.Failure(err)
+ }
+
+ if env.IsSingleHostMode() {
+ webutil.AddAuthUserCookie(c, user)
+ } else {
+ webutil.SetSignUpAuthCookie(c, user)
+ }
+
} else {
user.Name = input.Model.Name
user.Email = input.Model.Email
@@ -76,19 +89,6 @@ func CreateTenant() web.HandlerFunc {
c.Enqueue(tasks.SendSignUpEmail(input.Model, c.TenantBaseURL(tenant)))
}
- if socialSignUp {
- if err := c.Services().Users.Register(user); err != nil {
- return c.Failure(err)
- }
- token, err := c.AddAuthCookie(user)
- if err != nil {
- return c.Failure(err)
- }
- return c.Ok(web.Map{
- "token": token,
- })
- }
-
return c.Ok(web.Map{})
}
}
diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.go
index 57cf20fbb..47c6e1bb6 100644
--- a/app/handlers/signup_test.go
+++ b/app/handlers/signup_test.go
@@ -3,6 +3,7 @@ package handlers_test
import (
"net/http"
"testing"
+ "time"
"fmt"
@@ -13,6 +14,7 @@ import (
"github.com/getfider/fider/app/pkg/errors"
"github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/mock"
+ "github.com/getfider/fider/app/pkg/web"
)
func TestSignUpHandler_MultiTenant(t *testing.T) {
@@ -86,13 +88,13 @@ func TestCreateTenantHandler_WithSocialAccount(t *testing.T) {
RegisterT(t)
server, services := mock.NewServer()
- token, _ := jwt.Encode(&jwt.OAuthClaims{
+ token, _ := jwt.Encode(jwt.OAuthClaims{
OAuthID: "123",
OAuthName: "Jon Snow",
OAuthEmail: "[email protected]",
OAuthProvider: "facebook",
})
- code, response := server.ExecutePostAsJSON(
+ code, response := server.ExecutePost(
handlers.CreateTenant(),
fmt.Sprintf(`{
"token": "%s",
@@ -105,7 +107,6 @@ func TestCreateTenantHandler_WithSocialAccount(t *testing.T) {
tenant, err := services.Tenants.GetByDomain("mycompany")
Expect(code).Equals(http.StatusOK)
- Expect(response.String("token")).IsNotEmpty()
Expect(err).IsNil()
Expect(tenant.Name).Equals("My Company")
@@ -118,13 +119,63 @@ func TestCreateTenantHandler_WithSocialAccount(t *testing.T) {
Expect(user.Name).Equals("Jon Snow")
Expect(user.Email).Equals("[email protected]")
Expect(user.Role).Equals(models.RoleAdministrator)
+
+ cookie := web.ParseCookie(response.Header().Get("Set-Cookie"))
+ Expect(cookie.Name).Equals(web.CookieSignUpAuthName)
+ ExpectFiderToken(cookie.Value, user)
+ Expect(cookie.Domain).Equals("test.fider.io")
+ Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.Path).Equals("/")
+ Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(5*time.Minute), 5*time.Second)
+}
+
+func TestCreateTenantHandler_SingleHost_WithSocialAccount(t *testing.T) {
+ RegisterT(t)
+
+ server, services := mock.NewSingleTenantServer()
+ token, _ := jwt.Encode(jwt.OAuthClaims{
+ OAuthID: "123",
+ OAuthName: "Jon Snow",
+ OAuthEmail: "[email protected]",
+ OAuthProvider: "facebook",
+ })
+ code, response := server.ExecutePost(
+ handlers.CreateTenant(),
+ fmt.Sprintf(`{
+ "token": "%s",
+ "tenantName": "My Company",
+ "legalAgreement": true
+ }`, token),
+ )
+
+ tenant, err := services.Tenants.First()
+
+ Expect(code).Equals(http.StatusOK)
+
+ Expect(err).IsNil()
+ Expect(tenant.Name).Equals("My Company")
+ Expect(tenant.Subdomain).Equals("default")
+ Expect(tenant.Status).Equals(models.TenantActive)
+
+ services.SetCurrentTenant(tenant)
+ user, err := services.Users.GetByEmail("[email protected]")
+ Expect(err).IsNil()
+ Expect(user.Name).Equals("Jon Snow")
+ Expect(user.Email).Equals("[email protected]")
+ Expect(user.Role).Equals(models.RoleAdministrator)
+
+ ExpectFiderAuthCookie(response, &models.User{
+ ID: 1,
+ Name: "Jon Snow",
+ Email: "[email protected]",
+ })
}
func TestCreateTenantHandler_WithEmailAndName(t *testing.T) {
RegisterT(t)
server, services := mock.NewServer()
- code, response := server.ExecutePostAsJSON(
+ code, response := server.ExecutePost(
handlers.CreateTenant(),
`{
"name": "Jon Snow",
@@ -136,7 +187,7 @@ func TestCreateTenantHandler_WithEmailAndName(t *testing.T) {
)
Expect(code).Equals(http.StatusOK)
- Expect(response.Contains("token")).IsFalse()
+ Expect(response.Header().Get("Set-Cookie")).IsEmpty()
tenant, err := services.Tenants.GetByDomain("mycompany")
diff --git a/app/middlewares/domain.go b/app/middlewares/domain.go
index 2303cbf50..cb263866d 100644
--- a/app/middlewares/domain.go
+++ b/app/middlewares/domain.go
@@ -8,8 +8,10 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/web"
+ "github.com/getfider/fider/app/pkg/web/util"
)
// Tenant adds either SingleTenant or MultiTenant to the pipeline
@@ -77,6 +79,48 @@ func MultiTenant() web.MiddlewareFunc {
}
}
+// User gets JWT Auth token from cookie and insert into context
+func User() web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c web.Context) error {
+ var token string
+
+ cookie, err := c.Request.Cookie(web.CookieAuthName)
+ if err == nil {
+ token = cookie.Value
+ } else {
+ token = webutil.GetSignUpAuthCookie(c)
+ if token != "" {
+ webutil.AddAuthTokenCookie(c, token)
+ }
+ }
+
+ if token != "" {
+ claims, err := jwt.DecodeFiderClaims(token)
+ if err != nil {
+ c.RemoveCookie(web.CookieAuthName)
+ return next(c)
+ }
+
+ user, err := c.Services().Users.GetByID(claims.UserID)
+ if err != nil {
+ if errors.Cause(err) == app.ErrNotFound {
+ c.RemoveCookie(web.CookieAuthName)
+ return next(c)
+ }
+ return err
+ }
+
+ if c.Tenant() != nil && user.Tenant.ID == c.Tenant().ID {
+ c.SetUser(user)
+ }
+ }
+
+ return next(c)
+ }
+ }
+}
+
// OnlyActiveTenants blocks requests for inactive tenants
func OnlyActiveTenants() web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.go
index d749adc0b..3e56197d1 100644
--- a/app/middlewares/domain_test.go
+++ b/app/middlewares/domain_test.go
@@ -3,10 +3,12 @@ package middlewares_test
import (
"net/http"
"testing"
+ "time"
"github.com/getfider/fider/app/middlewares"
"github.com/getfider/fider/app/models"
. "github.com/getfider/fider/app/pkg/assert"
+ "github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
)
@@ -239,3 +241,128 @@ func TestCheckTenantPrivacy_NotPrivate_Unauthenticated(t *testing.T) {
Expect(status).Equals(http.StatusOK)
}
+
+func TestUser_NoCookie(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ server.Use(middlewares.User())
+ status, _ := server.Execute(func(c web.Context) error {
+ if c.IsAuthenticated() {
+ return c.NoContent(http.StatusOK)
+ } else {
+ return c.NoContent(http.StatusNoContent)
+ }
+ })
+
+ Expect(status).Equals(http.StatusNoContent)
+}
+
+func TestUser_WithCookie(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ token, _ := jwt.Encode(jwt.FiderClaims{
+ UserID: mock.JonSnow.ID,
+ UserName: mock.JonSnow.Name,
+ })
+
+ server.Use(middlewares.User())
+ status, response := server.
+ OnTenant(mock.DemoTenant).
+ AddHeader("Accept", "application/json").
+ AddCookie(web.CookieAuthName, token).
+ Execute(func(c web.Context) error {
+ return c.String(http.StatusOK, c.User().Name)
+ })
+
+ Expect(status).Equals(http.StatusOK)
+ Expect(response.Body.String()).Equals("Jon Snow")
+ Expect(response.HeaderMap["Set-Cookie"]).HasLen(0)
+}
+
+func TestUser_WithCookie_InvalidUser(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ token, _ := jwt.Encode(jwt.FiderClaims{
+ UserID: 999,
+ UserName: "Unknown",
+ })
+
+ server.Use(middlewares.User())
+ status, response := server.
+ OnTenant(mock.AvengersTenant).
+ AddCookie(web.CookieAuthName, token).
+ Execute(func(c web.Context) error {
+ if c.User() == nil {
+ return c.NoContent(http.StatusNoContent)
+ }
+ return c.NoContent(http.StatusOK)
+ })
+
+ Expect(status).Equals(http.StatusNoContent)
+ Expect(response.Header().Get("Set-Cookie")).ContainsSubstring(web.CookieAuthName + "=;")
+}
+
+func TestUser_WithCookie_DifferentTenant(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ token, _ := jwt.Encode(jwt.FiderClaims{
+ UserID: mock.JonSnow.ID,
+ UserName: mock.JonSnow.Name,
+ })
+
+ server.Use(middlewares.User())
+ status, _ := server.
+ OnTenant(mock.AvengersTenant).
+ AddCookie(web.CookieAuthName, token).
+ Execute(func(c web.Context) error {
+ if c.User() == nil {
+ return c.NoContent(http.StatusNoContent)
+ }
+ return c.NoContent(http.StatusOK)
+ })
+
+ Expect(status).Equals(http.StatusNoContent)
+}
+
+func TestUser_WithSignUpCookie(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ token, _ := jwt.Encode(jwt.FiderClaims{
+ UserID: mock.JonSnow.ID,
+ UserName: mock.JonSnow.Name,
+ })
+
+ server.Use(middlewares.User())
+ status, response := server.
+ OnTenant(mock.DemoTenant).
+ AddCookie(web.CookieSignUpAuthName, token).
+ Execute(func(c web.Context) error {
+ return c.String(http.StatusOK, c.User().Name)
+ })
+
+ Expect(status).Equals(http.StatusOK)
+ Expect(response.Body.String()).Equals("Jon Snow")
+ cookies := response.HeaderMap["Set-Cookie"]
+ Expect(cookies).HasLen(2)
+
+ cookie := web.ParseCookie(cookies[0])
+ Expect(cookie.Name).Equals(web.CookieSignUpAuthName)
+ Expect(cookie.Value).Equals("")
+ Expect(cookie.Domain).Equals("test.fider.io")
+ Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.Path).Equals("/")
+ Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(-100*time.Hour), 5*time.Second)
+
+ cookie = web.ParseCookie(cookies[1])
+ Expect(cookie.Name).Equals(web.CookieAuthName)
+ Expect(cookie.Value).Equals(token)
+ Expect(cookie.Domain).Equals("")
+ Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.Path).Equals("/")
+ Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)
+}
diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.go
deleted file mode 100644
index 8f7ad4dfc..000000000
--- a/app/middlewares/jwt.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package middlewares
-
-import (
- "net/http"
- "strings"
- "time"
-
- "github.com/getfider/fider/app"
- "github.com/getfider/fider/app/pkg/errors"
- "github.com/getfider/fider/app/pkg/jwt"
- "github.com/getfider/fider/app/pkg/web"
-)
-
-// JwtGetter gets JWT token from cookie and insert into context
-func JwtGetter() web.MiddlewareFunc {
- return func(next web.HandlerFunc) web.HandlerFunc {
- return func(c web.Context) error {
-
- cookie, err := c.Request.Cookie(web.CookieAuthName)
- if err != nil {
- if errors.Cause(err) == http.ErrNoCookie {
- return next(c)
- }
- return err
- }
-
- claims, err := jwt.DecodeFiderClaims(cookie.Value)
- if err != nil {
- c.RemoveCookie(web.CookieAuthName)
- return next(c)
- }
-
- user, err := c.Services().Users.GetByID(claims.UserID)
- if err != nil {
- if errors.Cause(err) == app.ErrNotFound {
- c.RemoveCookie(web.CookieAuthName)
- return next(c)
- }
- return err
- }
-
- if c.Tenant() != nil && user.Tenant.ID == c.Tenant().ID {
- c.SetUser(user)
- }
-
- return next(c)
- }
- }
-}
-
-// JwtSetter sets JWT token into cookie
-func JwtSetter() web.MiddlewareFunc {
- return func(next web.HandlerFunc) web.HandlerFunc {
- return func(c web.Context) error {
-
- query := c.Request.URL.Query()
-
- token := query.Get("token")
- if token != "" {
- c.AddCookie(web.CookieAuthName, token, time.Now().Add(365*24*time.Hour))
-
- query.Del("token")
-
- url := c.BaseURL() + c.Request.URL.Path
- querystring := query.Encode()
- if querystring != "" {
- url += "?" + querystring
- }
-
- return c.Redirect(url)
- }
-
- return next(c)
- }
- }
-}
-
-func stripPort(hostport string) string {
- colon := strings.IndexByte(hostport, ':')
- if colon == -1 {
- return hostport
- }
- return hostport[:colon]
-}
diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.go
deleted file mode 100644
index 0ef8dc079..000000000
--- a/app/middlewares/jwt_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package middlewares_test
-
-import (
- "net/http"
- "testing"
-
- "github.com/getfider/fider/app/middlewares"
- . "github.com/getfider/fider/app/pkg/assert"
- "github.com/getfider/fider/app/pkg/jwt"
- "github.com/getfider/fider/app/pkg/mock"
- "github.com/getfider/fider/app/pkg/web"
-)
-
-func TestJwtGetter_NoCookie(t *testing.T) {
- RegisterT(t)
-
- server, _ := mock.NewServer()
- server.Use(middlewares.JwtGetter())
- status, _ := server.Execute(func(c web.Context) error {
- if c.IsAuthenticated() {
- return c.NoContent(http.StatusOK)
- } else {
- return c.NoContent(http.StatusNoContent)
- }
- })
-
- Expect(status).Equals(http.StatusNoContent)
-}
-
-func TestJwtGetter_WithCookie(t *testing.T) {
- RegisterT(t)
-
- server, _ := mock.NewServer()
- token, _ := jwt.Encode(&jwt.FiderClaims{
- UserID: mock.JonSnow.ID,
- UserName: mock.JonSnow.Name,
- })
-
- server.Use(middlewares.JwtGetter())
- status, response := server.
- OnTenant(mock.DemoTenant).
- AddHeader("Accept", "application/json").
- AddCookie(web.CookieAuthName, token).
- Execute(func(c web.Context) error {
- return c.String(http.StatusOK, c.User().Name)
- })
-
- Expect(status).Equals(http.StatusOK)
- Expect(response.Body.String()).Equals("Jon Snow")
-}
-
-func TestJwtGetter_WithCookie_InvalidUser(t *testing.T) {
- RegisterT(t)
-
- server, _ := mock.NewServer()
- token, _ := jwt.Encode(&jwt.FiderClaims{
- UserID: 999,
- UserName: "Unknown",
- })
-
- server.Use(middlewares.JwtGetter())
- status, response := server.
- OnTenant(mock.AvengersTenant).
- AddCookie(web.CookieAuthName, token).
- Execute(func(c web.Context) error {
- if c.User() == nil {
- return c.NoContent(http.StatusNoContent)
- }
- return c.NoContent(http.StatusOK)
- })
-
- Expect(status).Equals(http.StatusNoContent)
- Expect(response.Header().Get("Set-Cookie")).ContainsSubstring(web.CookieAuthName + "=;")
-}
-
-func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {
- RegisterT(t)
-
- server, _ := mock.NewServer()
- token, _ := jwt.Encode(&jwt.FiderClaims{
- UserID: mock.JonSnow.ID,
- UserName: mock.JonSnow.Name,
- })
-
- server.Use(middlewares.JwtGetter())
- status, _ := server.
- OnTenant(mock.AvengersTenant).
- AddCookie(web.CookieAuthName, token).
- Execute(func(c web.Context) error {
- if c.User() == nil {
- return c.NoContent(http.StatusNoContent)
- }
- return c.NoContent(http.StatusOK)
- })
-
- Expect(status).Equals(http.StatusNoContent)
-}
-
-func TestJwtSetter_WithoutJwt(t *testing.T) {
- RegisterT(t)
-
- server, _ := mock.NewServer()
-
- server.Use(middlewares.JwtSetter())
- status, _ := server.WithURL("http://avengers.test.fider.io/abc").Execute(func(c web.Context) error {
- return c.NoContent(http.StatusOK)
- })
-
- Expect(status).Equals(http.StatusOK)
-}
-
-func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
- RegisterT(t)
-
- server, _ := mock.NewServer()
- token, _ := jwt.Encode(&jwt.FiderClaims{
- UserName: mock.JonSnow.Name,
- })
-
- server.Use(middlewares.JwtSetter())
- status, response := server.WithURL("http://avengers.test.fider.io/abc?token=" + token).Execute(func(c web.Context) error {
- return c.NoContent(http.StatusOK)
- })
-
- Expect(status).Equals(http.StatusTemporaryRedirect)
- Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/abc")
-}
-
-func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {
- RegisterT(t)
-
- server, _ := mock.NewServer()
- token, _ := jwt.Encode(&jwt.FiderClaims{
- UserName: mock.JonSnow.Name,
- })
-
- server.Use(middlewares.JwtSetter())
- status, response := server.WithURL("http://avengers.test.fider.io/abc?token=" + token + "&foo=bar").Execute(func(c web.Context) error {
- return c.NoContent(http.StatusOK)
- })
-
- Expect(status).Equals(http.StatusTemporaryRedirect)
- Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/abc?foo=bar")
-}
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index 57611bc2f..0867ef41b 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -16,7 +16,6 @@ import (
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/errors"
- "github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/validate"
"github.com/getfider/fider/app/pkg/worker"
@@ -45,9 +44,12 @@ var (
UTF8JSONContentType = JSONContentType + "; charset=utf-8"
)
-// CookieAuthName is the name of the authentication cookie
+// CookieAuthName is the name of the cookie that holds the Authentication Token
const CookieAuthName = "auth"
+// CookieSignUpAuthName is the name of the cookie that holds the temporary Authentication Token
+const CookieSignUpAuthName = "signup_auth"
+
var (
preffixKey = "__CTX_"
tenantContextKey = preffixKey + "TENANT"
@@ -300,26 +302,6 @@ func (ctx *Context) Services() *app.Services {
return nil
}
-//AddAuthCookie generates and adds a cookie
-func (ctx *Context) AddAuthCookie(user *models.User) (string, error) {
- expiresAt := time.Now().Add(365 * 24 * time.Hour)
- token, err := jwt.Encode(jwt.FiderClaims{
- UserID: user.ID,
- UserName: user.Name,
- UserEmail: user.Email,
- Metadata: jwt.Metadata{
- ExpiresAt: expiresAt.Unix(),
- },
- })
-
- if err != nil {
- return token, errors.Wrap(err, "failed to add auth cookie")
- }
-
- ctx.AddCookie(CookieAuthName, token, expiresAt)
- return token, nil
-}
-
//AddCookie adds a cookie
func (ctx *Context) AddCookie(name, value string, expires time.Time) {
http.SetCookie(ctx.Response, &http.Cookie{
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index 6acbd8de0..acbf7aed3 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -286,7 +286,10 @@ func (g *Group) Static(prefix, root string) {
g.engine.mux.Handle("GET", prefix, g.handler(h))
}
-// ParseCookies return a list of cookie parsed from raw Set-Cookie
-func ParseCookies(s string) []*http.Cookie {
- return (&http.Response{Header: http.Header{"Set-Cookie": {s}}}).Cookies()
+// ParseCookie return a list of cookie parsed from raw Set-Cookie
+func ParseCookie(s string) *http.Cookie {
+ if s == "" {
+ return nil
+ }
+ return (&http.Response{Header: http.Header{"Set-Cookie": {s}}}).Cookies()[0]
}
diff --git a/app/pkg/web/util/util.go b/app/pkg/web/util/util.go
new file mode 100644
index 000000000..6b0a1a7f4
--- /dev/null
+++ b/app/pkg/web/util/util.go
@@ -0,0 +1,69 @@
+package webutil
+
+import (
+ "net/http"
+ "time"
+
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/env"
+ "github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/pkg/jwt"
+ "github.com/getfider/fider/app/pkg/web"
+)
+
+func encode(user *models.User) string {
+ token, err := jwt.Encode(jwt.FiderClaims{
+ UserID: user.ID,
+ UserName: user.Name,
+ UserEmail: user.Email,
+ Metadata: jwt.Metadata{
+ ExpiresAt: time.Now().Add(365 * 24 * time.Hour).Unix(),
+ },
+ })
+
+ if err != nil {
+ panic(errors.Wrap(err, "failed to add auth cookie"))
+ }
+
+ return token
+}
+
+//AddAuthUserCookie generates Auth Token and adds a cookie
+func AddAuthUserCookie(ctx web.Context, user *models.User) {
+ AddAuthTokenCookie(ctx, encode(user))
+}
+
+//AddAuthTokenCookie adds given token to a cookie
+func AddAuthTokenCookie(ctx web.Context, token string) {
+ expiresAt := time.Now().Add(365 * 24 * time.Hour)
+ ctx.AddCookie(web.CookieAuthName, token, expiresAt)
+}
+
+//SetSignUpAuthCookie sets a temporary domain-wide Auth Token
+func SetSignUpAuthCookie(ctx web.Context, user *models.User) {
+ http.SetCookie(ctx.Response, &http.Cookie{
+ Name: web.CookieSignUpAuthName,
+ Domain: env.MultiTenantDomain(),
+ Value: encode(user),
+ HttpOnly: true,
+ Path: "/",
+ Expires: time.Now().Add(5 * time.Minute),
+ })
+}
+
+//GetSignUpAuthCookie retruns the temporary temporary domain-wide Auth Token and removes it
+func GetSignUpAuthCookie(ctx web.Context) string {
+ cookie, err := ctx.Request.Cookie(web.CookieSignUpAuthName)
+ if err == nil {
+ http.SetCookie(ctx.Response, &http.Cookie{
+ Name: web.CookieSignUpAuthName,
+ Domain: env.MultiTenantDomain(),
+ Path: "/",
+ HttpOnly: true,
+ MaxAge: -1,
+ Expires: time.Now().Add(-100 * time.Hour),
+ })
+ return cookie.Value
+ }
+ return ""
+}
diff --git a/public/pages/SignUp/SignUp.page.tsx b/public/pages/SignUp/SignUp.page.tsx
index 1e3823901..d0d5c7bc9 100644
--- a/public/pages/SignUp/SignUp.page.tsx
+++ b/public/pages/SignUp/SignUp.page.tsx
@@ -60,7 +60,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {
});
if (result.ok) {
- if (result.data.token) {
+ if (this.user) {
if (Fider.isSingleHostMode()) {
location.reload();
} else {
@@ -69,7 +69,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {
baseUrl = `${baseUrl}:${location.port}`;
}
- location.href = `${baseUrl}?token=${result.data.token}`;
+ location.href = baseUrl;
}
} else {
this.setState({ submitted: true });