Open platform to collect and prioritize feedback
fix: ignore OAuth when session is already authenticated (#615)
Guilherme Oenninge63c7deda449
diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 5269fc44a..7eabfc58e 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -41,6 +41,7 @@ func routes(r *web.Engine) *web.Engine {r.Use(middlewares.WebSetup())r.Use(middlewares.Tenant())+ r.Use(middlewares.User())r.Get("/privacy", handlers.LegalPage("Privacy Policy", "privacy.md"))r.Get("/terms", handlers.LegalPage("Terms of Service", "terms.md"))@@ -82,9 +83,6 @@ func routes(r *web.Engine) *web.Engine {r.Post("/_api/signin/complete", handlers.CompleteSignInProfile())r.Post("/_api/signin", handlers.SignInByEmail())- //Extract user from cookie and inject it into web.Context (if available)- r.Use(middlewares.User())-//Block if it's private tenant with unauthenticated userr.Use(middlewares.CheckTenantPrivacy())diff --git a/app/handlers/oauth.go b/app/handlers/oauth.goindex 79b3d91fd..1ce93fe17 100644--- a/app/handlers/oauth.go+++ b/app/handlers/oauth.go@@ -203,8 +203,13 @@ func OAuthCallback() web.HandlerFunc {func SignInByOAuth() web.HandlerFunc {return func(c web.Context) error {provider := c.Param("provider")+ redirect := c.QueryParam("redirect")- authURL, err := c.Services().OAuth.GetAuthURL(provider, c.QueryParam("redirect"), getOAuthIdentifier(c))+ if c.IsAuthenticated() {+ return c.Redirect(redirect)+ }++ authURL, err := c.Services().OAuth.GetAuthURL(provider, redirect, getOAuthIdentifier(c))if err != nil {return c.Failure(err)}diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.goindex adfb644fa..83ef95ba3 100644--- a/app/handlers/oauth_test.go+++ b/app/handlers/oauth_test.go@@ -46,6 +46,22 @@ func TestSignInByOAuthHandler(t *testing.T) {Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io/oauth/token?provider=facebook&redirect=|656e0c3864ae014bcaf370c2b2d265a7cc969ac50fe82a67c97f3042393a84dfd251596997d09e4f0f5a184e1b3dfccf24b193c2347e22c2b895d251290df162")}+func TestSignInByOAuthHandler_AuthenticatedUser(t *testing.T) {+ RegisterT(t)++ server, _ := mock.NewServer()+ code, response := server.+ AsUser(mock.JonSnow).+ AddParam("provider", oauth.FacebookProvider).+ WithURL("http://avengers.test.fider.io/oauth/facebook?redirect=http://avengers.test.fider.io").+ AddHeader("User-Agent", "Chrome").+ WithClientIP("1.1.1.1").+ Execute(handlers.SignInByOAuth())++ Expect(code).Equals(http.StatusTemporaryRedirect)+ Expect(response.Header().Get("Location")).Equals("http://avengers.test.fider.io")+}+func TestCallbackHandler_InvalidState(t *testing.T) {RegisterT(t)diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.goindex e3188b952..1055a3a27 100644--- a/app/handlers/signin_test.go+++ b/app/handlers/signin_test.go@@ -331,7 +331,6 @@ func ExpectFiderAuthCookie(response *httptest.ResponseRecorder, expected *modelsExpect(cookie.Name).Equals(web.CookieAuthName)ExpectFiderToken(cookie.Value, expected)Expect(cookie.HttpOnly).IsTrue()- Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)Expect(cookie.Path).Equals("/")Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)returndiff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.goindex 2a8e8f634..1bf887c82 100644--- a/app/handlers/signup_test.go+++ b/app/handlers/signup_test.go@@ -139,7 +139,6 @@ func TestCreateTenantHandler_WithSocialAccount(t *testing.T) {ExpectFiderToken(cookie.Value, user)Expect(cookie.Domain).Equals("test.fider.io")Expect(cookie.HttpOnly).IsTrue()- Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)Expect(cookie.Path).Equals("/")Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(5*time.Minute), 5*time.Second)}diff --git a/app/middlewares/user_test.go b/app/middlewares/user_test.goindex 3420b0856..d59d15f36 100644--- a/app/middlewares/user_test.go+++ b/app/middlewares/user_test.go@@ -150,7 +150,6 @@ func TestUser_WithSignUpCookie(t *testing.T) {Expect(cookie.Value).Equals("")Expect(cookie.Domain).Equals("test.fider.io")Expect(cookie.HttpOnly).IsTrue()- Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)Expect(cookie.Path).Equals("/")Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(-100*time.Hour), 5*time.Second)@@ -159,7 +158,6 @@ func TestUser_WithSignUpCookie(t *testing.T) {Expect(cookie.Value).Equals(token)Expect(cookie.Domain).Equals("")Expect(cookie.HttpOnly).IsTrue()- Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)Expect(cookie.Path).Equals("/")Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)}diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex d98653a23..b6df17164 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -345,7 +345,6 @@ func (ctx *Context) AddCookie(name, value string, expires time.Time) {Path: "/",Expires: expires,Secure: ctx.Request.IsSecure,- SameSite: http.SameSiteLaxMode,})}@@ -358,7 +357,6 @@ func (ctx *Context) RemoveCookie(name string) {MaxAge: -1,Expires: time.Now().Add(-100 * time.Hour),Secure: ctx.Request.IsSecure,- SameSite: http.SameSiteLaxMode,})}diff --git a/app/pkg/web/util/webutil.go b/app/pkg/web/util/webutil.goindex df4c6eb77..83b3b0a52 100644--- a/app/pkg/web/util/webutil.go+++ b/app/pkg/web/util/webutil.go@@ -50,7 +50,6 @@ func SetSignUpAuthCookie(ctx web.Context, user *models.User) {Path: "/",Expires: time.Now().Add(5 * time.Minute),Secure: ctx.Request.IsSecure,- SameSite: http.SameSiteLaxMode,})}@@ -66,7 +65,6 @@ func GetSignUpAuthCookie(ctx web.Context) string {MaxAge: -1,Expires: time.Now().Add(-100 * time.Hour),Secure: ctx.Request.IsSecure,- SameSite: http.SameSiteLaxMode,})return cookie.Value}