Open platform to collect and prioritize feedback
Installation process for single tenant mode / sign up page for multi tenant mode (#45)
Guilherme Oenninge52f9c983e27
diff --git a/.ci.env b/.ci.envindex 05802ce98..1ef9eb27b 100644--- a/.ci.env+++ b/.ci.env@@ -2,4 +2,4 @@ GO_ENV=testHOST_MODE=multiDATABASE_URL=postgres://fider_test:fider_test-pw@postgres:5432/fider_test?sslmode=disableAUTH_ENDPOINT=http://login.test.fider.io:3000-JWT_SECRET=I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ\ No newline at end of file+JWT_SECRET=SOME_RANDOM_TOKEN_JUST_FOR_TESTING\ No newline at end of filediff --git a/.example.env b/.example.envindex d4a1b47a1..dfe5c5a3e 100644--- a/.example.env+++ b/.example.env@@ -1,3 +1,4 @@+GO_ENV=developmentDATABASE_URL=postgres://fider:fider-pw@localhost:5555/fider?sslmode=disableJWT_SECRET=hsjl]W;&ZcHxT&FK;s%bgIQF:#ch=~#Al4:5]N;7V<qPZ3e9lT4'%;go;LIkc%kdiff --git a/.test.env b/.test.envindex 7dd11193e..580d41b03 100644--- a/.test.env+++ b/.test.env@@ -2,4 +2,4 @@ GO_ENV=testHOST_MODE=multiDATABASE_URL=postgres://fider_test:fider_test-pw@localhost:5566/fider_test?sslmode=disableAUTH_ENDPOINT=http://login.test.fider.io:3000-JWT_SECRET=I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ\ No newline at end of file+JWT_SECRET=SOME_RANDOM_TOKEN_JUST_FOR_TESTING\ No newline at end of filediff --git a/.vscode/settings.json b/.vscode/settings.jsonindex aab2e7948..33a602b30 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -29,11 +29,5 @@"vsicons.presets.angular": true,"go.coverOnSave": true,"go.coverageOptions": "showBothCoveredAndUncoveredCode",- "go.testEnvVars": {- "GO_ENV": "test",- "HOST_MODE": "multi",- "DATABASE_URL": "postgres://fider_test:fider_test-pw@localhost:5566/fider_test?sslmode=disable",- "AUTH_ENDPOINT": "http://login.test.fider.io:3000",- "JWT_SECRET": "I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ"- }+ "go.testEnvFile": "${workspaceRoot}/.test.env"}\ No newline at end of filediff --git a/app/handlers/identity.go b/app/handlers/oauth.gosimilarity index 59%rename from app/handlers/identity.gorename to app/handlers/oauth.goindex 9c08c845b..f2e3833f3 100644--- a/app/handlers/identity.go+++ b/app/handlers/oauth.go@@ -6,8 +6,11 @@ import ("strings""time"+ jwtgo "github.com/dgrijalva/jwt-go"+"github.com/getfider/fider/app""github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/jwt""github.com/getfider/fider/app/pkg/web")@@ -33,60 +36,73 @@ func OAuthCallback(provider string) web.HandlerFunc {return c.Redirect(http.StatusTemporaryRedirect, redirect)}- tenant := c.Tenant()- if tenant == nil {- // should get from context- // Single/Multi middleware should handle auth endpoint properly- // .Set("AuthEndpoint") is not good as well- tenant, err = c.Services().Tenants.GetByDomain(stripPort(redirectURL.Host))- if err != nil {- return c.Failure(err)- }- }-oauthUser, err := c.Services().OAuth.GetProfile(c.AuthEndpoint(), provider, code)if err != nil {return c.Failure(err)}- users := c.Services().Users- user, err := users.GetByEmail(tenant.ID, oauthUser.Email)- if err != nil {- if err == app.ErrNotFound {- user = &models.User{- Name: oauthUser.Name,- Tenant: tenant,- Email: oauthUser.Email,- Role: models.RoleVisitor,- Providers: []*models.UserProvider{- {- UID: oauthUser.ID,- Name: provider,- },- },- }+ var claims jwtgo.Claims+ if redirectURL.Path != "/signup" {- err = users.Register(user)- if err != nil {- return c.Failure(err)- }+ var (+ tenant *models.Tenant+ err error+ )+ if env.IsSingleHostMode() {+ tenant, err = c.Services().Tenants.First()} else {- return c.Failure(err)+ tenant, err = c.Services().Tenants.GetByDomain(stripPort(redirectURL.Host))}- } else if !user.HasProvider(provider) {- err = users.RegisterProvider(user.ID, &models.UserProvider{- UID: oauthUser.ID,- Name: provider,- })if err != nil {return c.Failure(err)}- }- claims := &models.FiderClaims{- UserID: user.ID,- UserName: user.Name,- UserEmail: user.Email,+ users := c.Services().Users+ user, err := users.GetByEmail(tenant.ID, oauthUser.Email)+ if err != nil {+ if err == app.ErrNotFound {+ user = &models.User{+ Name: oauthUser.Name,+ Tenant: tenant,+ Email: oauthUser.Email,+ Role: models.RoleVisitor,+ Providers: []*models.UserProvider{+ &models.UserProvider{+ UID: oauthUser.ID,+ Name: provider,+ },+ },+ }++ 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,+ Name: provider,+ })+ if err != nil {+ return c.Failure(err)+ }+ }++ claims = models.FiderClaims{+ UserID: user.ID,+ UserName: user.Name,+ UserEmail: user.Email,+ }+ } else {+ claims = models.OAuthClaims{+ OAuthID: oauthUser.ID,+ OAuthProvider: provider,+ OAuthName: oauthUser.Name,+ OAuthEmail: oauthUser.Email,+ }}var token string@@ -96,7 +112,7 @@ func OAuthCallback(provider string) web.HandlerFunc {}var query = redirectURL.Query()- query.Add("jwt", token)+ query.Set("jwt", token)redirectURL.RawQuery = query.Encode()return c.Redirect(http.StatusTemporaryRedirect, redirectURL.String())}diff --git a/app/handlers/identity_test.go b/app/handlers/oauth_test.gosimilarity index 95%rename from app/handlers/identity_test.gorename to app/handlers/oauth_test.goindex 30c3217fb..f81c5bc29 100644--- a/app/handlers/identity_test.go+++ b/app/handlers/oauth_test.go@@ -78,7 +78,7 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {code, response := server.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.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.n73-Qqhb_6lIALS_H3UzrEuzLTHgtS6nCkG_Ua95v7s"))}func TestCallbackHandler_NewUser(t *testing.T) {@@ -96,7 +96,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.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.PGavs5a6HRotRozfXfNP39JPb0vSus_8LL9MAOeLGDs"))+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.QklasoVtsMu_urLZsJv0CDu0VuMFI2CNC78ckx0nSfQ"))}func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {@@ -113,5 +113,5 @@ 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.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.n73-Qqhb_6lIALS_H3UzrEuzLTHgtS6nCkG_Ua95v7s"))}diff --git a/app/handlers/signup.go b/app/handlers/signup.gonew file mode 100644index 000000000..48482023f--- /dev/null+++ b/app/handlers/signup.go@@ -0,0 +1,125 @@+package handlers++import (+ "net/http"++ "strings"++ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/env"+ "github.com/getfider/fider/app/pkg/jwt"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/validate"+ "github.com/labstack/echo"+)++// CheckAvailability checks if given domain is available to be used+func CheckAvailability() web.HandlerFunc {+ return func(c web.Context) error {+ subdomain := c.Param("subdomain")+ ok, messages, err := validate.Subdomain(c.Services().Tenants, subdomain)+ if err != nil {+ return c.Failure(err)+ }++ if !ok {+ return c.Ok(echo.Map{+ "message": strings.Join(messages, ","),+ })+ }++ return c.Ok(echo.Map{})+ }+}++type createTenantInput struct {+ Token string `json:"token"`+ Name string `json:"name"`+ Subdomain string `json:"subdomain"`+}++//CreateTenant creates a new tenant+func CreateTenant() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(createTenantInput)+ if err := c.Bind(input); err != nil {+ return c.Failure(err)+ }++ if input.Token == "" {+ return c.BadRequest(echo.Map{+ "message": "Please identify yourself before proceeding",+ })+ }++ claims, err := jwt.DecodeOAuthClaims(input.Token)+ if err != nil {+ return c.Failure(err)+ }++ if env.IsSingleHostMode() {+ input.Subdomain = "Default"+ }++ tenant := &models.Tenant{+ Name: input.Name,+ Subdomain: input.Subdomain,+ }++ if tenant.Name == "" {+ return c.BadRequest(echo.Map{+ "message": "Name is required",+ })+ }++ ok, messages, err := validate.Subdomain(c.Services().Tenants, tenant.Subdomain)+ if err != nil {+ return c.Failure(err)+ }++ if !ok {+ return c.BadRequest(echo.Map{+ "message": strings.Join(messages, ","),+ })+ }++ if err := c.Services().Tenants.Add(tenant); err != nil {+ return c.Failure(err)+ }++ user := &models.User{+ Name: claims.OAuthName,+ Email: claims.OAuthEmail,+ Tenant: tenant,+ Role: models.RoleAdministrator,+ Providers: []*models.UserProvider{+ {UID: claims.OAuthID, Name: claims.OAuthProvider},+ },+ }+ if err := c.Services().Users.Register(user); err != nil {+ return c.Failure(err)+ }++ return c.Ok(echo.Map{+ "id": tenant.ID,+ })+ }+}++//SignUp is the entry point for installation / signup+func SignUp() web.HandlerFunc {+ return func(c web.Context) error {+ if env.IsSingleHostMode() {+ tenant, err := c.Services().Tenants.First()+ if err != nil && err != app.ErrNotFound {+ return c.Failure(err)+ }++ if tenant != nil {+ return c.Redirect(http.StatusTemporaryRedirect, "/")+ }+ }+ return c.Page(echo.Map{})+ }+}diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.gonew file mode 100644index 000000000..d2bb861cd--- /dev/null+++ b/app/handlers/signup_test.go@@ -0,0 +1,168 @@+package handlers_test++import (+ "testing"++ "fmt"++ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/handlers"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/jwt"+ "github.com/getfider/fider/app/storage/inmemory"+ . "github.com/onsi/gomega"+)++func TestSignUpHandler_MultiTenant(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ code, _ := server.Execute(handlers.SignUp())++ Expect(code).To(Equal(200))+}++func TestSignUpHandler_SingleTenant_NoTenants(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewSingleTenantServer()+ tenants := &inmemory.TenantStorage{}+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })+ code, _ := server.Execute(handlers.SignUp())++ Expect(code).To(Equal(200))+}++func TestSignUpHandler_SingleTenant_WithTenants(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewSingleTenantServer()+ tenants := &inmemory.TenantStorage{}+ tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })+ code, _ := server.Execute(handlers.SignUp())++ Expect(code).To(Equal(307))+}++func TestCheckAvailabilityHandler_InvalidSubdomain(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ tenants := &inmemory.TenantStorage{}+ tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })+ code, response := server.ExecuteAsJSON(handlers.CheckAvailability())++ Expect(code).To(Equal(200))+ Expect(response.String("message")).NotTo(BeNil())+}++func TestCheckAvailabilityHandler_UnavailableSubdomain(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ server.Context.SetParamNames("subdomain")+ server.Context.SetParamValues("got")+ tenants := &inmemory.TenantStorage{}+ tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })+ code, response := server.ExecuteAsJSON(handlers.CheckAvailability())++ Expect(code).To(Equal(200))+ Expect(response.String("message")).NotTo(BeNil())+}++func TestCheckAvailabilityHandler_ValidSubdomain(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ server.Context.SetParamNames("subdomain")+ server.Context.SetParamValues("mycompany")+ tenants := &inmemory.TenantStorage{}+ tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })+ code, response := server.ExecuteAsJSON(handlers.CheckAvailability())++ Expect(code).To(Equal(200))+ _, err := response.String("message")+ Expect(err).NotTo(BeNil())+}++func TestCreateTenantHandler_EmptyInput(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ server.Context.SetServices(&app.Services{+ Tenants: &inmemory.TenantStorage{},+ })+ code, _ := server.ExecutePost(handlers.CreateTenant(), `{ }`)++ Expect(code).To(Equal(400))+}++func TestCreateTenantHandler_EmptyName(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ server.Context.SetServices(&app.Services{+ Tenants: &inmemory.TenantStorage{},+ })+ token, _ := jwt.Encode(&models.OAuthClaims{+ OAuthID: "123",+ OAuthName: "Jon Snow",+ OAuthEmail: "[email protected]",+ OAuthProvider: "facebook",+ })+ code, _ := server.ExecutePost(handlers.CreateTenant(), fmt.Sprintf(`{ "token": "%s" }`, token))++ Expect(code).To(Equal(400))+}++func TestCreateTenantHandler_EmptySubdomain(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ server.Context.SetServices(&app.Services{+ Tenants: &inmemory.TenantStorage{},+ })+ token, _ := jwt.Encode(&models.OAuthClaims{+ OAuthID: "123",+ OAuthName: "Jon Snow",+ OAuthEmail: "[email protected]",+ OAuthProvider: "facebook",+ })+ code, _ := server.ExecutePost(handlers.CreateTenant(), fmt.Sprintf(`{ "token": "%s", "name": "My Company" }`, token))++ Expect(code).To(Equal(400))+}++func TestCreateTenantHandler_ValidInput(t *testing.T) {+ RegisterTestingT(t)++ server := mock.NewServer()+ server.Context.SetServices(&app.Services{+ Tenants: &inmemory.TenantStorage{},+ Users: &inmemory.UserStorage{},+ })+ token, _ := jwt.Encode(&models.OAuthClaims{+ OAuthID: "123",+ OAuthName: "Jon Snow",+ OAuthEmail: "[email protected]",+ OAuthProvider: "facebook",+ })+ code, _ := server.ExecutePost(handlers.CreateTenant(), fmt.Sprintf(`{ "token": "%s", "name": "My Company", "subdomain": "mycompany" }`, token))++ Expect(code).To(Equal(200))+}diff --git a/app/middlewares/domain.go b/app/middlewares/domain.goindex aecae0c9b..69c1a04b1 100644--- a/app/middlewares/domain.go+++ b/app/middlewares/domain.go@@ -5,7 +5,6 @@ import ("net/url""github.com/getfider/fider/app"- "github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/web")@@ -24,12 +23,11 @@ func SingleTenant() web.MiddlewareFunc {return func(c web.Context) error {tenants := c.Services().Tenantstenant, err := tenants.First()- if err == app.ErrNotFound {- tenant = &models.Tenant{- Name: "Default",- Subdomain: "default",+ if err != nil {+ if err == app.ErrNotFound {+ return c.Redirect(http.StatusTemporaryRedirect, "/signup")}- tenants.Add(tenant)+ return err}c.SetTenant(tenant)diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.goindex 52ee76330..38bc01cca 100644--- a/app/middlewares/domain_test.go+++ b/app/middlewares/domain_test.go@@ -100,7 +100,7 @@ func TestMultiTenant_UnknownDomain(t *testing.T) {Expect(status).To(Equal(http.StatusNotFound))}-func TestSingleTenant(t *testing.T) {+func TestSingleTenant_NoTenants_RedirectToSignUp(t *testing.T) {RegisterTestingT(t)tenants := &inmemory.TenantStorage{}@@ -111,17 +111,34 @@ func TestSingleTenant(t *testing.T) {})server.Use(middlewares.SingleTenant())- status, _ := server.Execute(func(c web.Context) error {+ status, response := server.Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})- tenant, err := tenants.First()+ Expect(status).To(Equal(http.StatusTemporaryRedirect))+ Expect(response.HeaderMap.Get("Location")).To(Equal("/signup"))+}++func TestSingleTenant_WithTenants_ShouldSetToContext(t *testing.T) {+ RegisterTestingT(t)++ tenant := &models.Tenant{Name: "Some Tenant"}+ tenants := &inmemory.TenantStorage{}+ tenants.Add(tenant)++ server := mock.NewServer()+ server.Context.Request().Host = "somedomain.com"+ server.Context.SetServices(&app.Services{+ Tenants: tenants,+ })++ server.Use(middlewares.SingleTenant())+ status, _ := server.Execute(func(c web.Context) error {+ return c.NoContent(http.StatusOK)+ })Expect(status).To(Equal(http.StatusOK))- Expect(err).To(BeNil())- Expect(tenant.Name).To(Equal("Default"))- Expect(tenant.Subdomain).To(Equal("default"))- Expect(server.Context.Tenant()).To(Equal(tenant))+ Expect(server.Context.Tenant()).Should(Equal(tenant))}func TestHostChecker(t *testing.T) {diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.goindex 13f6c8af3..11b192ae6 100644--- a/app/middlewares/jwt.go+++ b/app/middlewares/jwt.go@@ -13,30 +13,37 @@ import (func JwtGetter() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {- var err error-- if cookie, err := c.Cookie("auth"); err == nil {- if claims, err := jwt.Decode(cookie.Value); err == nil {- services := c.Services()-- if user, err := services.Users.GetByID(claims.UserID); err == nil {- if user.Tenant.ID == c.Tenant().ID {- c.SetUser(user)- if !c.IsAjax() {- if ids, err := services.Ideas.SupportedBy(user.ID); err == nil {- c.AddRenderVar("supportedIdeas", ids)- }- }- }- }+ cookie, err := c.Cookie("auth")+ if err != nil {+ if err == http.ErrNoCookie {+ return next(c)}+ return err}+ claims, err := jwt.DecodeFiderClaims(cookie.Value)if err != nil {return err}+ services := c.Services()+ user, err := services.Users.GetByID(claims.UserID)+ if err != nil {+ return err+ }++ if c.Tenant() != nil && user.Tenant.ID == c.Tenant().ID {+ c.SetUser(user)+ if !c.IsAjax() {+ ids, err := services.Ideas.SupportedBy(user.ID)+ if err != nil {+ return err+ }+ c.AddRenderVar("supportedIdeas", ids)+ }+ }+return next(c)}}diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.goindex fc6f893ab..534c4e26c 100644--- a/app/middlewares/jwt_test.go+++ b/app/middlewares/jwt_test.go@@ -47,8 +47,8 @@ func TestJwtGetter_WithCookie(t *testing.T) {})users := &inmemory.UserStorage{}-users.Register(user)+server := mock.NewServer()server.Context.SetServices(&app.Services{Users: users,@@ -72,12 +72,20 @@ func TestJwtGetter_WithCookie(t *testing.T) {func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {RegisterTestingT(t)+ tenant := &models.Tenant{ID: 300}+ user := &models.User{+ ID: 300,+ Name: "Jon Snow",+ Tenant: tenant,+ }token, _ := jwt.Encode(&models.FiderClaims{UserID: 300,UserName: "Jon Snow",})users := &inmemory.UserStorage{}+ users.Register(user)+server := mock.NewServer()server.Context.SetTenant(&models.Tenant{ID: 400})server.Context.SetServices(&app.Services{diff --git a/app/mock/server.go b/app/mock/server.goindex b3190989f..eb6ee47e0 100644--- a/app/mock/server.go+++ b/app/mock/server.go@@ -4,6 +4,7 @@ import ("encoding/json""net/http""net/http/httptest"+ "os""strings""github.com/getfider/fider/app/middlewares"@@ -22,8 +23,16 @@ type Server struct {middleware web.MiddlewareFunc}+// NewSingleTenantServer creates a new multitenant test server+func NewSingleTenantServer() *Server {+ server := NewServer()+ os.Setenv("HOST_MODE", "single")+ return server+}+// NewServer creates a new test serverfunc NewServer() *Server {+ os.Setenv("HOST_MODE", "multi")settings := &models.AppSettings{}engine := web.New(settings)diff --git a/app/models/identity.go b/app/models/identity.goindex 1b68a8b6b..fd0e1e72d 100644--- a/app/models/identity.go+++ b/app/models/identity.go@@ -52,3 +52,12 @@ type FiderClaims struct {UserEmail string `json:"user/email"`jwt.StandardClaims}++//OAuthClaims represents what goes into temporary OAuth JWT tokens+type OAuthClaims struct {+ OAuthID string `json:"oauth/id"`+ OAuthProvider string `json:"oauth/provider"`+ OAuthName string `json:"oauth/name"`+ OAuthEmail string `json:"oauth/email"`+ jwt.StandardClaims+}diff --git a/app/models/infra.go b/app/models/infra.goindex ee903c2ad..01bae7b3a 100644--- a/app/models/infra.go+++ b/app/models/infra.go@@ -2,10 +2,11 @@ package models// AppSettings is an application-wide settingstype AppSettings struct {- BuildTime string- Version string- AuthEndpoint string- Environment string- GoogleAnalytics string- Compiler string+ Mode string `json:"mode"`+ BuildTime string `json:"buildTime"`+ Version string `json:"version"`+ Environment string `json:"environment"`+ GoogleAnalytics string `json:"googleAnalytics"`+ Compiler string `json:"compiler"`+ Domain string `json:"domain"`}diff --git a/app/pkg/env/env.go b/app/pkg/env/env.goindex 595f7e647..6a96f3a8f 100644--- a/app/pkg/env/env.go+++ b/app/pkg/env/env.go@@ -3,6 +3,7 @@ package envimport ("fmt""os"+ "strings""path")@@ -26,9 +27,26 @@ func MustGet(name string) string {return value}+// Mode returns HOST_MODE or its default value+func Mode() string {+ return GetEnvOrDefault("HOST_MODE", "single")+}+// IsSingleHostMode returns true if host mode is set to single tenantfunc IsSingleHostMode() bool {- return GetEnvOrDefault("HOST_MODE", "single") == "single"+ return Mode() == "single"+}++// MultiTenantDomain returns domain name of current instance for multi tenant hosts+func MultiTenantDomain() string {+ if !IsSingleHostMode() {+ endpoint := MustGet("AUTH_ENDPOINT")+ if idx := strings.Index(endpoint, "."); idx != -1 {+ return endpoint[idx:]+ }+ panic(fmt.Sprintf("Could not extract domain from %s", endpoint))+ }+ return ""}// Current returns current Fider environmentdiff --git a/app/pkg/jwt/jwt.go b/app/pkg/jwt/jwt.goindex 67fddc500..94b92908c 100644--- a/app/pkg/jwt/jwt.go+++ b/app/pkg/jwt/jwt.go@@ -9,21 +9,38 @@ import (var jwtSecret = env.MustGet("JWT_SECRET")//Encode creates new JWT tokens with given claims-func Encode(claims *models.FiderClaims) (string, error) {+func Encode(claims jwtgo.Claims) (string, error) {jwtToken := jwtgo.NewWithClaims(jwtgo.GetSigningMethod("HS256"), claims)return jwtToken.SignedString([]byte(jwtSecret))}-//Decode extract claims from JWT tokens-func Decode(token string) (*models.FiderClaims, error) {+//DecodeFiderClaims extract claims from JWT tokens+func DecodeFiderClaims(token string) (*models.FiderClaims, error) {claims := &models.FiderClaims{}+ err := decode(token, claims)+ if err == nil {+ return claims, nil+ }+ return nil, err+}++//DecodeOAuthClaims extract OAuthClaims from given JWT token+func DecodeOAuthClaims(token string) (*models.OAuthClaims, error) {+ claims := &models.OAuthClaims{}+ err := decode(token, claims)+ if err == nil {+ return claims, nil+ }+ return nil, err+}++func decode(token string, claims jwtgo.Claims) error {jwtToken, err := jwtgo.ParseWithClaims(token, claims, func(t *jwtgo.Token) (interface{}, error) {return []byte(jwtSecret), nil})if err == nil && jwtToken.Valid {- return claims, nil+ return nil}-- return nil, err+ return err}diff --git a/app/pkg/jwt/jwt_test.go b/app/pkg/jwt/jwt_test.goindex f9d7ca556..14fa30cf7 100644--- a/app/pkg/jwt/jwt_test.go+++ b/app/pkg/jwt/jwt_test.go@@ -33,13 +33,33 @@ func TestJWT_Decode(t *testing.T) {token, _ := jwt.Encode(claims)- decoded, err := jwt.Decode(token)+ decoded, err := jwt.DecodeFiderClaims(token)Expect(err).To(BeNil())Expect(decoded.UserID).To(Equal(claims.UserID))Expect(decoded.UserName).To(Equal(claims.UserName))Expect(decoded.UserEmail).To(Equal(claims.UserEmail))}+func TestJWT_DecodeOAuthClaims(t *testing.T) {+ RegisterTestingT(t)++ claims := &models.OAuthClaims{+ OAuthID: "2",+ OAuthEmail: "[email protected]",+ OAuthName: "Jon Snow",+ OAuthProvider: "facebook",+ }++ token, _ := jwt.Encode(claims)++ decoded, err := jwt.DecodeOAuthClaims(token)+ Expect(err).To(BeNil())+ Expect(decoded.OAuthID).To(Equal(claims.OAuthID))+ Expect(decoded.OAuthEmail).To(Equal(claims.OAuthEmail))+ Expect(decoded.OAuthName).To(Equal(claims.OAuthName))+ Expect(decoded.OAuthProvider).To(Equal(claims.OAuthProvider))+}+func TestJWT_DecodeChangedToken(t *testing.T) {RegisterTestingT(t)@@ -51,7 +71,7 @@ func TestJWT_DecodeChangedToken(t *testing.T) {token, _ := jwt.Encode(claims)- decoded, err := jwt.Decode(token + "foo")+ decoded, err := jwt.DecodeFiderClaims(token + "foo")Expect(err).ToNot(BeNil())Expect(decoded).To(BeNil())}diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 70ac4858c..c5edcf0cf 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -62,9 +62,19 @@ func (ctx *Context) Failure(err error) error {return echo.NewHTTPError(http.StatusInternalServerError, err)}+//Ok returns 200 OK with JSON result+func (ctx *Context) Ok(dict echo.Map) error {+ return ctx.JSON(http.StatusOK, dict)+}++//BadRequest returns 400 BadRequest with JSON result+func (ctx *Context) BadRequest(dict echo.Map) error {+ return ctx.JSON(http.StatusBadRequest, dict)+}+//Page returns a page with given variablesfunc (ctx *Context) Page(dict echo.Map) error {- return ctx.Render(200, "index.html", dict)+ return ctx.Render(http.StatusOK, "index.html", dict)}//User returns authenticated userdiff --git a/app/storage/identity.go b/app/storage/identity.goindex 10b0fb2bb..0e5662ba5 100644--- a/app/storage/identity.go+++ b/app/storage/identity.go@@ -15,4 +15,5 @@ type Tenant interface {Add(tenant *models.Tenant) errorFirst() (*models.Tenant, error)GetByDomain(domain string) (*models.Tenant, error)+ IsSubdomainAvailable(subdomain string) (bool, error)}diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.goindex cc44d0238..5fb7445b1 100644--- a/app/storage/inmemory/tenant.go+++ b/app/storage/inmemory/tenant.go@@ -38,6 +38,16 @@ func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {return nil, app.ErrNotFound}+// IsSubdomainAvailable returns true if subdomain is available to use+func (s *TenantStorage) IsSubdomainAvailable(subdomain string) (bool, error) {+ for _, tenant := range s.tenants {+ if tenant.Subdomain == subdomain {+ return false, nil+ }+ }+ return true, nil+}+func extractSubdomain(domain string) string {if idx := strings.Index(domain, "."); idx != -1 {return domain[:idx]diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex bd53ab7ae..7caad7f8a 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -77,6 +77,12 @@ func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {return tenant.toModel(), nil}+// IsSubdomainAvailable returns true if subdomain is available to use+func (s *TenantStorage) IsSubdomainAvailable(subdomain string) (bool, error) {+ exists, err := s.trx.Exists("SELECT id FROM tenants WHERE subdomain = $1", subdomain)+ return !exists, err+}+func extractSubdomain(domain string) string {if idx := strings.Index(domain, "."); idx != -1 {return domain[:idx]diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex baa372904..6e67c7713 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -108,3 +108,35 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {Expect(tenant.CNAME).To(Equal("mydomain.anydomain.com"))Expect(err).To(BeNil())}++func TestTenantStorage_IsSubdomainAvailable_ExistingDomain(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ db.Seed()+ defer db.Close()++ trx, _ := db.Begin()+ defer trx.Rollback()++ tenants := postgres.NewTenantStorage(trx)+ available, err := tenants.IsSubdomainAvailable("demo")++ Expect(available).To(BeFalse())+ Expect(err).To(BeNil())+}++func TestTenantStorage_IsSubdomainAvailable_NewDomain(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ db.Seed()+ defer db.Close()++ trx, _ := db.Begin()+ defer trx.Rollback()++ tenants := postgres.NewTenantStorage(trx)+ available, err := tenants.IsSubdomainAvailable("thisisanewdomain")++ Expect(available).To(BeTrue())+ Expect(err).To(BeNil())+}diff --git a/app/validate/domain.go b/app/validate/domain.gonew file mode 100644index 000000000..9caf68fc7--- /dev/null+++ b/app/validate/domain.go@@ -0,0 +1,42 @@+package validate++import (+ "fmt"+ "regexp"++ "github.com/getfider/fider/app/storage"+)++var r, _ = regexp.Compile("^[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]$")++//Subdomain validates given subdomain+func Subdomain(tenants storage.Tenant, subdomain string) (bool, []string, error) {+ if len(subdomain) <= 2 {+ return false, []string{"Subdomain must be more than 2 characters"}, nil+ }++ if len(subdomain) > 40 {+ return false, []string{"Subdomain must be less than 40 characters"}, nil+ }++ if !r.MatchString(subdomain) {+ return false, []string{"Subdomain contains invalid characters"}, nil+ }++ switch subdomain {+ case+ "signup", "fider", "admin", "setup", "about", "wecanhearyou":+ return false, []string{fmt.Sprintf("%s is not a valid subdomain name", subdomain)}, nil+ }++ available, err := tenants.IsSubdomainAvailable(subdomain)+ if err != nil {+ return false, make([]string, 0), err+ }++ if !available {+ return false, []string{"This subdomain is not available anymore"}, nil+ }++ return true, make([]string, 0), nil+}diff --git a/app/validate/domain_test.go b/app/validate/domain_test.gonew file mode 100644index 000000000..9c33d3b38--- /dev/null+++ b/app/validate/domain_test.go@@ -0,0 +1,61 @@+package validate_test++import (+ "testing"++ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/storage/inmemory"+ "github.com/getfider/fider/app/validate"+ . "github.com/onsi/gomega"+)++func TestInvalidSubdomains(t *testing.T) {+ RegisterTestingT(t)++ for _, subdomain := range []string{+ "me",+ "i",+ "signup",+ "",+ "my company",+ "my@company",+ "my.company",+ "my+company",+ "1234567890123456789012345678901234567890ABC",+ } {+ ok, messages, err := validate.Subdomain(nil, subdomain)+ Expect(ok).To(BeFalse())+ Expect(len(messages) > 0).To(BeTrue())+ Expect(err).To(BeNil())+ }+}++func TestValidSubdomains_Availability(t *testing.T) {+ RegisterTestingT(t)++ tenants := &inmemory.TenantStorage{}+ tenants.Add(&models.Tenant{Subdomain: "footbook"})+ tenants.Add(&models.Tenant{Subdomain: "yourcompany"})+ tenants.Add(&models.Tenant{Subdomain: "newyork"})++ for _, subdomain := range []string{+ "footbook",+ "yourcompany",+ "newyork",+ } {+ ok, messages, err := validate.Subdomain(tenants, subdomain)+ Expect(ok).To(BeFalse())+ Expect(len(messages)).To(Equal(1))+ Expect(err).To(BeNil())+ }++ for _, subdomain := range []string{+ "my-company",+ "123-company",+ } {+ ok, messages, err := validate.Subdomain(tenants, subdomain)+ Expect(ok).To(BeTrue())+ Expect(len(messages)).To(Equal(0))+ Expect(err).To(BeNil())+ }+}diff --git a/main.go b/main.goindex c35286dab..cffe8b1f9 100644--- a/main.go+++ b/main.go@@ -25,6 +25,8 @@ func main() {Compiler: runtime.Version(),Environment: env.Current(),GoogleAnalytics: env.GetEnvOrDefault("GOOGLE_ANALYTICS", ""),+ Mode: env.Mode(),+ Domain: env.MultiTenantDomain(),}e := GetMainEngine(settings)diff --git a/package-lock.json b/package-lock.jsonindex 9d6d2c78b..60aecb05c 100644--- a/package-lock.json+++ b/package-lock.json@@ -71,12 +71,6 @@"integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=","dev": true},- "align-text": {- "version": "0.1.4",- "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",- "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",- "dev": true- },"alphanum-sort": {"version": "1.0.2","resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",@@ -412,12 +406,6 @@"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=","dev": true},- "center-align": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",- "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",- "dev": true- },"chalk": {"version": "1.1.3","resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",@@ -2244,12 +2232,6 @@"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=","dev": true},- "longest": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",- "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",- "dev": true- },"loose-envify": {"version": "1.3.1","resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",@@ -2349,7 +2331,7 @@"minimatch": {"version": "3.0.4","resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",- "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",+ "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=","dev": true},"minimist": {@@ -2458,7 +2440,7 @@"npmlog": {"version": "4.1.0","resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",- "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",+ "integrity": "sha1-3Fm+6F9k8A7UJO+yrweD3yXRwLU=","dev": true},"num2fraction": {@@ -3116,12 +3098,6 @@"integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=","dev": true},- "right-align": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",- "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",- "dev": true- },"rimraf": {"version": "2.6.1","resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",@@ -3384,6 +3360,11 @@"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=","dev": true},+ "throttle-debounce": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.0.1.tgz",+ "integrity": "sha1-2tD+Ew+drzcZ/eoz3Dao5rp/MLU="+ },"timers-browserify": {"version": "2.0.2","resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz",@@ -3685,19 +3666,7 @@"wide-align": {"version": "1.1.2","resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",- "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",- "dev": true- },- "window-size": {- "version": "0.1.0",- "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",- "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",- "dev": true- },- "wordwrap": {- "version": "0.0.2",- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",- "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",+ "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=","dev": true},"wrap-ansi": {diff --git a/package.json b/package.jsonindex 0dfd38e98..96a01f65f 100644--- a/package.json+++ b/package.json@@ -16,7 +16,8 @@"moment": "^2.18.1","react": "^15.5.4","react-dom": "^15.5.4",- "semantic-ui-css": "^2.2.10"+ "semantic-ui-css": "^2.2.10",+ "throttle-debounce": "^1.0.1"},"devDependencies": {"@types/jquery": "^2.0.45",diff --git a/public/index.tsx b/public/index.tsxindex 824a918f2..16fe20d5c 100644--- a/public/index.tsx+++ b/public/index.tsx@@ -4,13 +4,15 @@ import * as ReactDOM from 'react-dom';import { HomePage as AdminHomePage } from './admin/HomePage';import { HomePage as SiteHomePage } from './site/HomePage';import { ShowIdeaPage } from './site/ShowIdeaPage';+import { SignUpPage } from './setup/SignUpPage';import { setup } from './storage';-import './style/main.scss';+import './main.scss';const pathRegex = [{ regex: new RegExp('^\/$'), component: <SiteHomePage /> },{ regex: new RegExp('^\/admin$'), component: <AdminHomePage /> },+ { regex: new RegExp('^\/signup$'), component: <SignUpPage /> },{ regex: new RegExp('^\/ideas\/\\d+.*$'), component: <ShowIdeaPage /> },];diff --git a/public/jwt.ts b/public/jwt.tsnew file mode 100644index 000000000..7777af683--- /dev/null+++ b/public/jwt.ts@@ -0,0 +1,4 @@+export function decode(token: string): any {+ const segments = token.split('.');+ return JSON.parse(window.atob(segments[1]));+}diff --git a/public/style/main.scss b/public/main.scsssimilarity index 100%rename from public/style/main.scssrename to public/main.scssdiff --git a/public/models/index.ts b/public/models/index.tsindex f5c677802..6021329b4 100644--- a/public/models/index.ts+++ b/public/models/index.ts@@ -1,2 +1,3 @@export * from './idea';export * from './identity';+export * from './settings';diff --git a/public/models/settings.ts b/public/models/settings.tsnew file mode 100644index 000000000..8832c8aaf--- /dev/null+++ b/public/models/settings.ts@@ -0,0 +1,10 @@+export interface AppSettings {+ mode: string;+ buildTime: string;+ version: string;+ authEndpoint: string;+ environment: string;+ googleAnalytics: string;+ compiler: string;+ domain: string;+}diff --git a/public/page.ts b/public/page.tsnew file mode 100644index 000000000..12cc88a65--- /dev/null+++ b/public/page.ts@@ -0,0 +1,20 @@+export function setTitle(title: string) {+ document.title = title;+}++export function getQueryString(name: string) {+ const url = window.location.href;+ name = name.replace(/[\[\]]/g, '\\$&');+ const regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)');+ const results = regex.exec(url);++ if (!results) {+ return null;+ }++ if (!results[2]) {+ return '';+ }++ return decodeURIComponent(results[2].replace(/\+/g, ' '));+}diff --git a/public/setup/SignUpPage.tsx b/public/setup/SignUpPage.tsxnew file mode 100644index 000000000..0b5b19d7a--- /dev/null+++ b/public/setup/SignUpPage.tsx@@ -0,0 +1,165 @@+import * as React from 'react';++import { Footer } from '../shared/Footer';+import { EnvironmentInfo, Gravatar } from '../shared/Common';+import { AppSettings } from '../models';+import { isSingleHostMode, getAppSettings } from '../storage';+import { SocialSignInList } from '../shared/SocialSignInList';+import { setTitle, getQueryString } from '../page';+import { DisplayError } from '../shared/Common';+import axios from 'axios';+import { decode } from '../jwt';+const td = require('throttle-debounce');+const logo = require('../imgs/logo.png');++import './signup.scss';++interface OAuthUser {+ token: string;+ name: string;+ email: string;+}++interface SignUpPageState {+ name?: string;+ clicked: boolean;+ error?: Error;+ subdomain: {+ available: boolean,+ message?: string,+ value?: string+ };+}++export class SignUpPage extends React.Component<{}, SignUpPageState> {+ private settings: AppSettings;+ private user: OAuthUser;++ constructor(props: {}) {+ super(props);+ this.state = {+ clicked: false,+ subdomain: { available: false }+ };++ this.settings = getAppSettings();+ this.checkAvailability = td.debounce(300, this.checkAvailability);++ setTitle(isSingleHostMode() ? 'Installation · Fider' : 'New tenant sign up · Fider');++ const token = getQueryString('jwt');+ if (token) {+ const data = decode(token);+ this.user = {+ token,+ name: data['oauth/name'],+ email: data['oauth/email']+ };+ }+ }++ private async confirm() {+ this.setState({+ clicked: true,+ error: undefined+ });++ try {+ const response = await axios.post('/api/tenants', {+ token: this.user ? this.user.token : null,+ name: this.state.name,+ subdomain: this.state.subdomain.value,+ });++ if (isSingleHostMode()) {+ location.reload();+ } else {+ location.href = `${location.protocol}//${this.state.subdomain.value}${this.settings.domain}`;+ }+ } catch (ex) {+ this.setState({+ clicked: false,+ error: ex.response.data+ });+ }+ }++ private async checkAvailability(subdomain: string) {+ const url = `/api/tenants/${subdomain}/availability`;+ const result = await axios.get(url);++ this.setState({+ subdomain: {+ value: subdomain,+ available: !result.data.message,+ message: result.data.message+ }+ });+ }++ public render() {+ const buttonClasses = `ui positive button ${this.state.clicked && 'loading disabled'}`;+ return <div>+ <EnvironmentInfo />+ <div id="fdr-signup-page" className="ui container">+ <img className="logo" src={logo} />++ <h3 className="ui header">1. Who are you?</h3>++ {+ this.user ?+ <div>+ <p>+ Hello, + <Gravatar email={this.user.email} />+ <b>{this.user.name}</b> ({this.user.email})+ </p>+ </div> :+ <div>+ <p>We need to identify you in order to setup your new Fider instance.</p>+ <SocialSignInList size="normal" orientation="horizontal" />+ </div>+ }++ <div className="ui section divider"></div>++ <h3 className="ui header">2. Organization details</h3>+ <div className="ui form">+ <div className="inline field">+ <label>Name</label>+ <input id="name" type="text" placeholder="Your organization name" onChange={(e) => this.setState({ name: e.currentTarget.value })}/>+ </div>+ { !isSingleHostMode() && <div className="inline field">+ <label>Identity</label>+ <div className="ui right labeled input">+ <div className="ui label">https://</div>+ <input id="subdomain" type="text" placeholder="orgname" onChange={(e) => this.checkAvailability(e.currentTarget.value)} />+ <div className="ui label">{ this.settings.domain }</div>+ {+ this.state.subdomain.available &&+ <div className="ui left pointing green basic label">+ Great!+ </div>+ }+ {+ this.state.subdomain.message &&+ <div className="ui left pointing red basic label">+ { this.state.subdomain.message }+ </div>+ }+ </div>+ </div> }+ </div>+ <div className="ui section divider"></div>++ <h3 className="ui header">3. Review and continue</h3>++ <p>Please make sure information provided above is correct before proceeding.</p>+ <DisplayError error={this.state.error} />++ <button className={buttonClasses} onClick={() => this.confirm()}>Confirm</button>+ </div>+ <Footer />+ </div>;+ }+}diff --git a/public/setup/signup.scss b/public/setup/signup.scssnew file mode 100644index 000000000..c1a15c5eb--- /dev/null+++ b/public/setup/signup.scss@@ -0,0 +1,16 @@+#fdr-signup-page {+ margin-top: 50px;++ .logo {+ height: 100px;+ }++ .ui.form {+ label {+ width: 50px;+ }+ input#name {+ width: 300px;+ }+ }+}\ No newline at end of filediff --git a/public/shared/Common.tsx b/public/shared/Common.tsxindex 2f1d29782..525d9358b 100644--- a/public/shared/Common.tsx+++ b/public/shared/Common.tsx@@ -2,7 +2,7 @@ import * as React from 'react';import * as moment from 'moment';import md5 = require('md5');import { AxiosError, AxiosResponse } from 'axios';-import { get, getCurrentUser } from '../storage';+import { getCurrentUser, getAppSettings, isProduction } from '../storage';import { User, IdeaResponse, IdeaStatus } from '../models';export const Gravatar = (props: {email?: string}) => {@@ -34,13 +34,13 @@ export const DisplayError = (props: {error?: Error}) => {};export const EnvironmentInfo = () => {- const settings = get<any>('settings');- if (settings.Environment.toLowerCase() !== 'production') {+ if (!isProduction()) {+ const settings = getAppSettings();return <div className="ui mini negative message no-border no-margin">- Env: { settings.Environment } |- Compiler: { settings.Compiler } |- Version: { settings.Version } |- BuildTime: { settings.BuildTime }+ Env: { settings.environment } |+ Compiler: { settings.compiler } |+ Version: { settings.version } |+ BuildTime: { settings.buildTime }</div>;}return <div/>;diff --git a/public/site/ShowIdeaPage.tsx b/public/site/ShowIdeaPage.tsxindex 1635871e2..08d066609 100644--- a/public/site/ShowIdeaPage.tsx+++ b/public/site/ShowIdeaPage.tsx@@ -8,6 +8,7 @@ import { Gravatar, MultiLineText, ShowIdeaResponse } from '../shared/Common';import { SocialSignInButton } from '../shared/SocialSignInButton';import { SupportCounter } from '../shared/SupportCounter';import { ResponseForm } from '../shared/ResponseForm';+import { setTitle } from '../page';import { Footer } from '../shared/Footer';import { Header } from '../shared/Header';@@ -24,7 +25,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {this.user = getCurrentUser();this.idea = get<Idea>('idea');this.comments = getArray<Comment>('comments');- document.title = `${this.idea.title} · Idea #${this.idea.number} · ${document.title}`;+ setTitle(`${this.idea.title} · Idea #${this.idea.number} · ${document.title}`);}public render() {diff --git a/public/storage.ts b/public/storage.tsindex ae3f77731..4b5ac05a0 100644--- a/public/storage.ts+++ b/public/storage.ts@@ -1,4 +1,4 @@-import { User } from './models';+import { User, AppSettings } from './models';const w: any = window;@@ -33,3 +33,15 @@ export function get<T>(key: string): T {export function getArray<T>(key: string): T[] {return w[`_${key}`] || [];}++export function getAppSettings(): AppSettings {+ return get<AppSettings>('settings');+}++export function isSingleHostMode() {+ return getAppSettings().mode.toLowerCase() === 'single';+}++export function isProduction() {+ return getAppSettings().environment.toLowerCase() === 'production';+}diff --git a/router.go b/router.goindex 7ed89c195..b6885557e 100644--- a/router.go+++ b/router.go@@ -37,6 +37,27 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {assets.Static("/", "dist")}+ signup := r.Group("")+ {+ signup.Use(middlewares.Setup(db))+ signup.Use(middlewares.AddServices())++ signup.Post("/api/tenants", handlers.CreateTenant())+ signup.Get("/api/tenants/:subdomain/availability", handlers.CheckAvailability())+ signup.Get("/signup", handlers.SignUp())+ }++ auth := r.Group("/oauth")+ {+ auth.Use(middlewares.Setup(db))+ auth.Use(middlewares.AddServices())++ auth.Get("/facebook", handlers.Login(oauth.FacebookProvider))+ auth.Get("/facebook/callback", handlers.OAuthCallback(oauth.FacebookProvider))+ auth.Get("/google", handlers.Login(oauth.GoogleProvider))+ auth.Get("/google/callback", handlers.OAuthCallback(oauth.GoogleProvider))+ }+page := r.Group(""){page.Use(middlewares.Setup(db))@@ -65,14 +86,6 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {private.Post("/api/ideas/:number/unsupport", handlers.RemoveSupporter())}- auth := page.Group("/oauth")- {- auth.Get("/facebook", handlers.Login(oauth.FacebookProvider))- auth.Get("/facebook/callback", handlers.OAuthCallback(oauth.FacebookProvider))- auth.Get("/google", handlers.Login(oauth.GoogleProvider))- auth.Get("/google/callback", handlers.OAuthCallback(oauth.GoogleProvider))- }-admin := page.Group("/admin"){admin.Use(middlewares.IsAuthenticated())diff --git a/tslint.json b/tslint.jsonindex 29a3deebd..5b23ad27d 100644--- a/tslint.json+++ b/tslint.json@@ -17,6 +17,9 @@],"quotemark": [true, "single", "jsx-double"+ ],+ "max-line-length": [+ false]}}\ No newline at end of filediff --git a/views/index.html b/views/index.htmlindex 386b7c12f..0e7cd0f8e 100644--- a/views/index.html+++ b/views/index.html@@ -1,4 +1,8 @@-{{define "title"}}{{ .tenant.Name }}{{end}}+{{define "title"}}+ {{ if .tenant }}+ {{ .tenant.Name }}+ {{ end }}+{{end}}// Print all variables that does not start with _ (95)// Compressed to avoid whitespace being printed