default account env var

dynamiatools · Dec 9, 2021 · 0074211 · 0074211
1 parent 86031f6
commit 0074211
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...es/core/src/main/java/tools/dynamia/modules/saas/services/impl/AccountServiceAPIImpl.java b/...es/core/src/main/java/tools/dynamia/modules/saas/services/impl/AccountServiceAPIImpl.java
@@ -18,6 +18,7 @@
 package tools.dynamia.modules.saas.services.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tools.dynamia.commons.SimpleCache;
@@ -62,6 +63,9 @@ public class AccountServiceAPIImpl extends AbstractService implements AccountSer
     @Autowired
     private AccountContext accountContext;
 
+    @Autowired
+    private Environment environment;
+
     private final SimpleCache<Long, AccountDTO> accountCache = new SimpleCache<>();
     private final SimpleCache<String, Long> domainCache = new SimpleCache<>();
 
@@ -92,6 +96,8 @@ public AccountDTO getAccount(Long accountId) {
             if (dto == null) {
                 Account account = crudService().findSingle(Account.class,
                         QueryParameters.with("id", accountId).add("status", QueryConditions.isNotNull()));
+
+
                 if (account != null) {
                     dto = account.toDTO();
                     accountCache.add(accountId, dto);
@@ -285,6 +291,12 @@ public Long getAccountIdByDomain(String domain) {
                     accountId = account.getId();
                 }
             }
+            if (account == null && "true".equals(environment.getProperty("useDefaultAccount"))) {
+                account = service.getDefaultAccount();
+                accountId = account.getId();
+            }
+
+
             if (accountId != null) {
                 domainCache.add(domain, accountId);
             }

diff --git a/sources/core/src/main/java/tools/dynamia/modules/saas/services/impl/AccountServiceImpl.java b/sources/core/src/main/java/tools/dynamia/modules/saas/services/impl/AccountServiceImpl.java
@@ -20,6 +20,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.core.env.Environment;
 import org.springframework.orm.jpa.EntityManagerFactoryInfo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -60,6 +61,9 @@ public class AccountServiceImpl implements AccountService, ApplicationListener<C
     @Autowired
     private EntityManagerFactoryInfo entityManagerFactoryInfo;
 
+    @Autowired
+    private Environment environment;
+
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -89,12 +93,15 @@ public Account getAccountByCustomDomain(String domain) {
     @Override
     public Account getAccount(HttpServletRequest request) {
         String host = request.getServerName();
-        String subdomain = host.substring(0, host.indexOf("."));
+        String subdomain = host.contains(".") ? host.substring(0, host.indexOf(".")) : host;
 
         Account account = getAccount(subdomain);
         if (account == null) {
             account = getAccountByCustomDomain(host);
         }
+        if (account == null && "true".equals(environment.getProperty("useDefaultAccount"))) {
+            account = getDefaultAccount();
+        }
         return account;
     }