Throw not seeded as exception

Author: vknaisl

shared-common/src/Shared/Common/Localization/Messages/Public.hs

@@ -17,6 +17,8 @@ _ERROR_API_COMMON__UNABLE_TO_GET_TOKEN = LocaleRecord "error.api.common.unable_t
 
 _ERROR_VALIDATION__TENANT_OR_ACTIVE_PLAN_ABSENCE host = LocaleRecord "error.validation.tenant_or_active_plan_absence" "Tenant ('%s') doesn't exist or does not have any active plan" [host]
 
+_ERROR_VALIDATION__NOT_SEEDED_TENANT host = LocaleRecord "error.validation.not_seeded_tenant" "Tenant ('%s') is not seeded" [host]
+
 -- Websocket
 _ERROR_API_WEBSOCKET__DESERIALIZATION_FAILED =
   LocaleRecord "error.api.websocket.cant_deserialize_obj" "Deserialization failed" []

wizard-server/src/Wizard/Api/Resource/Config/ClientConfigDTO.hs

@@ -8,10 +8,7 @@ import Wizard.Model.Tenant.Config.TenantConfig
 import Wizard.Model.User.UserProfile
 
 data ClientConfigDTO
-  = NotSeededClientConfigDTO
-      { message :: String
-      }
-  | HousekeepingInProgressClientConfigDTO
+  = HousekeepingInProgressClientConfigDTO
       { message :: String
       }
   | ClientConfigDTO

wizard-server/src/Wizard/Database/DAO/Tenant/TenantDAO.hs

@@ -50,6 +50,9 @@ findTenantByUuid uuid = createFindEntityByFn entityName [("uuid", U.toString uui
 findTenantByServerDomain :: String -> AppContextM Tenant
 findTenantByServerDomain serverDomain = createFindEntityByFn entityName [("server_domain", serverDomain)]
 
+findTenantByServerDomain' :: String -> AppContextM (Maybe Tenant)
+findTenantByServerDomain' serverDomain = createFindEntityByFn' entityName [("server_domain", serverDomain)]
+
 findTenantByClientUrl :: String -> AppContextM Tenant
 findTenantByClientUrl clientUrl = createFindEntityByFn entityName [("client_url", clientUrl)]
 

wizard-server/src/Wizard/Service/Config/Client/ClientConfigService.hs

@@ -30,17 +30,19 @@ getClientConfig mServerUrl mClientUrl = do
     if serverConfig.cloud.enabled
       then maybe getCurrentTenant findTenantByClientUrl mClientUrl
       else getCurrentTenant
-  unless tenant.enabled (throwError . NotExistsError $ _ERROR_VALIDATION__TENANT_OR_ACTIVE_PLAN_ABSENCE (fromMaybe "not-provided" mServerUrl))
   case tenant.state of
     NotSeededTenantState -> do
-      return $ NotSeededClientConfigDTO {message = "We’re currently preparing the instance for you"}
+      throwError $ UserError (_ERROR_VALIDATION__NOT_SEEDED_TENANT (fromMaybe "not-provided" mServerUrl))
     PendingHousekeepingTenantState -> do
+      throwErrorIfTenantIsDisabled mServerUrl tenant
       let mCreatedByUuid = fmap (.uuid) mCurrentUser
       migrateToLatestMetamodelVersionCommand tenant mCreatedByUuid
       return $ HousekeepingInProgressClientConfigDTO {message = "We’re currently upgrading the data to the latest version to enhance your experience"}
     HousekeepingInProgressTenantState -> do
+      throwErrorIfTenantIsDisabled mServerUrl tenant
       return $ HousekeepingInProgressClientConfigDTO {message = "We’re currently upgrading the data to the latest version to enhance your experience"}
     ReadyForUseTenantState -> do
+      throwErrorIfTenantIsDisabled mServerUrl tenant
       tenantConfig <-
         if serverConfig.cloud.enabled
           then case mClientUrl of
@@ -55,3 +57,6 @@ getClientConfig mServerUrl mClientUrl = do
             return . Just $ toUserProfile currentUser userGroupUuids
           Nothing -> return Nothing
       return $ toClientConfigDTO serverConfig tenantConfig mUserProfile tenant locales
+
+throwErrorIfTenantIsDisabled :: Maybe String -> Tenant -> AppContextM ()
+throwErrorIfTenantIsDisabled mServerUrl tenant = unless tenant.enabled (throwError . NotExistsError $ _ERROR_VALIDATION__TENANT_OR_ACTIVE_PLAN_ABSENCE (fromMaybe "not-provided" mServerUrl))