Open platform to collect and prioritize feedback
refactor: tenant disabled status
goenning40c4913f59f4
diff --git a/app/middlewares/tenant.go b/app/middlewares/tenant.goindex b62b5eead..63803f547 100644--- a/app/middlewares/tenant.go+++ b/app/middlewares/tenant.go@@ -31,7 +31,7 @@ func SingleTenant() web.MiddlewareFunc {return c.Failure(err)}- if firstTenant.Result != nil && firstTenant.Result.Status != enum.TenantDisabled {+ if firstTenant.Result != nil && !firstTenant.Result.IsDisabled() {c.SetTenant(firstTenant.Result)if c.Request.URL.Hostname() != env.Config.HostDomain {@@ -65,7 +65,7 @@ func MultiTenant() web.MiddlewareFunc {return c.Failure(err)}- if byDomain.Result != nil && byDomain.Result.Status != enum.TenantDisabled {+ if byDomain.Result != nil && !byDomain.Result.IsDisabled() {c.SetTenant(byDomain.Result)if byDomain.Result.CNAME != "" && !c.IsAjax() {diff --git a/app/models/entity/tenant.go b/app/models/entity/tenant.goindex 7643c3157..28387fe64 100644--- a/app/models/entity/tenant.go+++ b/app/models/entity/tenant.go@@ -17,3 +17,12 @@ type Tenant struct {CustomCSS string `json:"-"`IsEmailAuthAllowed bool `json:"isEmailAuthAllowed"`}++func (t *Tenant) IsDisabled() bool {+ //TODO: remove this when locked tenant status is implemented+ if t.Status == enum.TenantLocked {+ return true+ }++ return t.Status == enum.TenantDisabled+}