Open platform to collect and prioritize feedback
fix for issue 197 + unit test (#198)
Guilherme Oenning11bc6607bf38
diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.goindex 82c622a0b..181b8283a 100644--- a/app/storage/inmemory/tenant.go+++ b/app/storage/inmemory/tenant.go@@ -138,7 +138,7 @@ func (s *TenantStorage) SetKeyAsVerified(key string) error {func extractSubdomain(hostname string) string {domain := env.MultiTenantDomain()if domain == "" {- return ""+ return hostname}return strings.Replace(hostname, domain, "", -1)diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 302ac2e72..97fe64b61 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -177,7 +177,7 @@ func (s *TenantStorage) SetKeyAsVerified(key string) error {func extractSubdomain(hostname string) string {domain := env.MultiTenantDomain()if domain == "" {- return ""+ return hostname}return strings.Replace(hostname, domain, "", -1)diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex a05cd654d..b5262c134 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -1,6 +1,7 @@package postgres_testimport (+ "os""testing""time"@@ -37,6 +38,19 @@ func TestTenantStorage_Add_Activate(t *testing.T) {Expect(tenant.Status).To(Equal(models.TenantActive))}+func TestTenantStorage_SingleTenant_Add(t *testing.T) {+ SetupDatabaseTest(t)+ defer TeardownDatabaseTest()++ os.Setenv("HOST_MODE", "single")++ tenants := postgres.NewTenantStorage(trx)+ tenant, err := tenants.Add("My Domain Inc.", "mydomain", models.TenantInactive)++ Expect(err).To(BeNil())+ Expect(tenant).NotTo(BeNil())+}+func TestTenantStorage_First(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()