@simitgroup/simpleapp-generator 2.0.0-i-alpha → 2.0.0-k-alpha

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/developer-portal/developer-portal.service.ts.eta

@@ -1,19 +1,21 @@
 import { Injectable } from '@nestjs/common';
-import { Branch, Miniapp, Miniappinstallation } from 'src/simpleapp/generate/types';
+import { MiniApp } from 'src/simple-app/_core/resources/mini-app/mini-app.schema';
+import { MiniAppInstallation } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.schema';
+import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
 import _ from 'lodash';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import { MiniappEnvEnum } from 'src/enums/enums.generate';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniAppEnvEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 
 @Injectable()
 export class DeveloperPortalService {
   constructor(
     @InjectModel('Miniapp')
-    protected miniAppDoc: Model<Miniapp>,
+    protected miniAppDoc: Model<MiniApp>,
 
     @InjectModel('Miniappinstallation')
-    protected miniAppInstallationDoc: Model<Miniappinstallation>,
+    protected miniAppInstallationDoc: Model<MiniAppInstallation>,
 
     @InjectModel('Branch')
     protected branchDoc: Model<Branch>,
@@ -23,7 +25,7 @@ export class DeveloperPortalService {
     // Only dev got development.demoXOrg field
     const miniApp = await this.miniAppDoc.findOne({
       'developerPortal.appId': developerPortalAppId,
-      env: MiniappEnvEnum.DEV,
+      env: MiniAppEnvEnum.DEV,
     });
     if (miniApp && !_.isEmpty(miniApp?.development?.demoXOrg)) {
       return miniApp.development.demoXOrg;
@@ -38,7 +40,7 @@ export class DeveloperPortalService {
     // Only get env === prod one
     const miniAppInstallations = await this.miniAppInstallationDoc.find({
       'miniApp.developerPortalAppId': developerPortalAppId,
-      'miniApp.env': MiniappEnvEnum.PROD,
+      'miniApp.env': MiniAppEnvEnum.PROD,
     });
 
     if (!miniAppInstallations || _.isEmpty(miniAppInstallations)) {

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/developer-portal/dto/developer-portal-create-app.dto.ts.eta

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { ApiProperty } from '@nestjs/swagger';
-import { MiniappAuthor } from 'src/simpleapp/generate/apischemas';
+import { MiniAppAuthor } from 'src/simple-app/_core/resources/mini-app/mini-app.schema';
 
 @ObjectType()
 export class DeveloperPortalCreateAppDto {
@@ -17,6 +17,6 @@ export class DeveloperPortalCreateAppDto {
   version: string;
 
   @Field()
-  @ApiProperty({ type: MiniappAuthor, required: true, default: '' })
-  author: MiniappAuthor;
+  @ApiProperty({ type: MiniAppAuthor, required: true, default: '' })
+  author: MiniAppAuthor;
 }

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-bridge.service.ts.eta

@@ -1,5 +1,5 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import _ from 'lodash';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-env-development.service.ts.eta

@@ -1,11 +1,11 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniAppManagerProcessor } from './mini-app-manager.processor';
 import { DynamicParam,MiniApp ,CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { Model } from 'mongoose';
 import { MiniAppManagerEnvEnum } from './mini-app-manager.enum';
 import _ from 'lodash';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-env-production.service.ts.eta

@@ -1,11 +1,11 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniAppManagerProcessor } from './mini-app-manager.processor';
 import { DynamicParam,MiniApp ,CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { Model } from 'mongoose';
 import { MiniAppManagerEnvEnum } from './mini-app-manager.enum';
 import _ from 'lodash';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-policy.service.ts.eta

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import _ from 'lodash';
-import { MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
-import { PolicyService } from 'src/simple-app/.core/features/policy/policy.service';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
+import { PolicyService } from 'src/simple-app/_core/features/policy/policy.service';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniApp } from '../dto';
 import * as licenseTypes from 'src/simple-app/config/license-types';
 @Injectable()

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager.controller.ts.eta

@@ -1,10 +1,10 @@
 import { Body, Controller, Get, Param, Post, Put } from '@nestjs/common';
 import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
 
-import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
-import { Roles } from 'src/simple-app/.core/features/auth/role-guard/roles.decorator';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 
 import * as schemas from '../dto';
 import { MiniAppManagerBridgeService } from './mini-app-manager-bridge.service';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager.processor.ts.eta

@@ -1,11 +1,11 @@
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import _ from 'lodash';
 import { BadRequestException, NotFoundException } from '@nestjs/common';
 import { MiniAppError } from './mini-app-manager.error';
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { DynamicParam,MiniApp,MiniAppInstallation, CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager.service.ts.eta

@@ -1,11 +1,11 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { CategorizedMiniAppDetail, DynamicParam, InstalledMiniAppDetail, MiniApp, MiniAppDetail, MiniAppInstallation } from '../dto';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
 
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import _ from 'lodash';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import { MiniAppError } from './mini-app-manager.error';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-scope/mini-app-scope.guard.ts.eta

@@ -1,9 +1,9 @@
 import { CanActivate, ExecutionContext, Injectable, ForbiddenException, UnauthorizedException, BadRequestException } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MINIAPP_SCOPE_KEY } from './mini-app-scope.decorator';
 import { MiniAppScopeService } from './mini-app-scope.service';
-import { TUserType } from 'src/simpleapp/types';
+import { TUserType } from 'src/simple-app/_core/framework/schemas';
 import { GqlContextType } from '@nestjs/graphql';
 
 @Injectable()

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-scope/mini-app-scope.service.ts.eta

@@ -1,8 +1,8 @@
 import { BadRequestException, ForbiddenException, Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import { Miniapp } from 'src/simpleapp/generate/types';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniApp } from 'src/simple-app/_core/resources/mini-app/mini-app.schema';
 import { getEnvironment, getEnvironmentWithApp } from '../utils/mini-app.util';
 import { MiniAppManagerEnvEnum } from '../mini-app-manager/mini-app-manager.enum';
 import { Request } from 'express';
@@ -10,7 +10,7 @@ import _ from 'lodash';
 
 @Injectable()
 export class MiniAppScopeService {
-  constructor(@InjectModel('Miniapp') private readonly miniAppModel: Model<Miniapp>) {}
+  constructor(@InjectModel('Miniapp') private readonly miniAppModel: Model<MiniApp>) {}
 
   /**
    * Find Mini App From Dev To See Is This A Custom Demo Company
@@ -67,7 +67,7 @@ export class MiniAppScopeService {
     }
   }
 
-  assertEnabledFeature(appUser: UserContext, miniApp: Miniapp) {
+  assertEnabledFeature(appUser: UserContext, miniApp: MiniApp) {
     const userType = appUser.getUserType();
 
     if (userType === 'miniApi') {

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/types/miniApp.ts.eta

@@ -1,4 +1,5 @@
-import { Miniapp, Miniappinstallation } from '../../../simpleapp/generate/types';
+import { MiniApp,  } from '@resources/mini-app/mini-app.schema';
+import { MiniAppInstallation,  } from '@resources/mini-app-installation/mini-app-installation.schema';
 
 export type MiniAppDetailPermission = {
   hasMiniAppFeature: boolean;
@@ -7,9 +8,9 @@ export type MiniAppDetailPermission = {
   canUpdateSetting: boolean;
 };
 
-export type MiniAppDetail = Miniapp & {
+export type MiniAppDetail = MiniApp & {
   hasRequiredPlan: boolean;
-  miniAppInstallation?: Miniappinstallation;
+  miniAppInstallation?: MiniAppInstallation;
 };
 
 export type CategorizedMiniAppDetail = {

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/utils/mini-app.util.ts.eta

@@ -1,4 +1,4 @@
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniAppManagerEnvEnum } from '../mini-app-manager/mini-app-manager.enum';
 import { MiniApp } from '../dto';
 

package/templates/nest/src/simple-app/{.core → _core}/features/policy/policy.service.ts.eta

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import * as licenseTypes from 'src/simple-app/config/license-types';
 @Injectable()
 export class PolicyService {

package/templates/nest/src/simple-app/{.core → _core}/features/profile/profile.schema.ts.eta

@@ -1,7 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { ForeignKey } from '../../framework/schemas';
-import { Branch } from 'src/simple-app/.core/resources/branch/branch.schema';
-import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
+import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
+import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
 import { Role } from '../auth/role-guard/roles.enum';
 import { Organization } from '../../resources/organization/organization.schema';
 import { Tenant } from '../../resources/tenant/tenant.schema';

package/templates/nest/src/simple-app/{.core → _core}/features/queue/queue-base/queue-base.consumer.ts.eta

@@ -16,7 +16,7 @@ export abstract class BaseQueueConsumer extends WorkerHost {
   protected abstract readonly processor: string;
 
   constructor(
-    @Inject(forwardRef(() => QueueUserContext)) protected readonly queueUserContext: QueueUserContext,
+    protected readonly queueUserContext: QueueUserContext,
     @InjectModel('Queuejob') protected queueJobModel: Model<Queuejob>,
     @InjectConnection() private readonly connection: Connection,
     protected eventEmitter: EventEmitter2,

package/templates/nest/src/simple-app/{.core → _core}/features/queue/queue-base/queue-base.producer.ts.eta

@@ -4,8 +4,8 @@ import { InjectModel } from '@nestjs/mongoose';
 import axios from 'axios';
 import { Model } from 'mongoose';
 import { QueuePayload } from '../queue.type';
-import { QueueJob,QueueJobProducerResponse } from 'src/simple-app/.core/resources/queue-job/queue-job.schema';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { QueueJob,QueueJobProducerResponse } from 'src/simple-app/_core/resources/queue-job/queue-job.schema';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 
 export abstract class QueueBaseProducer {
   // protected abstract readonly processor: QueueName;

package/templates/nest/src/simple-app/{.core → _core}/features/queue/queue-user-context/queue-user-context.service.ts.eta

@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { SimpleAppRobotUserService } from '../../user-context/robot-user.service';
 import { MiniAppInstallation } from '../../mini-app/dto';
-import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
-import { User } from 'src/simple-app/.core/resources/user/user.schema';
+import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
+import { User } from 'src/simple-app/_core/resources/user/user.schema';
 
 @Injectable()
 export class QueueUserContext {

package/templates/nest/src/simple-app/{.core → _core}/features/queue/queue.module.ts.eta

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { QueueJobModule } from 'src/simple-app/.core/resources/queue-job/queue-job.module';
+import { QueueJobModule } from 'src/simple-app/_core/resources/queue-job/queue-job.module';
 import { QueueUserContext } from './queue-user-context/queue-user-context.service';
 
 import { MongooseModule } from '@nestjs/mongoose';

package/templates/nest/src/simple-app/{.core → _core}/features/user-context/user.context.ts.eta

@@ -14,17 +14,17 @@ import * as jwt from 'jsonwebtoken';
 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 { MiniAppInstallation } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.schema';
+import { TUserType, TMiniApiTokenInfo } 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 { Organization } from 'src/simple-app/_core/resources/organization/organization.schema';
+import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
 
-import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
-import { User } from 'src/simple-app/.core/resources/user/user.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 } from 'src/simple-app/_core/resources/permission/permission.schema';
+import { User } from 'src/simple-app/_core/resources/user/user.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 { ModifiedRecords } from '../../framework/schemas';
 import { Role } from '../auth/role-guard/roles.enum';
 import * as rolegroups from '../auth/role-guard/roles.group';
@@ -212,12 +212,13 @@ export class UserContext extends UserContextInfo {
 
   setCurrentUserInfo = async (tokenstr: string, xOrg: string, webhookModel: Model<Webhook>) => {
     this.setXOrg(xOrg);
-    // console.log('xOrg',xOrg)
     await this.setUserToken(tokenstr);
     this.setUserType('normal');
-    // const wh = await webhookModel.find({ branchId: this.getBranchId(), active: true });
-
-    // if (Array.isArray(wh) && wh.length > 0) this.webhooks = this.webhooks.concat(wh);
+    // branchId: this.getBranchId(), active: true 
+    const wh = await webhookModel.find({});
+    if (Array.isArray(wh) && wh.length > 0) {
+      this.webhooks = this.webhooks.concat(wh);      
+    }
   };
 
   // setPackage = (packageName: string) => {
@@ -276,10 +277,10 @@ export class UserContext extends UserContextInfo {
           as: 'tenantInfo',
           localField: 'tenantId',
           foreignField: 'tenantId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$tenantInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$tenantInfo', preserveNullAndEmptyArrays: true } },
       {
         $lookup: {
           from: 'permission',
@@ -343,30 +344,30 @@ export class UserContext extends UserContextInfo {
           as: 'tenantInfo',
           localField: 'tenantId',
           foreignField: 'tenantId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$tenantInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$tenantInfo', preserveNullAndEmptyArrays: true } },
       {
         $lookup: {
           from: 'organization',
           as: 'orgInfo',
           localField: 'orgId',
           foreignField: 'orgId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$orgInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$orgInfo', preserveNullAndEmptyArrays: true } },
       {
         $lookup: {
           from: 'branch',
           as: 'branchInfo',
           localField: 'branchId',
           foreignField: 'branchId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$branchInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$branchInfo', preserveNullAndEmptyArrays: true } },
       {
         $project: {
           uid: 1,
@@ -386,9 +387,9 @@ export class UserContext extends UserContextInfo {
           timeZone: '$b.o.timeZone',
           currency: '$b.o.currency',
           country: '$b.o.country',
-          tenantInfo:1,
-          orgInfo:1,
-          branchInfo:1,
+          tenantInfo: 1,
+          orgInfo: 1,
+          branchInfo: 1,
         },
       },
 
@@ -461,22 +462,21 @@ export class UserContext extends UserContextInfo {
                 as: 'tenant',
               },
             },
-            {$unwind:'$tenant'},
+            { $unwind: '$tenant' },
             {
-              $project:{
-                _id:1,
-                created:1,
+              $project: {
+                _id: 1,
+                created: 1,
                 tenantId: 1,
-                tenantName:'$tenant.tenantName'
-              }
-            }
+                tenantName: '$tenant.tenantName',
+              },
+            },
           ],
         },
-      }
+      },
     ];
 
     const userProfiles: UserContextInfo[] = await this.userModel.aggregate(pipelines).exec();
-    // console.log("userProfiles",userProfiles)
     return userProfiles[0];
   }
 
@@ -492,8 +492,7 @@ export class UserContext extends UserContextInfo {
     this.ssoACL = <Record<string, { roles: string[] }>>tokeninfo?.resource_access ?? {};
     this.logger.debug(`User found ${this.uid}`);
 
-    const userProfile = await this.obtainProfileFromDB();
-    // console.log('userProfile', JSON.stringify(userProfile,null,2));
+    const userProfile = await this.obtainProfileFromDB();    
     if (userProfile) {
       this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
 
@@ -535,8 +534,7 @@ export class UserContext extends UserContextInfo {
 
     if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
       this.roles.push(Role.SuperAdmin);
-    }
-    // console.log('this.roles',this.roles)
+    }    
     // this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
   };
 
@@ -924,7 +922,7 @@ export class UserContext extends UserContextInfo {
       //   }
     }
 
-    // console.log(JSON.stringify(results,null,2))
+    
     return results;
   }
 
@@ -1007,7 +1005,7 @@ export class UserContext extends UserContextInfo {
       tenantId: this.tenantId,
       orgId: this.orgId,
       branchId: this.branchId,
-    });    
+    });
     return miniAppInstallation.miniApp;
   }