Fix tenant setting and blank screen (#1920)

backend/src/api/auth/authMe.ts

@@ -1,10 +1,42 @@
 import { Error403 } from '@crowd/common'
+import { RedisCache } from '@crowd/redis'
+import { FeatureFlagRedisKey } from '@crowd/types'
+import AutomationRepository from '@/database/repositories/automationRepository'
 
 export default async (req, res) => {
   if (!req.currentUser || !req.currentUser.id) {
     await req.responseHandler.error(req, res, new Error403(req.language))
     return
   }
 
-  await req.responseHandler.success(req, res, req.currentUser)
+  const payload = req.currentUser
+
+  const csvExportCountCache = new RedisCache(
+    FeatureFlagRedisKey.CSV_EXPORT_COUNT,
+    req.redis,
+    req.log,
+  )
+
+  const memberEnrichmentCountCache = new RedisCache(
+    FeatureFlagRedisKey.MEMBER_ENRICHMENT_COUNT,
+    req.redis,
+    req.log,
+  )
+
+  payload.tenants = await Promise.all(
+    payload.tenants.map(async (tenantUser) => {
+      tenantUser.tenant.dataValues = {
+        ...tenantUser.tenant.dataValues,
+        csvExportCount: Number(await csvExportCountCache.get(tenantUser.tenant.id)) || 0,
+        automationCount:
+          Number(await AutomationRepository.countAllActive(req.database, tenantUser.tenant.id)) ||
+          0,
+        memberEnrichmentCount:
+          Number(await memberEnrichmentCountCache.get(tenantUser.tenant.id)) || 0,
+      }
+      return tenantUser
+    }),
+  )
+
+  await req.responseHandler.success(req, res, payload)
 }

frontend/src/modules/auth/store/actions.js

@@ -15,14 +15,15 @@ import {
 } from '@/modules/auth/auth-socket';
 
 export default {
-  async doInit({ commit, dispatch }) {
+  async doInit({ commit, dispatch, state }) {
     try {
       const token = AuthToken.get();
       if (token) {
         connectSocket(token);
         const currentUser = await AuthService.fetchMe();
         commit('AUTH_INIT_SUCCESS', { currentUser });
-        dispatch('doRefreshTenant');
+
+        state.loadingInit = false;
         return currentUser;
       }
 
@@ -40,12 +41,6 @@ export default {
     }
   },
 
-  async doRefreshTenant({ state }) {
-    if (state.currentTenant.id !== AuthCurrentTenant.get()) {
-      state.currentTenant = await TenantService.fetchAndApply();
-    }
-  },
-
   doWaitUntilInit({ getters }) {
     if (!getters.loadingInit) {
       return Promise.resolve();
@@ -114,7 +109,6 @@ export default {
         commit('AUTH_SUCCESS', {
           currentUser,
         });
-        dispatch('doRefreshTenant');
 
         router.push('/');
       })
@@ -142,7 +136,6 @@ export default {
         commit('AUTH_SUCCESS', {
           currentUser: currentUser || null,
         });
-        dispatch('doRefreshTenant');
         router.push('/');
       })
       .catch((error) => {
@@ -162,7 +155,7 @@ export default {
     router.push('/auth/signin');
   },
 
-  doRefreshCurrentUser({ commit, dispatch }) {
+  doRefreshCurrentUser({ commit }) {
     const token = AuthToken.get();
     if (token) {
       return AuthService.fetchMe()
@@ -171,7 +164,6 @@ export default {
             currentUser,
           });
 
-          dispatch('doRefreshTenant');
           return currentUser;
         })
         .catch((error) => {

frontend/src/modules/auth/store/mutations.js

@@ -1,8 +1,12 @@
 import formbricks, { setupFormbricks } from '@/plugins/formbricks';
+import AuthCurrentTenant from '@/modules/auth/auth-current-tenant';
 
 export default {
   CURRENT_USER_REFRESH_SUCCESS(state, payload) {
     state.currentUser = payload.currentUser || null;
+    state.currentTenant = AuthCurrentTenant.selectAndSaveOnStorageFor(
+      payload.currentUser,
+    );
   },
 
   AUTH_START(state) {
@@ -11,7 +15,9 @@ export default {
 
   AUTH_SUCCESS(state, payload) {
     state.currentUser = payload.currentUser || null;
-
+    state.currentTenant = AuthCurrentTenant.selectAndSaveOnStorageFor(
+      payload.currentUser,
+    );
     state.loading = false;
 
     if (state.currentUser) {
@@ -102,8 +108,9 @@ export default {
   AUTH_INIT_SUCCESS(state, payload) {
     state.currentUser = payload.currentUser || null;
 
-    state.loadingInit = false;
-
+    state.currentTenant = AuthCurrentTenant.selectAndSaveOnStorageFor(
+      payload.currentUser,
+    );
     if (state.currentUser) {
       // initialize Formbricks
       setupFormbricks(state.currentUser);