Open platform to collect and prioritize feedback
rename parameter and auto signin after signup (#131)
Guilherme Oenning6477f66ed2f5
diff --git a/app/handlers/signin.go b/app/handlers/signin.goindex 34af5a1ac..e2c469da8 100644--- a/app/handlers/signin.go+++ b/app/handlers/signin.go@@ -117,7 +117,7 @@ func OAuthCallback(provider string) web.HandlerFunc {}var query = redirectURL.Query()- query.Set("jwt", token)+ query.Set("token", token)redirectURL.RawQuery = query.Encode()return c.Redirect(http.StatusTemporaryRedirect, redirectURL.String())}@@ -197,7 +197,7 @@ func VerifySignInKey() web.HandlerFunc {return c.Failure(err)}- err = c.AddAuthCookie(user)+ _, err = c.AddAuthCookie(user)if err != nil {return c.Failure(err)}@@ -235,7 +235,7 @@ func CompleteSignInProfile() web.HandlerFunc {return c.Failure(err)}- err = c.AddAuthCookie(user)+ _, err = c.AddAuthCookie(user)if err != nil {return c.Failure(err)}diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.goindex 5b2437baf..aa751c457 100644--- a/app/handlers/signin_test.go+++ b/app/handlers/signin_test.go@@ -74,7 +74,7 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {Execute(handlers.OAuthCallback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vd0Bnb3QuY29tIn0.S7P8zTU0rVovmchNbwamBewYbO96GdJcOygn7tbsikw"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vd0Bnb3QuY29tIn0.S7P8zTU0rVovmchNbwamBewYbO96GdJcOygn7tbsikw"))}func TestCallbackHandler_NewUser(t *testing.T) {@@ -90,7 +90,7 @@ func TestCallbackHandler_NewUser(t *testing.T) {Expect(user.Name).To(Equal("Some Facebook Guy"))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.ydyGDIZZHbJ-mgvpAsXTZnbs1rBH6cTVjHctZEACUOo"))+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.ydyGDIZZHbJ-mgvpAsXTZnbs1rBH6cTVjHctZEACUOo"))}func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {@@ -121,7 +121,7 @@ func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {Expect(len(user.Providers)).To(Equal(1))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjo0LCJ1c2VyL25hbWUiOiJNYXJrIiwidXNlci9lbWFpbCI6IiJ9.G93ZTFcDuHiIlYbDvMnjhoDebeJZMifWbv9v0rayQOI"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjo0LCJ1c2VyL25hbWUiOiJNYXJrIiwidXNlci9lbWFpbCI6IiJ9.G93ZTFcDuHiIlYbDvMnjhoDebeJZMifWbv9v0rayQOI"))}func TestCallbackHandler_ExistingUser_WithoutEmail(t *testing.T) {@@ -145,7 +145,7 @@ func TestCallbackHandler_ExistingUser_WithoutEmail(t *testing.T) {Expect(err).To(Equal(app.ErrNotFound))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiIifQ.DBcMmKSrGxiXGVCq9QT716xfw3M4kzP-Njazsk6vaFI"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiIifQ.DBcMmKSrGxiXGVCq9QT716xfw3M4kzP-Njazsk6vaFI"))}func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {@@ -161,7 +161,7 @@ func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {Expect(len(user.Providers)).To(Equal(2))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vd0Bnb3QuY29tIn0.S7P8zTU0rVovmchNbwamBewYbO96GdJcOygn7tbsikw"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vd0Bnb3QuY29tIn0.S7P8zTU0rVovmchNbwamBewYbO96GdJcOygn7tbsikw"))}func TestSignInByEmailHandler_WithoutEmail(t *testing.T) {diff --git a/app/handlers/signup.go b/app/handlers/signup.goindex 71f99fea3..dddc1e778 100644--- a/app/handlers/signup.go+++ b/app/handlers/signup.go@@ -55,8 +55,14 @@ func CreateTenant() web.HandlerFunc {return c.Failure(err)}+ token, err := c.AddAuthCookie(user)+ if err != nil {+ return c.Failure(err)+ }+return c.Ok(web.Map{- "id": tenant.ID,+ "id": tenant.ID,+ "token": token,})}}diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.goindex 79abe6168..4618b79c2 100644--- a/app/middlewares/jwt.go+++ b/app/middlewares/jwt.go@@ -61,11 +61,11 @@ func JwtSetter() web.MiddlewareFunc {query := c.Request().URL.Query()- jwt := query.Get("jwt")- if jwt != "" {- c.AddCookie(web.CookieAuthName, jwt, time.Now().Add(365*24*time.Hour))+ token := query.Get("token")+ if token != "" {+ c.AddCookie(web.CookieAuthName, token, time.Now().Add(365*24*time.Hour))- query.Del("jwt")+ query.Del("token")url := c.BaseURL() + c.Request().URL.Pathquerystring := query.Encode()diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.goindex 1a342e0b9..ceae05f06 100644--- a/app/middlewares/jwt_test.go+++ b/app/middlewares/jwt_test.go@@ -95,7 +95,7 @@ func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {})server.Use(middlewares.JwtSetter())- status, response := server.WithURL("http://orange.test.fider.io/abc?jwt=" + token).Execute(func(c web.Context) error {+ status, response := server.WithURL("http://orange.test.fider.io/abc?token=" + token).Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})@@ -112,7 +112,7 @@ func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {})server.Use(middlewares.JwtSetter())- status, response := server.WithURL("http://orange.test.fider.io/abc?jwt=" + token + "&foo=bar").Execute(func(c web.Context) error {+ status, response := server.WithURL("http://orange.test.fider.io/abc?token=" + token + "&foo=bar").Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex d60235297..b5149d129 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -168,7 +168,7 @@ func (ctx *Context) Services() *app.Services {}//AddAuthCookie generates and adds a cookie-func (ctx *Context) AddAuthCookie(user *models.User) error {+func (ctx *Context) AddAuthCookie(user *models.User) (string, error) {token, err := jwt.Encode(models.FiderClaims{UserID: user.ID,UserName: user.Name,@@ -176,11 +176,11 @@ func (ctx *Context) AddAuthCookie(user *models.User) error {})if err != nil {- return err+ return token, err}ctx.AddCookie(CookieAuthName, token, time.Now().Add(365*24*time.Hour))- return nil+ return token, nil}//AddCookie adds a cookiediff --git a/public/pages/signup/SignUpPage.tsx b/public/pages/signup/SignUpPage.tsxindex 7a811ae02..975861094 100644--- a/public/pages/signup/SignUpPage.tsx+++ b/public/pages/signup/SignUpPage.tsx@@ -49,7 +49,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {setTitle(this.session.isSingleHostMode() ? 'Installation · Fider' : 'Sign up · Fider');- const token = getQueryString('jwt');+ const token = getQueryString('token');if (token) {const data = decode(token);this.user = {@@ -70,7 +70,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {if (this.session.isSingleHostMode()) {location.reload();} else {- location.href = `${location.protocol}//${this.state.subdomain.value}${this.settings.domain}`;+ location.href = `${location.protocol}//${this.state.subdomain.value}${this.settings.domain}?token=${result.data.token}`;}} else if (result.error) {this.setState({ error: result.error });diff --git a/public/services/TenantService.ts b/public/services/TenantService.tsindex 60d4d457e..74e64fb2c 100644--- a/public/services/TenantService.ts+++ b/public/services/TenantService.ts@@ -3,7 +3,7 @@ import { injectable } from '@fider/di';import { Tenant } from '@fider/models';export interface TenantService {- create(token?: string, name?: string, subdomain?: string): Promise<Result>;+ create(token?: string, name?: string, subdomain?: string): Promise<Result<CreateTenantResponse>>;updateSettings(title: string, invitation: string, welcomeMessage: string): Promise<Result>;checkAvailability(subdomain: string): Promise<Result<CheckAvailabilityResponse>>;signIn(email: string): Promise<Result>;@@ -14,10 +14,15 @@ export interface CheckAvailabilityResponse {message: string;}+export interface CreateTenantResponse {+ id: number;+ token: string;+}+@injectable()export class HttpTenantService implements TenantService {- public async create(token?: string, name?: string, subdomain?: string): Promise<Result> {- return await post('/api/tenants', {+ public async create(token?: string, name?: string, subdomain?: string): Promise<Result<CreateTenantResponse>> {+ return await post<CreateTenantResponse>('/api/tenants', {token, name, subdomain,});}