@simitgroup/simpleapp-generator 2.0.2-v-alpha → 2.0.2-x-alpha

package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta

@@ -6,32 +6,31 @@
  * 2.
  */
 import Base64URL from '@darkwolf/base64url';
-import { isEmpty } from 'lodash';
-import { Request } from 'express';
-import { InjectModel } from '@nestjs/mongoose';
 import { BadRequestException, ForbiddenException, Injectable, Logger, Scope } from '@nestjs/common';
+import { Request } from 'express';
 import * as jwt from 'jsonwebtoken';
+import { isEmpty } from 'lodash';
 import { ClientSession, Model, PipelineStage } from 'mongoose';
 
 // import { Branch, Organization, Permission, Tenant, TenantClientSetting, User, Appintegration, Webhook, Miniappinstallation, TUserType, TMiniApiTokenInfo } from 'src/simpleapp/generate/types';
-import { TUserType, TMiniApiTokenInfo } from 'src/simple-app/_core/framework/schemas';
+import { TMiniApiTokenInfo, TUserType } from 'src/simple-app/_core/framework/schemas';
 import { MiniAppInstallation } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.schema';
 
-import { Tenant, TenantClientSetting } from 'src/simple-app/_core/resources/tenant/tenant.schema';
 import { Organization } from 'src/simple-app/_core/resources/organization/organization.schema';
-import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
+import { Tenant, TenantClientSetting } from 'src/simple-app/_core/resources/tenant/tenant.schema';
 
-import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
-import { User } from 'src/simple-app/_core/resources/user/user.schema';
+import { Environment } from '@core-features/maintenance/schemas';
+import { TenantLicenseEnum } from '@resources/tenant/tenant.enum';
+import { ProfileUserBranch, TenantHealth, TenantPermission, UserContextInfo } from 'src/simple-app/_core/features/profile/profile.schema';
 import { Webhook } from 'src/simple-app/_core/features/webhook/schemas';
-import { UserContextInfo, ProfileUserBranch, ProfileUserInvites, TenantPermission } from 'src/simple-app/_core/features/profile/profile.schema';
+import { Permission, StepData } from 'src/simple-app/_core/resources/permission/permission.schema';
+import { User } from 'src/simple-app/_core/resources/user/user.schema';
 import { ModifiedRecords } from '../../framework/schemas';
+import { SimpleAppDbRevertService } from '../../framework/simple-app-db-revert.service';
 import { Role } from '../auth/role-guard/roles.enum';
-import { Environment } from '@core-features/maintenance/schemas';
 import * as rolegroups from '../auth/role-guard/roles.group';
-import { TenantLicenseEnum } from '@resources/tenant/tenant.enum';
-import { SimpleAppDbRevertService } from '../../framework/simple-app-db-revert.service';
-import { StepData } from 'src/simple-app/_core/resources/permission/permission.schema';
+import { TenantHealthStatusEnum } from './user-context.enum';
+import { ENV_EMAIL_ROLE_MAP, EnvEmailFieldKey, RoleGroupResolver, TenantPermissionAggregateRow } from './user-context.type';
 
 // import systemWebHooks from '../../webhooks';
 @Injectable({ scope: Scope.REQUEST })
