@simitgroup/simpleapp-generator 1.6.7-o-alpha → 2.0.0-b-alpha

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

@@ -6,55 +6,66 @@
  * 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 * 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 { ProfileUserBranch, ProfileUserInvites } from '../../profile/profile.types';
-import { ModifiedRecords } from '../types';
-import { Role } from './roles/roles.enum';
-import systemWebHooks from '../../webhooks';
-import * as rolegroups from './roles/roles.group';
-import { isEmpty } from 'lodash';
-import { Request } from 'express';
 
+// 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 { 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 { ModifiedRecords } from '../../framework/schemas';
+import { Role } from '../auth/role-guard/roles.enum';
+import * as rolegroups from '../auth/role-guard/roles.group';
+
+// import systemWebHooks from '../../webhooks';
 @Injectable({ scope: Scope.REQUEST })
-export class UserContext {
-  protected sessionId: string = crypto.randomUUID();
+export class UserContext extends UserContextInfo {
+  sessionId: string = crypto.randomUUID();
 
   protected logger = new Logger(this.constructor.name);
 
-  protected uid: string = '';
+  // protected uid: string = '';
 
-  protected _id: string = '';
+  // protected _id: string = '';
 
-  protected uname: string = '';
+  // protected uname: string = '';
 
-  protected email: string = '';
+  // protected email: string = '';
 
-  protected fullname: string = '';
+  // protected fullname: string = '';
 
-  protected xOrg: string = '';
+  // protected xOrg: string = '';
 
-  protected tenantId: number = 0;
+  // protected tenantId: number = 0;
 
-  protected orgId: number = 0;
+  // protected orgId: number = 0;
 
-  protected orgRecordId: string = '';
+  // protected orgRecordId: string = '';
 
-  protected branchRecordId: string = '';
+  // protected branchRecordId: string = '';
 
-  protected branchId: number = 0;
+  // protected branchId: number = 0;
 
-  protected ssoACL: Record<string, { roles: string[] }> = {};
+  private ssoACL: Record<string, { roles: string[] }> = {};
 
-  protected token: string = '';
+  private token: string = '';
 
-  protected refreshtoken: string = '';
+  private refreshtoken: string = '';
 
   // Guest access token obtain from header 'x-guest-accesstoken', during use x-apikey / x-apisecret
-  protected guestToken?: string = '';
+  private guestToken?: string = '';
 
   protected guestInfo: {
     uid: string;
@@ -63,41 +74,41 @@ export class UserContext {
     email: string;
   } = { uid: '', uname: '', fullname: '', email: '' };
 
-  protected miniApiToken?: string;
+  private miniApiToken?: string;
 
-  protected miniApiTokenInfo?: TMiniApiTokenInfo;
+  private miniApiTokenInfo?: TMiniApiTokenInfo;
 
-  protected groups: string[] = [];
+  // protected groups: string[] = [];
 
-  protected branchCode: string = '';
+  // protected branchCode: string = '';
 
-  protected branchName: string = '';
+  // protected branchName: string = '';
 
-  protected orgCode: string = '';
+  // protected orgCode: string = '';
 
-  protected orgName: string = '';
+  // protected orgName: string = '';
 
-  protected timeZone: string = '';
+  // protected timeZone: string = '';
 
-  protected country: string = '';
+  // protected country: string = '';
 
-  protected offsetMinute: number = 0;
+  // protected offsetMinute: number = 0;
 
-  protected currency: string = '';
+  // protected currency: string = '';
 
-  protected branches: (Permission & { branch: Branch[] })[] = [];
+  // protected branches: ProfileUserBranch[] = [];
 
-  protected lastActivity: string = new Date().toISOString();
+  // protected lastActivity: string = new Date().toISOString();
 
-  protected invites: (ProfileUserInvites & { tenant: Tenant[] })[] = [];
+  // protected invites: ProfileUserInvites[] = [];
 
-  protected roles: Role[] = [];
+  // protected roles: Role[] = [];
 
-  protected moreProps: Record<string, any> = {};
+  // protected moreProps: Record<string, any> = {};
 
   protected package: string = '';
 
-  protected webhooks: Webhook[] = systemWebHooks;
+  protected webhooks: Webhook[] = []; //systemWebHooks;
   protected clientSetting: TenantClientSetting = {
     auditTrail: false,
     support: false,
@@ -113,19 +124,21 @@ export class UserContext {
     deleteds: {},
   };
 
-  protected appintegration: {
-    simbiz6: boolean;
-    einvoice: boolean;
-  } = { simbiz6: false, einvoice: false };
+  // protected appintegration: {
+  //   simbiz6: boolean;
+  //   einvoice: boolean;
+  // } = { simbiz6: false, einvoice: false };
 
   protected userType: TUserType = 'normal';
 
   constructor(
     private readonly userModel: Model<User>,
     private readonly permModel: Model<Permission>,
-    private readonly appModel: Model<Appintegration>,
-    private readonly miniAppInstallationModel: Model<Miniappinstallation>,
-  ) {}
+    // private readonly appModel: Model<Appintegration>,
+    private readonly miniAppInstallationModel: Model<MiniAppInstallation>,
+  ) {
+    super();
+  }
 
   setDBSession = (dbsession: ClientSession) => {
     this.dbsession = dbsession;
@@ -137,9 +150,9 @@ export class UserContext {
 
   getUid = () => this.uid;
 
-  getUname = () => this.uname;
+  getUname = () => this.uName;
 
-  getFullname = () => this.fullname;
+  getFullname = () => this.fullName;
 
   getTenantId = () => this.tenantId;
 
@@ -179,40 +192,9 @@ export class UserContext {
 
   getModifieds = () => this.modifiedRecords;
 
-  getBranches = (): ProfileUserBranch[] => {
-    const data: ProfileUserBranch[] = [];
-
-    if (Array.isArray(this.branches)) {
-      for (let i = 0; i < this.branches.length; i++) {
-        const branches = this.branches[i];
-        data.push({
-          _id: branches._id,
-          branch: branches.branch[0],
-          groups: branches.groups,
-          xOrg: this.generateXOrg(branches.tenantId, branches.orgId, branches.branchId),
-        });
-      }
-    }
-    return data;
-  };
+  getBranches = () => this.branches;
 
-  getInvites = (): ProfileUserInvites[] => {
-    const data: ProfileUserInvites[] = [];
-    if (this.invites) {
-      for (let i = 0; i < this.invites.length; i++) {
-        const invite = this.invites[i];
-        data.push({
-          _id: invite._id,
-          email: invite.email,
-          tenantId: invite.tenantId,
-          fullName: '',
-          tenantName: invite.tenant[0].tenantName,
-          created: invite.created,
-        });
-      }
-    }
-    return data;
-  };
+  getInvites = () => this.invites;
 
   getUserToken = () => this.token;
 
@@ -230,11 +212,12 @@ export class UserContext {
 
   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 });
+    // const wh = await webhookModel.find({ branchId: this.getBranchId(), active: true });
 
-    if (Array.isArray(wh) && wh.length > 0) this.webhooks = this.webhooks.concat(wh);
+    // if (Array.isArray(wh) && wh.length > 0) this.webhooks = this.webhooks.concat(wh);
   };
 
   setPackage = (packageName: string) => {
@@ -257,116 +240,170 @@ export class UserContext {
     this.offsetMinute = offsetMinute;
   };
 
-  /**
-   * Obtain user profile filter by uid, tenantId, orgId, branchId
-   * @returns Promise<User|undefined>
-   */
-  obtainProfileFromDB = async (): Promise<UserProfile | undefined> => {
-    const filter = { $match: { uid: this.uid, tenantId: this.tenantId } };
-
-    const joinPermission: PipelineStage = {
-      $lookup: {
-        from: 'permission',
-        localField: '_id',
-        foreignField: 'userId',
-        as: 'permissions',
-        pipeline: [
-          {
-            $match: {
-              tenantId: this.tenantId,
-              orgId: this.orgId,
-              branchId: this.branchId,
+  // async obtainNoTenantProfile() {
+  //   const pipelines: PipelineStage[] = [{ $match: { uid: this.uid, tenantId: this.tenantId } }];
+  //   try {
+  //     const userdata: User[] = await this.userModel.aggregate(pipelines).exec();
+  //     const userProfile: UserContextInfo = {
+  //       _id: '',
+  //       uid: this.uid,
+  //       email: this.email,
+  //       fullName: this.fullName,
+  //       uName: this.uName,
+  //       country: '',
+  //       currency: '',
+  //       offsetMinute: 0,
+  //     } as UserContextInfo;
+
+  //     if (Array.isArray(userdata) && userdata.length > 0) {
+  //       userProfile._id = userdata[0]._id;
+  //     }
+  //     return userProfile;
+  //   } catch (e) {
+  //     throw e;
+  //   }
+  // }
+  async obtainProfileFromDB() {
+    // if (this.tenantId == 0) {
+    //   return this.obtainNoTenantProfile();
+    // }
+    const pipelines: PipelineStage[] = [
+      //get profile
+      { $match: { uid: this.uid, tenantId: this.tenantId } },
+      {
+        $lookup: {
+          from: 'permission',
+          as: 'perm',
+          localField: '_id',
+          foreignField: 'userId',
+          pipeline: [{ $match: { tenantId: this.tenantId, orgId: this.orgId, branchId: this.branchId } }],
+        },
+      },
+      {
+        $unwind: {
+          path: '$perm',
+          preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $project: {
+          uid: 1,
+          fullName: 1,
+          email: 1,
+          tenantId: 1,
+          orgId: 1,
+          branchId: 1,
+          groups: '$perm.groups',
+        },
+      },
+      {
+        $lookup: {
+          from: 'branch',
+          as: 'b',
+          localField: 'branchId',
+          foreignField: 'branchId',
+          pipeline: [
+            {
+              $lookup: {
+                from: 'organization',
+                as: 'o',
+                localField: 'orgId',
+                foreignField: 'orgId',
+                pipeline: [{ $project: { orgCode: 1, orgName: 1, offsetMinute: 1, timeZone: 1, currency: 1, country: 1 } }],
+              },
             },
-          },
-          {
-            $lookup: {
-              from: 'branch',
-              localField: 'branchId',
-              foreignField: 'branchId',
-              as: 'currentbranch',
+            {
+              $unwind: {
+                path: '$o',
+                preserveNullAndEmptyArrays: true,
+              },
             },
-          },
-          {
-            $unwind: '$currentbranch',
-          },
-          {
-            $lookup: {
-              from: 'organization',
-              localField: 'orgId',
-              foreignField: 'orgId',
-              as: 'currentorg',
+          ],
+        },
+      },
+      {
+        $unwind: {
+          path: '$b',
+          preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $project: {
+          uid: 1,
+          fullName: 1,
+          email: 1,
+          tenantId: 1,
+          orgId: 1,
+          branchId: 1,
+          groups: 1,
+          branchRecordId: '$b._id',
+          branchCode: '$b.branchCode',
+          branchName: '$b.branchName',
+          orgRecordId: '$b.organization._id',
+          orgCode: '$b.o.orgCode',
+          orgName: '$b.o.orgName',
+          offsetMinute: '$b.o.offsetMinute',
+          timeZone: '$b.o.timeZone',
+          currency: '$b.o.currency',
+          country: '$b.o.country',
+        },
+      },
+
+      //get branches
+      {
+        $lookup: {
+          from: 'permission',
+          as: 'branches',
+          localField: 'uid',
+          foreignField: 'uid',
+          pipeline: [
+            { $project: { tenantId: 1, orgId: 1, branchId: 1, groups: 1 } },
+            {
+              $lookup: {
+                from: 'branch',
+                as: 'b',
+                localField: 'branchId',
+                foreignField: 'branchId',
+                pipeline: [
+                  {
+                    $lookup: {
+                      from: 'organization',
+                      as: 'org',
+                      localField: 'orgId',
+                      foreignField: 'orgId',
+                    },
+                  },
+                  { $unwind: '$org' },
+                ],
+              },
             },
-          },
-          {
-            $unwind: '$currentorg',
-          },
-          {
-            $lookup: {
-              from: 'tenant',
-              localField: 'tenantId',
-              foreignField: 'tenantId',
-              as: 'currentTenant',
+            { $unwind: '$b' },
+            {
+              $project: {
+                tenantId: 1,
+                orgId: 1,
+                branchId: 1,
+                branch: {
+                  _id: '$b._id',
+                  branchCode: '$b.branchCode',
+                  branchName: '$b.branchName',
+                  branchId: '$b.branchId',
+                },
+
+                groups: 1,
+                orgCode: '$b.org.orgCode',
+                orgName: '$b.org.orgName',
+                branchCode: '$b.branchCode',
+                branchName: '$b.branchName',
+              },
             },
-          },
-
-          {
-            $unwind: '$currentTenant',
-          },
-        ],
+          ],
+        },
       },
-    };
-
-    const pipeline: PipelineStage[] = [filter];
-
-    if (this.tenantId > 0) {
-      pipeline.push(joinPermission);
-      pipeline.push({ $unwind: '$permissions' });
-    }
-
-    const userProfiles: UserProfile[] = await this.userModel.aggregate(pipeline);
-    if (!userProfiles || userProfiles.length === 0) {
-      return undefined;
-    }
-
-    const userProfile = userProfiles[0];
-
-    if (this.tenantId > 0) {
-      const userPermissions = userProfile.permissions;
-
-      if (userPermissions && userPermissions.groups) {
-        userProfile.groups = userPermissions.groups;
-        userProfile.roles = [Role.Everyone, Role.User] as Role[];
-        for (let g = 0; g < userProfile.groups.length; g++) {
-          const roles: Role[] = (<() => Role[]>rolegroups[userProfile.groups[g]])();
-          for (let r = 0; r < roles.length; r++) {
-            if (!userProfile.roles.includes(roles[r])) {
-              userProfile.roles.push(roles[r]);
-            }
-          }
-        }
-        if (userPermissions.currentTenant.owner.uid == userProfile.uid) {
-          userProfile.roles.push(Role.TenantOwner);
-        }
-        userProfile.tenantRecordId = userPermissions.currentTenant._id;
-        userProfile.package = userPermissions.currentTenant.package;
-        userProfile.branchRecordId = userPermissions.currentbranch._id;
-        userProfile.branchCode = userPermissions.currentbranch.branchCode;
-        userProfile.branchName = userPermissions.currentbranch.branchName;
-        userProfile.orgRecordId = userPermissions.currentorg._id;
-        userProfile.orgCode = userPermissions.currentorg.orgCode;
-        userProfile.orgName = userPermissions.currentorg.orgName;
-        userProfile.timeZone = userPermissions.currentorg.timeZone;
-        userProfile.currency = userPermissions.currentorg.currency;
-        userProfile.country = userPermissions.currentorg.country;
-        userProfile.offsetMinute = userPermissions.currentorg.offsetMinute;
-        userProfile.clientSetting = userPermissions.currentTenant.clientSetting;
-      }
-    } else {
-      userProfile.groups = [];
-    }
-
-    return userProfile;
-  };
+    ];    
+    const userProfiles: UserContextInfo[] = await this.userModel.aggregate(pipelines).exec();
+    return userProfiles[0];
+  }
 
   setUserToken = async (tokenStr: string) => {
     this.logger.debug(`===setUserToken===`);
@@ -375,16 +412,17 @@ export class UserContext {
     this.token = tokenStr;
     this.uid = tokeninfo?.sub ?? '';
     this.email = <string>tokeninfo?.email ?? '';
-    this.uname = <string>tokeninfo?.preferred_username ?? '';
-    this.fullname = <string>tokeninfo?.name ?? '';
+    this.uName = <string>tokeninfo?.preferred_username ?? '';
+    this.fullName = <string>tokeninfo?.name ?? '';
     this.ssoACL = <Record<string, { roles: string[] }>>tokeninfo?.resource_access ?? {};
     this.logger.debug(`User found ${this.uid}`);
 
     const userProfile = await this.obtainProfileFromDB();
+    // console.log('userProfile', userProfile);
     if (userProfile) {
       this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
 
-      this._id = userProfile._id.toString();
+      this._id = userProfile._id;
       this.branchCode = userProfile['branchCode'] ?? '';
       this.branchName = userProfile['branchName'] ?? '';
       this.orgCode = userProfile['orgCode'] ?? '';
@@ -395,12 +433,21 @@ export class UserContext {
       this.offsetMinute = userProfile['offsetMinute'] ?? 0;
       this.orgRecordId = userProfile['orgRecordId'] ?? '';
       this.branchRecordId = userProfile['branchRecordId'] ?? '';
+      userProfile['branches'].forEach((b) => {
+        b.xOrg = this.generateXOrg(b.tenantId, b.orgId, b.branchId);
+      });
+      this.branches = userProfile['branches'];
       this.groups = userProfile['groups'] ?? [];
-      this.clientSetting = userProfile['clientSetting'] ?? {};
+      this.clientSetting = userProfile['clientSetting'] ?? {
+        auditTrail: false,
+        disableClassReminder: true,
+        webhook: false,
+        support: false,
+      };
       this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
-      this.moreProps = this.setMoreProps(userProfile);
+      // this.moreProps = this.setMoreProps(userProfile);
       this.package = userProfile['package'];
-      this.appintegration = await this.setAppIntegration();
+      // this.appintegration = await this.setAppIntegration();
     } else {
       this.logger.debug(`User ${this.uid} not exists in tenant (${this.tenantId})`);
       this.logger.debug(`Set unknown id of current user`);
@@ -410,11 +457,11 @@ export class UserContext {
     if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
       this.roles.push(Role.SuperAdmin);
     }
-
-    this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
+    // 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(',')}).`);
   };
 
-  generateXOrg = (tenantId: number, orgId: number, branchId: number): string => {
+  generateXOrg = (tenantId: Number, orgId: Number, branchId: Number): string => {
     return Base64URL.encodeText(`${tenantId}-${orgId}-${branchId}`);
   };
 
@@ -528,110 +575,57 @@ export class UserContext {
     }
   };
 
-  async getUserInfo(): Promise<UserInfo> {
-    this.logger.debug('===getUserInfo===');
+  async getUserInfo(): Promise<UserContextInfo> {
+    const userInfo = this.exportAsProfile();
+    return Promise.resolve(userInfo);
+  }
 
-    const userinfo = {
-      _id: this.getId(),
+  exportAsProfile(): UserContextInfo {
+    const result: UserContextInfo = {
+      //mongodb user._id
+      _id: this._id,
+      //keycloak: user sub id
+      uid: this.uid,
+      //rand: uuid
       sessionId: this.sessionId,
-      tenantId: this.getTenantId(),
-      orgId: this.getOrgId(),
+      xOrg: this.xOrg,
+      // tenant in number
+      tenantId: this.tenantId,
+
+      //org in number
+      orgId: this.orgId,
+      //org in string (organization._id)
       orgRecordId: this.orgRecordId,
+      //branchid in number
+      branchId: this.branchId,
+      //branch id in string (branch._id)
       branchRecordId: this.branchRecordId,
-      branchId: this.getBranchId(),
+
       branchCode: this.branchCode,
       branchName: this.branchName,
       orgCode: this.orgCode,
       orgName: this.orgName,
-      timeZone: this.getTimeZone(),
-      currency: this.getCurrency(),
-      country: this.getCountry(),
-      offsetMinute: this.getOffsetMinute(),
-      email: this.getEmail(),
-      uid: this.getUid(),
-      fullName: this.getFullname(),
+      timeZone: this.timeZone,
+      currency: this.currency,
+      country: this.country,
+      //offset in minute, malaysia -480
+      offsetMinute: this.offsetMinute,
+      email: this.email,
+      fullName: this.fullName,
+      uName: this.uName,
       groups: this.groups,
-      roles: this.getRoles(),
+      roles: this.roles,
       branches: this.getBranches(),
       invites: this.getInvites(),
-      moreProps: this.getMoreProps(),
-      appintegration: this.getAppIntegration(),
-      userType: this.getUserType(),
+      moreProps: this.moreProps,
     };
-
-    if (this.getId() != '') {
-      this.logger.verbose('User Info: ' + JSON.stringify(userinfo));
-      const filter: PipelineStage = {
-        $match: {
-          uid: this.uid,
-          tenantId: this.tenantId,
-        },
-      };
-      const permission: PipelineStage = {
-        $lookup: {
-          from: 'permission',
-          localField: '_id',
-          foreignField: 'userId',
-          as: 'permissions',
-          pipeline: [
-            {
-              $lookup: {
-                from: 'branch',
-                localField: 'branchId',
-                foreignField: 'branchId',
-                as: 'branch',
-              },
-            },
-          ],
-        },
-      };
-      const lookupInvitation: PipelineStage = {
-        $lookup: {
-          from: 'user',
-          localField: 'email',
-          foreignField: 'email',
-          as: 'invites',
-          pipeline: [
-            { $match: { uid: '' } },
-            {
-              $lookup: {
-                from: 'tenant',
-                localField: 'tenantId',
-                foreignField: 'tenantId',
-                as: 'tenant',
-              },
-            },
-          ],
-        },
-      };
-
-      const pipeline: PipelineStage[] = [filter, permission, lookupInvitation];
-      this.logger.verbose('User Info Pipeline: ' + JSON.stringify(pipeline));
-
-      const userInvitationsAndPermissions: Array<{
-        invites?: (ProfileUserInvites & { tenant: Tenant[] })[];
-        permissions?: (Permission & { branch: Branch[] })[];
-      }> = await this.userModel.aggregate(pipeline);
-
-      this.logger.verbose('User invitations & permissions data: ' + JSON.stringify(userInvitationsAndPermissions));
-
-      this.invites = userInvitationsAndPermissions[0].invites;
-      this.branches = userInvitationsAndPermissions[0].permissions;
-
-      userinfo.branches = this.getBranches();
-      userinfo.invites = this.getInvites();
-    } else if (this.getTenantId() > 0) {
-      throw new ForbiddenException(`userNotExistInTenant`, 'Access Deny');
-    }
-
-    return userinfo;
+    return result;
   }
-
   async decideInvitation(id: string, decision: string): Promise<boolean> {
     const res = await this.userModel.findById(id);
     if (!res.uid) {
       res.uid = this.getUid();
-      res.fullName = this.fullname;
+      res.fullName = this.fullName;
       res.active = true;
 
       if (decision == 'accept') {
@@ -704,92 +698,151 @@ export class UserContext {
     }
   }
 
-  async getAllTenants(): Promise<UserTenant[]> {
-    const results: UserTenant[] = [];
+  async getAllTenants(): Promise<TenantPermission[]> {
+    let results: TenantPermission[] = [];
     if (this.getId() != '') {
-      const permission: PipelineStage = {
-        $lookup: {
-          from: 'permission',
-          localField: '_id',
-          foreignField: 'userId',
-          as: 'permissions',
-          pipeline: [
-            {
-              $lookup: {
-                from: 'organization',
-                localField: 'orgId',
-                foreignField: 'orgId',
-                as: 'org',
-              },
-            },
-            { $unwind: '$org' },
-            {
-              $lookup: {
-                from: 'branch',
-                localField: 'branchId',
-                foreignField: 'branchId',
-                as: 'branch',
-              },
+      const pipelines: PipelineStage[] = [
+        {
+          $match: {
+            uid: this.uid,
+            tenantId: {
+              $gt: 0,
             },
-            { $unwind: '$branch' },
-          ],
+          },
         },
-      };
-      const pipelines: PipelineStage[] = [
-        { $match: { uid: this.uid, tenantId: { $gt: 0 } } },
         {
           $lookup: {
             from: 'tenant',
             localField: 'tenantId',
             foreignField: 'tenantId',
             as: 'tenant',
+            pipeline: [{ $match: { active: true } }],
+          },
+        },
+        {
+          $unwind: '$tenant',
+        },
+        {
+          $lookup: {
+            from: 'permission',
+            localField: '_id',
+            foreignField: 'userId',
+            as: 'perms',
+            pipeline: [
+              {
+                $lookup: {
+                  from: 'branch',
+                  as: 'b',
+                  localField: 'branchId',
+                  foreignField: 'branchId',
+                  pipeline: [
+                    {
+                      $lookup: {
+                        from: 'organization',
+                        as: 'org',
+                        localField: 'organization._id',
+                        foreignField: '_id',
+                      },
+                    },
+                    { $unwind: '$org' },
+                    {
+                      $project: {
+                        branch: {
+                          _id: '$_id',
+                          code: '$branchCode',
+                          label: '$branchName',
+                        },
+                        organization: {
+                          _id: '$org._id',
+                          code: '$org.orgCode',
+                          label: '$org.orgName',
+                        },
+                      },
+                    },
+                  ],
+                },
+              },
+              { $unwind: '$b' },
+              {
+                $project: {
+                  tenantId: 1,
+                  orgId: 1,
+                  branchId: 1,
+                  branch: '$b.branch',
+                  groups: 1,
+                  organization: '$b.organization',
+                },
+              },
+            ],
+          },
+        },
+        {
+          $project: {
+            tenantName: '$tenant.tenantName',
+            perms: 1,
           },
         },
-        permission,
       ];
 
-      const userTenants: Array<
-        User & {
-          tenant: Tenant[];
-          permissions: Array<Permission & { org: Organization; branch: Branch }>;
+      const datas = await this.userModel.aggregate(pipelines);
+      for (const r of datas) {
+        const perms: ProfileUserBranch[] = [];
+        for (const p of r.perms) {
+          perms.push({
+            permissionId: p._id,
+            tenantId: p.tenantId,
+            orgId: p.orgId,
+            branchId: p.branchId,
+            groups: p.groups,
+            branch: p.branch,
+            orgRecordId: p.organization._id,
+            xOrg: this.generateXOrg(p.tenantId, p.orgId, p.branchId),
+          });
         }
-      > = await this.userModel.aggregate(pipelines);
 
-      if (userTenants) {
-        const activeUserTenants = userTenants.filter((userTenant) => {
-          return userTenant.active === true && userTenant.tenant[0].active === true;
-        });
-
-        activeUserTenants.forEach((activeUserTenant) => {
-          const permissions = activeUserTenant.permissions
-            .filter((item) => {
-              return item.org.active && item.branch.active;
-            })
-            .map((item) => {
-              return {
-                _id: item._id,
-                orgId: item.orgId,
-                branchId: item.branchId,
-                groups: item.groups,
-                orgRecordId: item.org._id,
-                orgCode: item.org.orgCode,
-                orgName: item.org.orgName,
-                branchCode: item.branch.branchCode,
-                branchName: item.branch.branchName,
-                xOrg: this.generateXOrg(activeUserTenant.tenantId, item.orgId, item.branchId),
-              };
-            });
-
-          results.push({
-            _id: activeUserTenant._id,
-            fullName: activeUserTenant.fullName,
-            tenantId: activeUserTenant.tenantId,
-            tenantName: activeUserTenant.tenant[0].tenantName,
-            permissions: permissions,
-          });
+        results.push({
+          tenantName: r.tenantName,
+          permissions: perms,
         });
       }
+
+      //   if (userTenants) {
+      //     const activeUserTenants = userTenants.filter((userTenant) => {
+      //       return userTenant.active === true && userTenant.tenant[0].active === true;
+      //     });
+
+      //     activeUserTenants.forEach((activeUserTenant) => {
+      //       const permissions = activeUserTenant.permissions
+      //         .filter((item) => {
+      //           return item.org.active && item.branch.active;
+      //         })
+      //         .map((item) => {
+      //           return {
+      //             _id: item._id,
+      //             orgId: item.orgId,
+      //             branchId: item.branchId,
+      //             groups: item.groups,
+      //             orgRecordId: item.org._id,
+      //             orgCode: item.org.orgCode,
+      //             orgName: item.org.orgName,
+      //             branchCode: item.branch.branchCode,
+      //             branchName: item.branch.branchName,
+      //             xOrg: this.generateXOrg(activeUserTenant.tenantId, item.orgId, item.branchId),
+      //           };
+      //         });
+
+      //       results.push({
+      //         _id: activeUserTenant._id,
+      //         fullName: activeUserTenant.fullName,
+      //         tenantId: activeUserTenant.tenantId,
+      //         tenantName: activeUserTenant.tenant[0].tenantName.toString(),
+      //         permissions: permissions,
+      //       });
+      //     });
+      //   }
     }
+
+    // console.log(JSON.stringify(results,null,2))
     return results;
   }
 
@@ -798,8 +851,8 @@ export class UserContext {
     this.token = '';
     this.uid = uid;
     this.email = email;
-    this.uname = uname;
-    this.fullname = name;
+    this.uName = uname;
+    this.fullName = name;
     this.ssoACL = {};
     this.roles = [Role.Everyone, Role.User, Role.SuperUser];
     this.setXOrg(xorg);
@@ -829,6 +882,7 @@ export class UserContext {
 
   async setMiniApiUser(tokenStr: string, xOrg: string) {
     const tokenInfo: TMiniApiTokenInfo = jwt.decode(tokenStr) as TMiniApiTokenInfo;
+
     const appId = tokenInfo?.miniAppId ?? '';
 
     this.setXOrg(xOrg);
@@ -843,7 +897,7 @@ export class UserContext {
     }
 
     this.token = tokenStr;
-    this.uid = miniAppInstallation.miniApiUser.uid;
+    this.uid = miniAppInstallation.miniApiUser.uid.toString();
 
     await this.setUserProfileFromDB();
   }
@@ -865,66 +919,63 @@ export class UserContext {
   }
 
   async setUserProfileFromDB() {
-    const userProfile = await this.obtainProfileFromDB();
-    if (userProfile) {
-      this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
-
-      this._id = userProfile._id.toString();
-      this.email = userProfile.email ?? '';
-      this.uname = userProfile.uname ?? '';
-      this.fullname = userProfile.fullname ?? '';
-
-      this.branchCode = userProfile['branchCode'] ?? '';
-      this.branchName = userProfile['branchName'] ?? '';
-      this.orgCode = userProfile['orgCode'] ?? '';
-      this.orgName = userProfile['orgName'] ?? '';
-      this.timeZone = userProfile['timeZone'] ?? '';
-      this.currency = userProfile['currency'] ?? '';
-      this.country = userProfile['country'] ?? '';
-      this.offsetMinute = userProfile['offsetMinute'] ?? 0;
-      this.orgRecordId = userProfile['orgRecordId'] ?? '';
-      this.branchRecordId = userProfile['branchRecordId'] ?? '';
-      this.groups = userProfile['groups'] ?? [];
-      this.clientSetting = userProfile['clientSetting'] ?? {};
-      this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
-      this.moreProps = this.setMoreProps(userProfile);
-      this.package = userProfile['package'];
-      this.appintegration = await this.setAppIntegration();
-    } else {
-      this.logger.debug(`User ${this.uid} not exists in tenant (${this.tenantId})`);
-      this.logger.debug(`Set unknown id of current user`);
-      this.roles = [Role.Everyone, Role.Unknown];
-    }
-
-    if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
-      this.roles.push(Role.SuperAdmin);
-    }
-
-    this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
+    // const userProfile = await this.obtainProfileFromDB();
+    // if (userProfile) {
+    //   this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
+    //   this._id = userProfile._id.toString();
+    //   this.email = userProfile.email ?? '';
+    //   this.uName = userProfile.uname ?? '';
+    //   this.fullName = userProfile.fullname ?? '';
+    //   this.branchCode = userProfile['branchCode'] ?? '';
+    //   this.branchName = userProfile['branchName'] ?? '';
+    //   this.orgCode = userProfile['orgCode'] ?? '';
+    //   this.orgName = userProfile['orgName'] ?? '';
+    //   this.timeZone = userProfile['timeZone'] ?? '';
+    //   this.currency = userProfile['currency'] ?? '';
+    //   this.country = userProfile['country'] ?? '';
+    //   this.offsetMinute = userProfile['offsetMinute'] ?? 0;
+    //   this.orgRecordId = userProfile['orgRecordId'] ?? '';
+    //   this.branchRecordId = userProfile['branchRecordId'] ?? '';
+    //   this.groups = userProfile['groups'] ?? [];
+    //   this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
+    //   //more complex
+    //   this.clientSetting = userProfile['clientSetting'] ?? {};
+    //   this.moreProps = this.setMoreProps(userProfile);
+    //   this.package = userProfile['package'];
+    //   // this.appintegration = await this.setAppIntegration();
+    // } else {
+    //   this.logger.debug(`User ${this.uid} not exists in tenant (${this.tenantId})`);
+    //   this.logger.debug(`Set unknown id of current user`);
+    //   this.roles = [Role.Everyone, Role.Unknown];
+    // }
+    // if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
+    //   this.roles.push(Role.SuperAdmin);
+    // }
+    // this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
   }
 
-  getAppIntegration = () => this.appintegration;
-
-  async setAppIntegration() {
-    const extension: PipelineStage[] = [
-      {
-        $match: {
-          branchId: this.getBranchId(),
-          tenantId: this.getTenantId(),
-          active: true,
-        },
-      },
-    ];
-
-    const appintegration = await this.appModel.aggregate(extension);
-    if (appintegration && appintegration.length > 0) {
-      appintegration.forEach((item) => {
-        if (item.appId === 'simbiz6') this.appintegration.simbiz6 = true;
-        if (item.appId === 'einvoice') this.appintegration.einvoice = true;
-      });
-    }
-    return this.appintegration;
-  }
+  // getAppIntegration = () => this.appintegration;
+
+  // async setAppIntegration() {
+  //   const extension: PipelineStage[] = [
+  //     {
+  //       $match: {
+  //         branchId: this.getBranchId(),
+  //         tenantId: this.getTenantId(),
+  //         active: true,
+  //       },
+  //     },
+  //   ];
+
+  //   const appintegration = await this.appModel.aggregate(extension);
+  //   if (appintegration && appintegration.length > 0) {
+  //     appintegration.forEach((item) => {
+  //       if (item.appId === 'simbiz6') this.appintegration.simbiz6 = true;
+  //       if (item.appId === 'einvoice') this.appintegration.einvoice = true;
+  //     });
+  //   }
+  //   return this.appintegration;
+  // }
 
   /**
    * Define additional properties from user into moreProps
@@ -952,7 +1003,7 @@ export class UserContext {
       'country',
       'offsetMinute',
       'tenantId',
-      'lastActivity',
+      // 'lastActivity',
       'group',
       '__v',
       'uid',
@@ -1015,7 +1066,7 @@ type UserProfile = {
   country?: string;
   offsetMinute?: number;
   clientSetting?: TenantClientSetting;
-  lastActivity?: string;
+  // lastActivity?: string;
   permissions: {
     _id: string;
     tenantId: number;
@@ -1050,34 +1101,3 @@ type UserProfile = {
     };
   };
 };
-
-type UserInfo = {
-  _id: string;
-  sessionId: string;
-  tenantId: number;
-  orgId: number;
-  orgRecordId: string;
-  branchRecordId: string;
-  branchId: number;
-  branchCode: string;
-  branchName: string;
-  orgCode: string;
-  orgName: string;
-  timeZone: string;
-  currency: string;
-  country: string;
-  offsetMinute: number;
-  email: string;
-  uid: string;
-  fullName: string;
-  groups: string[];
-  roles: Role[];
-  branches: ProfileUserBranch[];
-  invites: ProfileUserInvites[];
-  moreProps: Record<string, any>;
-};
-
-type UserTenant = User & {
-  tenantName: string;
-  permissions: Permission[];
-};