Open platform to collect and prioritize feedback
fix empty cname when creating tenants (#59)
Guilherme Oenningde03f57e1b45
diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.goindex f81c5bc29..a41742052 100644--- a/app/handlers/oauth_test.go+++ b/app/handlers/oauth_test.go@@ -59,8 +59,7 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {RegisterTestingT(t)- tenant := &models.Tenant{ID: 1, Name: "Demonstration", Subdomain: "demo"}- services.Tenants.Add(tenant)+ tenant, _ := services.Tenants.Add("Demonstration", "demo")services.Users.Register(&models.User{ID: 300,@@ -83,8 +82,7 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {func TestCallbackHandler_NewUser(t *testing.T) {RegisterTestingT(t)- tenant := &models.Tenant{ID: 2, Name: "Orange", Subdomain: "orange"}- services.Tenants.Add(tenant)+ tenant, _ := services.Tenants.Add("Orange", "orange")server := mock.NewServer()server.Context.SetServices(services)diff --git a/app/handlers/signup.go b/app/handlers/signup.goindex a8755035e..0745e9d9f 100644--- a/app/handlers/signup.go+++ b/app/handlers/signup.go@@ -62,20 +62,13 @@ func CreateTenant() web.HandlerFunc {input.Subdomain = "default"}- tenant := &models.Tenant{- Name: input.Name,- Subdomain: input.Subdomain,- }-- tenant.Subdomain = strings.ToLower(input.Subdomain)-- if tenant.Name == "" {+ if input.Name == "" {return c.BadRequest(echo.Map{"message": "Name is required",})}- ok, messages, err := validate.Subdomain(c.Services().Tenants, tenant.Subdomain)+ ok, messages, err := validate.Subdomain(c.Services().Tenants, input.Subdomain)if err != nil {return c.Failure(err)}@@ -86,7 +79,8 @@ func CreateTenant() web.HandlerFunc {})}- if err := c.Services().Tenants.Add(tenant); err != nil {+ tenant, err := c.Services().Tenants.Add(input.Name, input.Subdomain)+ if err != nil {return c.Failure(err)}diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.goindex d2bb861cd..8bfbf3e6b 100644--- a/app/handlers/signup_test.go+++ b/app/handlers/signup_test.go@@ -41,7 +41,7 @@ func TestSignUpHandler_SingleTenant_WithTenants(t *testing.T) {server := mock.NewSingleTenantServer()tenants := &inmemory.TenantStorage{}- tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ tenants.Add("Game of Thrones", "got")server.Context.SetServices(&app.Services{Tenants: tenants,})@@ -55,7 +55,7 @@ func TestCheckAvailabilityHandler_InvalidSubdomain(t *testing.T) {server := mock.NewServer()tenants := &inmemory.TenantStorage{}- tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ tenants.Add("Game of Thrones", "got")server.Context.SetServices(&app.Services{Tenants: tenants,})@@ -72,7 +72,7 @@ func TestCheckAvailabilityHandler_UnavailableSubdomain(t *testing.T) {server.Context.SetParamNames("subdomain")server.Context.SetParamValues("got")tenants := &inmemory.TenantStorage{}- tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ tenants.Add("Game of Thrones", "got")server.Context.SetServices(&app.Services{Tenants: tenants,})@@ -89,7 +89,7 @@ func TestCheckAvailabilityHandler_ValidSubdomain(t *testing.T) {server.Context.SetParamNames("subdomain")server.Context.SetParamValues("mycompany")tenants := &inmemory.TenantStorage{}- tenants.Add(&models.Tenant{Name: "Game of Thrones", Subdomain: "got"})+ tenants.Add("Game of Thrones", "got")server.Context.SetServices(&app.Services{Tenants: tenants,})diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.goindex 38bc01cca..0e13896e0 100644--- a/app/middlewares/domain_test.go+++ b/app/middlewares/domain_test.go@@ -7,7 +7,6 @@ import ("github.com/getfider/fider/app""github.com/getfider/fider/app/middlewares""github.com/getfider/fider/app/mock"- "github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/web""github.com/getfider/fider/app/storage/inmemory". "github.com/onsi/gomega"@@ -38,8 +37,8 @@ func TestMultiTenant(t *testing.T) {RegisterTestingT(t)tenants := &inmemory.TenantStorage{}- tenants.Add(&models.Tenant{Name: "The Orange Inc.", Subdomain: "orange"})- tenants.Add(&models.Tenant{Name: "Demonstration", Subdomain: "demo"})+ tenants.Add("The Orange Inc.", "orange")+ tenants.Add("Demonstration", "demo")for _, testCase := range testCases {for _, host := range testCase.hosts {@@ -122,9 +121,8 @@ func TestSingleTenant_NoTenants_RedirectToSignUp(t *testing.T) {func TestSingleTenant_WithTenants_ShouldSetToContext(t *testing.T) {RegisterTestingT(t)- tenant := &models.Tenant{Name: "Some Tenant"}tenants := &inmemory.TenantStorage{}- tenants.Add(tenant)+ tenant, _ := tenants.Add("Some Tenant", "mytenant")server := mock.NewServer()server.Context.Request().Host = "somedomain.com"diff --git a/app/storage/identity.go b/app/storage/identity.goindex 0e5662ba5..4e311ccd2 100644--- a/app/storage/identity.go+++ b/app/storage/identity.go@@ -12,7 +12,7 @@ type User interface {// Tenant contains read and write operations for tenantstype Tenant interface {- Add(tenant *models.Tenant) error+ Add(name string, subdomain string) (*models.Tenant, error)First() (*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 5fb7445b1..6819e7745 100644--- a/app/storage/inmemory/tenant.go+++ b/app/storage/inmemory/tenant.go@@ -9,13 +9,16 @@ import (// TenantStorage contains read and write operations for tenantstype TenantStorage struct {+ lastID inttenants []*models.Tenant}// Add given tenant to tenant list-func (s *TenantStorage) Add(tenant *models.Tenant) error {+func (s *TenantStorage) Add(name string, subdomain string) (*models.Tenant, error) {+ s.lastID = s.lastID + 1+ tenant := &models.Tenant{ID: s.lastID, Name: name, Subdomain: subdomain}s.tenants = append(s.tenants, tenant)- return nil+ return tenant, nil}// First returns first tenantdiff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 7caad7f8a..203f16a6d 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -38,15 +38,16 @@ func (t *dbTenant) toModel() *models.Tenant {}// Add given tenant to tenant list-func (s *TenantStorage) Add(tenant *models.Tenant) error {- row := s.trx.QueryRow(`INSERT INTO tenants (name, subdomain, cname, created_on)- VALUES ($1, $2, $3, $4)- RETURNING id`, tenant.Name, tenant.Subdomain, tenant.CNAME, time.Now())- if err := row.Scan(&tenant.ID); err != nil {- return err+func (s *TenantStorage) Add(name string, subdomain string) (*models.Tenant, error) {+ var id int+ row := s.trx.QueryRow(`INSERT INTO tenants (name, subdomain, created_on)+ VALUES ($1, $2, $3)+ RETURNING id`, name, subdomain, time.Now())+ if err := row.Scan(&id); err != nil {+ return nil, err}- return nil+ return s.GetByDomain(subdomain)}// First returns first tenantdiff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex 6e67c7713..08563860d 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -4,7 +4,6 @@ import ("testing""github.com/getfider/fider/app"- "github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx""github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega"@@ -70,43 +69,16 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {defer trx.Rollback()tenants := postgres.NewTenantStorage(trx)- tenants.Add(&models.Tenant{- Name: "My Domain Inc.",- Subdomain: "mydomain",- })+ tenants.Add("My Domain Inc.", "mydomain")tenant, err := tenants.GetByDomain("mydomain")- Expect(tenant.ID).To(Equal(int(1)))- Expect(tenant.Name).To(Equal("My Domain Inc."))- Expect(tenant.Subdomain).To(Equal("mydomain"))- Expect(tenant.CNAME).To(Equal(""))+ //Expect(trx.Count("SELECT * FROM tenants WHERE subdomain = 'mydomain' AND CNAME IS NULL")).To(Equal(1))Expect(err).To(BeNil())-}--func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {- RegisterTestingT(t)- db, _ := dbx.New()- db.Seed()- defer db.Close()-- trx, _ := db.Begin()- defer trx.Rollback()-- tenants := postgres.NewTenantStorage(trx)- tenants.Add(&models.Tenant{- Name: "My Domain Inc.",- Subdomain: "mydomain",- CNAME: "mydomain.anydomain.com",- })-- tenant, err := tenants.GetByDomain("mydomain.anydomain.com")-Expect(tenant.ID).To(Equal(int(1)))Expect(tenant.Name).To(Equal("My Domain Inc."))Expect(tenant.Subdomain).To(Equal("mydomain"))- Expect(tenant.CNAME).To(Equal("mydomain.anydomain.com"))- Expect(err).To(BeNil())+ Expect(tenant.CNAME).To(Equal(""))}func TestTenantStorage_IsSubdomainAvailable_ExistingDomain(t *testing.T) {diff --git a/app/validate/domain_test.go b/app/validate/domain_test.goindex fb017361a..e95143bcf 100644--- a/app/validate/domain_test.go+++ b/app/validate/domain_test.go@@ -3,7 +3,6 @@ package validate_testimport ("testing"- "github.com/getfider/fider/app/models""github.com/getfider/fider/app/storage/inmemory""github.com/getfider/fider/app/validate". "github.com/onsi/gomega"@@ -34,9 +33,9 @@ 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"})+ tenants.Add("Footbook", "footbook")+ tenants.Add("Your Company", "yourcompany")+ tenants.Add("New York", "newyork")for _, subdomain := range []string{"footbook",diff --git a/migrations/201707081055_set_cname_null.up.sql b/migrations/201707081055_set_cname_null.up.sqlnew file mode 100644index 000000000..2ff85c4be--- /dev/null+++ b/migrations/201707081055_set_cname_null.up.sql@@ -0,0 +1 @@+UPDATE tenants SET cname = null WHERE cname = '';\ No newline at end of file