@@ -136,6 +135,16 @@ export class UserContext extends UserContextInfo {
 
   protected userType: TUserType = 'normal';
 
+  tenantHealth?: TenantHealth = {
+    status: TenantHealthStatusEnum.ACTIVE,
+    message: 'User context initial',
+    isLicenseRenewable: false,
+    isLicenseDowngradable: false,
+    isLicenseCancellable: false,
+    isLicenseUpgradable: true,
+    isLicenseAddOnAllowed: false,
+  };
+
   constructor(
     private readonly userModel: Model<User>,
     private readonly permModel: Model<Permission>,
@@ -215,7 +224,7 @@ export class UserContext extends UserContextInfo {
 
   setLicense = (license: TenantLicenseEnum) => {
     if (!this.tenantInfo) {
-      this.tenantInfo = {} as any;
+      this.tenantInfo = {} as Tenant;
     }
 
     this.tenantInfo.license = license;
@@ -260,6 +269,10 @@ export class UserContext extends UserContextInfo {
     this.offsetMinute = offsetMinute;
   };
 
+  setTenantHealth = (data: TenantHealth) => {
+    this.tenantHealth = data;
+  };
+
   // async obtainNoTenantProfile() {
   //   const pipelines: PipelineStage[] = [{ $match: { uid: this.uid, tenantId: this.tenantId } }];
   //   try {
@@ -288,8 +301,8 @@ export class UserContext extends UserContextInfo {
     //   return this.obtainNoTenantProfile();
     // }
     const pipelines: PipelineStage[] = [
-      //get profile
-      { $match: { uid: this.uid, tenantId: this.tenantId } },
+      //get profile (inactive users must not load org/branch/groups)
+      { $match: { uid: this.uid, tenantId: this.tenantId, active: { $ne: false } } },
       {
         $lookup: {
           from: 'tenant',
@@ -497,7 +510,7 @@ export class UserContext extends UserContextInfo {
       },
     ];
 
-    const userProfiles: UserContextInfo[] = await this.userModel.aggregate(pipelines).exec();
+    const userProfiles = await this.userModel.aggregate<UserContextInfo>(pipelines).exec();
     return userProfiles[0];
   }
 
@@ -539,7 +552,7 @@ export class UserContext extends UserContextInfo {
       });
       this.branches = userProfile['branches'];
       this.groups = userProfile['groups'] ?? [];
-      this.clientSetting = userProfile['clientSetting'] ?? {
+      this.clientSetting = userProfile.tenantInfo?.clientSetting ?? {
         auditTrail: false,
         disableClassReminder: true,
         webhook: false,
@@ -552,24 +565,24 @@ export class UserContext extends UserContextInfo {
       }
       if (this.tenantInfo?.company && this.tenantInfo.company.billUserEmail === this.email) {
         this.roles.push(Role.Billing);
+        this.roles.push(Role.Tenant_search);
+        this.roles.push(Role.TenantInvoice_search);
       }
       if (systemEnv) {
-        // console.log("systemEnv",systemEnv)
-        const emailFields = {
-          adminEmails: 'SuperAdmin',
-          billingEmails: 'DevBilling',
-          supportEmails: 'DevSupport',
-        };
-        for (const f of Object.keys(emailFields)) {
-          if (Array.isArray(systemEnv[f]) && systemEnv[f].includes(this.email) && !this.roles.includes(Role[emailFields[f]])) {
-            this.roles.push(Role[emailFields[f]]);
+        for (const f of Object.keys(ENV_EMAIL_ROLE_MAP) as EnvEmailFieldKey[]) {
+          const emails = systemEnv[f];
+          const targetRole = ENV_EMAIL_ROLE_MAP[f];
+          if (Array.isArray(emails) && emails.includes(this.email) && !this.roles.includes(targetRole)) {
+            this.roles.push(targetRole);
           }
         }
       }
 
       // console.log('this.roles', this.roles);
       for (const group of this.groups) {
-        const roles: Role[] = rolegroups[group]();
+        const roleResolver = (rolegroups as Record<string, RoleGroupResolver | undefined>)[group];
+        if (!roleResolver) continue;
+        const roles: Role[] = roleResolver();
         //(<() => Role[]>rolegroups[group])();
         for (let r = 0; r < roles.length; r++) {
           if (!this.roles.includes(roles[r])) {
@@ -797,6 +810,7 @@ export class UserContext extends UserContextInfo {
       branches: this.getBranches(),
       invites: this.getInvites(),
       moreProps: this.moreProps,
+      tenantHealth: this.tenantHealth,
     };
     return result;
   }
@@ -887,6 +901,8 @@ export class UserContext extends UserContextInfo {
             tenantId: {
               $gt: 0,
             },
+            // Inactive user rows must not appear on pick-tenant / org switcher
+            active: { $ne: false },
           },
         },
         {
@@ -964,10 +980,10 @@ export class UserContext extends UserContextInfo {
         },
       ];
 
-      const datas = await this.userModel.aggregate(pipelines);
+      const datas = await this.userModel.aggregate<TenantPermissionAggregateRow>(pipelines);
       for (const r of datas) {
         const perms: ProfileUserBranch[] = [];
-        for (const p of r.perms) {
+        for (const p of r.perms ?? []) {
           perms.push({
             permissionId: p._id,
             tenantId: p.tenantId,
@@ -1039,7 +1055,7 @@ export class UserContext extends UserContextInfo {
     const pipeLine: PipelineStage[] = [{ $match: { tenantId: -1 } }, { $unionWith: { coll: 'organization', pipeline: [{ $match: { orgId: this.orgId } }] } }, { $limit: 1 }];
 
     // console.log("set as static user", pipeLine)
-    const result: Organization[] = await this.userModel.aggregate(pipeLine).exec();
+    const result = await this.userModel.aggregate<Organization>(pipeLine).exec();
     // console.log("result",result)
     if (result && result.length > 0) {
       const res = result[0];
@@ -1150,7 +1166,7 @@ export class UserContext extends UserContextInfo {
       });
       this.branches = userProfile['branches'];
       this.groups = userProfile['groups'] ?? [];
-      this.clientSetting = userProfile['clientSetting'] ?? {
+      this.clientSetting = userProfile.tenantInfo?.clientSetting ?? {
         auditTrail: false,
         disableClassReminder: true,
         webhook: false,
@@ -1159,7 +1175,9 @@ export class UserContext extends UserContextInfo {
       this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
 
       for (const group of this.groups) {
-        const roles: Role[] = rolegroups[group]();
+        const roleResolver = (rolegroups as Record<string, RoleGroupResolver | undefined>)[group];
+        if (!roleResolver) continue;
+        const roles: Role[] = roleResolver();
         for (let r = 0; r < roles.length; r++) {
           if (!this.roles.includes(roles[r])) {
             this.roles.push(roles[r]);
@@ -1233,8 +1251,9 @@ export class UserContext extends UserContextInfo {
   /**
    * Define additional properties from user into moreProps
    */
-  setMoreProps(userProfile: UserContextInfo): Record<string, any> {
+  setMoreProps(userProfile: UserContextInfo): Record<string, unknown> {
     const allprops = Object.keys(userProfile);
+    const profileRecord = userProfile as unknown as Record<string, unknown>;
     const excludekeys = [
       'created',
       'createdBy',
@@ -1265,11 +1284,11 @@ export class UserContext extends UserContextInfo {
       'uid',
       'orgRecordId',
     ];
-    const data: Record<string, any> = {};
+    const data: Record<string, unknown> = {};
     for (let i = 0; i < allprops.length; i++) {
       const key = allprops[i];
       if (!excludekeys.includes(key)) {
-        data[key] = userProfile[key];
+        data[key] = profileRecord[key];
       }
     }
 
@@ -1293,7 +1312,7 @@ export class UserContext extends UserContextInfo {
     return isodate;
   }
 
-  addTransactionStep(action: string, collection: string, id: string[], data: any[]) {
+  addTransactionStep(action: string, collection: string, id: string[], data: StepData['data']) {
     this.transSteps.push({ action: action, collection: collection, id: id, data: data });
   }
 
@@ -1326,6 +1345,7 @@ export class UserContext extends UserContextInfo {
       if (this.dbsession.inTransaction()) await this.dbsession.abortTransaction();
     }
   }
+
   async endSession() {
     await this.dbsession.endSession();
   }

package/templates/nest/src/simple-app/_core/framework/schemas/simple-app.schema.ts.eta

@@ -1,6 +1,7 @@
+import { Field, ObjectType } from '@nestjs/graphql';
 import { ApiProperty } from '@nestjs/swagger';
-import { Field, ObjectType, ID } from '@nestjs/graphql';
-import { JSONSchema7, JSONSchema7Type, JSONSchema7Version, JSONSchema7TypeName, JSONSchema7Definition } from 'json-schema';
+import { JSONSchema7 } from 'json-schema';
+import { PipelineStage } from 'mongoose';
 import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
 
 export class ModifiedCollection {
@@ -18,12 +19,14 @@ export class DocNumberFormatResult {
 }
 
 export class SearchBody {
-  filter?: object;
+  filter?: PipelineStage.Match['$match'];
 
-  fields?: any[];
+  fields?: PipelineStage.Project['$project'];
+
+  sorts?: PipelineStage.Sort['$sort'];
+
+  lookup?: PipelineStage.Lookup['$lookup'];
 
-  sorts?: any[];
-  lookup?: object;
   pagination?: {
     pageSize?: number;
     pageNo?: number;
@@ -39,22 +42,6 @@ export enum IsolationType {
 export class MoreProjectionType {
   [key: string]: string;
 }
-export class ApiEvent {
-  _id: string;
-  created: string;
-  updated?: string;
-  duration: number;
-  createdBy: string;
-  path: string;
-  ip: string;
-  method: string;
-  headers: any;
-  data?: any;
-  statusCode: number;
-  status: string;
-  errMsg?: string;
-  errData?: any;
-}
 
 export class DeleteResultType<T> {
   data: T;
@@ -70,6 +57,7 @@ export class DocumentStatus {
   readOnly: boolean;
   actions: string[]; //api name ['confirm','revert','close','void' and etc]
 }
+
 export enum RESTMethods {
   'post' = 'post',
   'get' = 'get',
@@ -126,14 +114,21 @@ export class ForeignKey {
   @Field()
   @ApiProperty({ type: () => String })
   _id?: string;
+
   @Field()
   @ApiProperty({ type: () => String })
   code?: string;
+
   @Field()
   @ApiProperty({ type: () => String })
   label?: string;
-  [key: string]: any;
+
+  // ! DO NOT use an index signature on your own schemas. ForeignKey is intentionally strict — only
+  // ! `_id`, `code`, and `label` are allowed. For fields with extra dynamic properties, extend this
+  // ! class or use the appropriate XxxAutoComplete type instead.
+  // [key: string]: any;
 }
+
 export class MyForeignKey {
   [collectionname: string]: string[];
 }
@@ -141,6 +136,9 @@ export class MyForeignKey {
 export class NoParam {}
 
 export class DynamicParam {
+  // ! `any` is intentional here. DynamicParam represents a fully open key-value map where both
+  // ! the keys and value types are unknown at compile time. Do not use this class for typed fields.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [key: string]: any;
 }
 
@@ -163,11 +161,11 @@ export class SchemaFields {
   updatedBy?: string;
   __v?: number;
   documentStatus?: string;
-  [key: string]: any; //SimpleAppJSONSchema7 | SimpleAppJSONSchema7[] | undefined;
 }
 
 export class SimpleAppJSONSchema7 implements JSONSchema7 {
   'x-simpleapp-config': SchemaConfig;
+  type?: JSONSchema7['type'];
 }
 export const SimpleAppJSONSchema7Definition = SimpleAppJSONSchema7;
 
@@ -176,7 +174,18 @@ export class BranchPermission extends Permission {
   branch: ForeignKey;
 }
 
-export type StepData = {action:string,collection:string,id:string[],data:any[]}
+export type StepData = {
+  action: string;
+
+  collection: string;
+
+  id: string[];
+
+  // ! `any[]` is intentional here. Each step in a SAGA transaction can carry data from any
+  // ! MongoDB collection, so the shape is not known until runtime.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  data: any[];
+};
 
 export type DocumentDictEntry = {
   docName: string;

package/templates/nest/src/simple-app/_core/framework/simple-app.interceptor.ts.eta

@@ -4,13 +4,13 @@
  * last change 2023-03-17
  * Author: Ks Tan
  */
+import { ApiEvent } from '@core-features/log/schemas';
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { InjectConnection, InjectModel } from '@nestjs/mongoose';
+import type { Response as ExpressResponse } from 'express';
 import { Connection, Model } from 'mongoose';
-import { Observable } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 import { UserContext } from '../features/user-context/user.context';
-import { ApiEvent } from './schemas';
 import { SimpleAppDbRevertService } from './simple-app-db-revert.service';
 @Injectable()
 export class SimpleAppInterceptor implements NestInterceptor {
@@ -20,40 +20,32 @@ export class SimpleAppInterceptor implements NestInterceptor {
     private simpleAppDbRevertService: SimpleAppDbRevertService,
   ) {}
 
-  async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<any>> {
+  async intercept(context: ExecutionContext, next: CallHandler) {
     //not http request then exclude such as graphql
     if (context.getType() != 'http') {
       // obtain usersession here
-      return next.handle().pipe(
-        tap(async () => {
-          //console.log("none http, do nothing at interceptor")
-        }),
-      );
+      return next.handle().pipe(tap(() => {}));
     }
-    const req = context.switchToHttp().getRequest();
-    const resp = context.switchToHttp().getResponse();
+    const req = context.switchToHttp().getRequest<Request>();
+    const resp = context.switchToHttp().getResponse<ExpressResponse>();
     //console.log("want to get user session:", Object.keys(req))
 
     if (req.url == '/health') {
-      return next.handle().pipe(
-        tap(async () => {
-          //console.log("none http, do nothing at interceptor")
-        }),
-      );
+      return next.handle().pipe(tap(() => {}));
     }
 
-    const usersession: UserContext = req['sessionuser'];
+    const usersession = req['sessionuser'] as UserContext;
     //console.log("after read user session:",usersession)
     const method = req['method'];
     const headers = { ...req['headers'] };
-    const ip = req['ip'];
+    const ip = req['ip'] as string;
     const url = req['url'];
     // let { url, method, headers, body }
     const session = await this.connection.startSession();
     if (!session['runCount']) {
       session['runCount'] = 0;
     } else {
-      session['runCount'] = session['runCount'] + 1;
+      session['runCount'] = (session['runCount'] as number) + 1;
     }
     usersession.setDBSession(session);
     // const session: ClientSession = usersession.getDBSession();
@@ -83,8 +75,10 @@ export class SimpleAppInterceptor implements NestInterceptor {
     return next.handle().pipe(
       map((data) => {
         if (data && typeof data === 'object' && 'pagination' in data && 'items' in data) {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           return data;
         }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return data;
       }),
       catchError(async (err, caught) => {
@@ -97,20 +91,29 @@ export class SimpleAppInterceptor implements NestInterceptor {
         }
 
         const responseBody = {
+          // eslint-disable-next-line
           message: err.message,
           timestamp: new Date().toISOString(),
           path: url,
-          error: err.options,
+          // eslint-disable-next-line
+          error: err.options as object,
         };
 
+        // eslint-disable-next-line
         eventObj.statusCode = err.status;
+        // eslint-disable-next-line
         eventObj.errMsg = responseBody.message;
         eventObj.data = req.body;
         eventObj.status = 'NG';
         eventObj.errData = responseBody.error;
-        resp.status(err?.status ?? 500);
+
+        resp.status(
+          // eslint-disable-next-line
+          err?.status ?? 500,
+        );
         return responseBody;
       }),
+      // eslint-disable-next-line
       tap(async () => {
         // console.log("============interceptor tap",method,url)
         const endtime = new Date();

package/templates/nest/src/simple-app/_core/utils/dayjs.ts.eta

@@ -1,28 +1,29 @@
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
+import isBetween from 'dayjs/plugin/isBetween';
 import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
 
 dayjs.extend(utc);
 dayjs.extend(duration);
 dayjs.extend(timezone);
+dayjs.extend(isBetween);
 
 export const getDayJs = () => {
   return dayjs;
 };
 
-
 /**
-   * this function is used to convert user time date to UTC
-   * @param date
-   * @param timeZone from appuser, example Asia/Malaysia
-   * @returns
-   */
+ * this function is used to convert user time date to UTC
+ * @param date
+ * @param timeZone from appuser, example Asia/Malaysia
+ * @returns
+ */
 export const convertToStartOfDayUTC = (date: string, timeZone: string): string => {
   const startOfDay = dayjs.tz(date, timeZone).startOf('day');
   const utcTime = startOfDay.utc().format();
   return utcTime;
-}
+};
 
 /**
  * this function is used to convert user time date to UTC
@@ -34,7 +35,7 @@ export const convertToEndOfDayUTC = (date: string, timeZone: string): string =>
   const endOfDay = dayjs.tz(date, timeZone).endOf('day');
   const utcTime = endOfDay.utc().format();
   return utcTime;
-}
+};
 
 /**
  * this function is used to convert UTC time to user timezone
@@ -44,4 +45,8 @@ export const convertToEndOfDayUTC = (date: string, timeZone: string): string =>
 export const convertUTCToTimezone = (date: string, timeZone: string): string => {
   const localTime = dayjs(date).tz(timeZone).format();
   return localTime;
-}
+};
+
+export const utcToLocalOffset = (utcTime: string, timeZoneOffset: number) => {
+  return dayjs.utc(utcTime).utcOffset(Number(timeZoneOffset));
+};

package/templates/nuxt/app.vue.eta

@@ -1,17 +1,16 @@
 <template>
-  <NuxtLayout>     
-    
+  <NuxtLayout>
     <!-- <NuxtLayout :name="getLayout()">      -->
-    <ConfirmDialog></ConfirmDialog>         
+    <ConfirmDialog></ConfirmDialog>
     <DynamicDialog />
-    <SessionBlock/>
-    <OverlayHoldscreen/>
-    <EventDocumentViewer></EventDocumentViewer>      
-    <EventDecision/>
-    <EventNotification/>
-    <SubscriptionExpirationWarning/>
-    <SubscriptionFreeBanner/>
-    <NuxtPage/>
+    <SessionBlock />
+    <OverlayHoldscreen />
+    <EventDocumentViewer></EventDocumentViewer>
+    <EventDecision />
+    <EventNotification />
+    <SubscriptionFreeBanner />
+    <SubscriptionGracePeriodBanner />
+    <NuxtPage />
   </NuxtLayout>
 </template>
 
@@ -22,50 +21,50 @@
  * last change 2024-03-17
  * Author: Ks Tan
  */
-let currentXorg = getCurrentXorg()
-watch(()=>useRoute().fullPath,async (newval,oldvalue)=>{
-   if(getCurrentXorg()!=currentXorg){
-      currentXorg = getCurrentXorg()      
-      await reloadUserStore()  
-   }
-  if(getPathPara('xorg','')!=''){
-  
-    if(getCurrentXorg()===''){
-      navigateTo('/picktenant')
-    }else if(!getUserProfile()?.currentGroup){
-      goTo('pickgroup')
+let currentXorg = getCurrentXorg();
+watch(
+  () => useRoute().fullPath,
+  async (newval, oldvalue) => {
+    if (getCurrentXorg() != currentXorg) {
+      currentXorg = getCurrentXorg();
+      await reloadUserStore();
     }
-    setGraphqlServer()
-  }  
-})
+    if (getPathPara("xorg", "") != "") {
+      if (getCurrentXorg() === "") {
+        navigateTo("/picktenant");
+      } else if (!getUserProfile()?.currentGroup) {
+        goTo("pickgroup");
+      }
+      setGraphqlServer();
+    }
+  },
+);
 
-const getLayout = ()=>{
-  // const { status } = useAuth();   
-   
+const getLayout = () => {
+  // const { status } = useAuth();
   // if(status.value=='unauthenticated') return 'loginlayout'
   // else {
   //   if (isMobile()) return 'mobile'
   //   else 'default'
-  // } 
-}
+  // }
+};
 
-onMounted(async()=>{
-    const x = useAuthState()
-  if(x.data.value?.expires && x.data.value?.expires > new Date().toISOString()){
-    await reloadUserStore()
-    const currentgroup = useCookie('currentGroup').value
+onMounted(async () => {
+  const x = useAuthState();
+  if (x.data.value?.expires && x.data.value?.expires > new Date().toISOString()) {
+    await reloadUserStore();
+    const currentgroup = useCookie("currentGroup").value;
     //if no xorg, no enforce pick group
-    if(getCurrentXorg()===''){
-      navigateTo('/picktenant')
-    }else if(!currentgroup){
-      goTo('pickgroup')
+    if (getCurrentXorg() === "") {
+      navigateTo("/picktenant");
+    } else if (!currentgroup) {
+      goTo("pickgroup");
     }
-    setGraphqlServer()
-  }else{
-    if(useRoute().path!='/login'){
+    setGraphqlServer();
+  } else {
+    if (useRoute().path != "/login") {
       navigateTo("/login");
-    }    
-  } 
-    
-})
+    }
+  }
+});
 </script>