@simitgroup/simpleapp-generator 2.0.0-c-alpha → 2.0.0-d-alpha

package/ReleaseNote.md

@@ -1,3 +1,6 @@
+[2.0.0d-alpha]
+1. provide tenantInfo, orgInfo, branchInfo to frontend
+
 [2.0.0c-alpha]
 1. fix profile session keeping error
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.0c-alpha",
+  "version": "2.0.0d-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

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

@@ -29,7 +29,7 @@ export class MiniAppManagerPolicyService {
   }
 
   hasRequiredPlan(appUser: UserContext, miniApp: MiniApp) {
-    const currentPlan = appUser.getPackage();
+    const currentPlan = appUser.tenantInfo.package;
     const requiredPlans = miniApp.access.requiredPlans ?? [];
 
     if (_.isEmpty(requiredPlans)) return true;

package/templates/nest/src/simple-app/.core/features/policy/policy.service.ts.eta

@@ -28,7 +28,7 @@ export class PolicyService {
    * - plans/enterprise.ts
    */
   hasFeature(appUser: UserContext, feature: keyof typeof this._FEATURES): boolean {
-    const appPackage = appUser.getPackage();
+    const appPackage = appUser.tenantInfo.package
     const allowedPlans = this._FEATURES[feature];
 
     return allowedPlans.includes(appPackage);

package/templates/nest/src/simple-app/.core/features/profile/profile.schema.ts.eta

@@ -3,6 +3,8 @@ 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 { Role } from '../auth/role-guard/roles.enum';
+import { Organization } from '../../resources/organization/organization.schema';
+import { Tenant } from '../../resources/tenant/tenant.schema';
 
 export class UserContextInfo {
   @ApiProperty({ type: String })
@@ -13,7 +15,6 @@ export class UserContextInfo {
   sessionId: string;
   @ApiProperty({ type: String })
   xOrg: string;
-
   @ApiProperty({ type: Number })
   tenantId: number;
   @ApiProperty({ type: Number })
@@ -58,6 +59,13 @@ export class UserContextInfo {
   @ApiProperty({ type: () => [ProfileUserBranch], description: 'List of branch the user can access in current tenant' })
   branches: ProfileUserBranch[];
 
+  @ApiProperty({ type: ()=>Tenant, description: 'List of task, or authority of the user can do' })
+  tenantInfo:Tenant;
+  @ApiProperty({ type: ()=>Organization, description: 'List of task, or authority of the user can do' })
+  orgInfo:Organization;
+  @ApiProperty({ type: ()=>Branch, description: 'List of task, or authority of the user can do' })
+  branchInfo:Branch;
+  
   @ApiProperty({ type: () => Object, description: 'Store all the rest of useful fields regarding user or branch' })
   moreProps?: Record<string, any>;
 }
@@ -75,11 +83,11 @@ export class ProfileUserInvites {
 
 export class BranchMinInfo {
   @ApiProperty({ type: String })
-  branchId:string
+  branchId: string;
   @ApiProperty({ type: String })
-  branchCode:string
+  branchCode: string;
   @ApiProperty({ type: String })
-  branchName:string
+  branchName: string;
 }
 export class ProfileUserBranch {
   @ApiProperty({ type: String })

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

@@ -106,7 +106,7 @@ export class UserContext extends UserContextInfo {
 
   // protected moreProps: Record<string, any> = {};
 
-  protected package: string = '';
+  // protected package: string = '';
 
   protected webhooks: Webhook[] = []; //systemWebHooks;
   protected clientSetting: TenantClientSetting = {
@@ -186,7 +186,7 @@ export class UserContext extends UserContextInfo {
 
   getMoreProps = () => this.moreProps;
 
-  getPackage = () => this.package;
+  // getPackage = () => this.package;
 
   getRoles = () => this.roles;
 
@@ -220,9 +220,9 @@ export class UserContext extends UserContextInfo {
     // if (Array.isArray(wh) && wh.length > 0) this.webhooks = this.webhooks.concat(wh);
   };
 
-  setPackage = (packageName: string) => {
-    this.package = packageName;
-  };
+  // setPackage = (packageName: string) => {
+  //   this.package = packageName;
+  // };
 
   setTimeZone = (timeZone: string) => {
     this.timeZone = timeZone;
@@ -270,6 +270,16 @@ export class UserContext extends UserContextInfo {
     const pipelines: PipelineStage[] = [
       //get profile
       { $match: { uid: this.uid, tenantId: this.tenantId } },
+      {
+        $lookup: {
+          from: 'tenant',
+          as: 'tenantInfo',
+          localField: 'tenantId',
+          foreignField: 'tenantId',
+          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+        },
+      },
+      {$unwind:{path:'$tenantInfo',preserveNullAndEmptyArrays:true}},
       {
         $lookup: {
           from: 'permission',
@@ -286,13 +296,13 @@ export class UserContext extends UserContextInfo {
         },
       },
       {
-        $project: {
-          uid: 1,
-          fullName: 1,
-          email: 1,
-          tenantId: 1,
-          orgId: 1,
-          branchId: 1,
+        $addFields: {
+          // uid: 1,
+          // fullName: 1,
+          // email: 1,
+          // tenantId: 1,
+          // orgId: 1,
+          // branchId: 1,
           groups: '$perm.groups',
         },
       },
@@ -327,6 +337,36 @@ export class UserContext extends UserContextInfo {
           preserveNullAndEmptyArrays: true,
         },
       },
+      {
+        $lookup: {
+          from: 'tenant',
+          as: 'tenantInfo',
+          localField: 'tenantId',
+          foreignField: 'tenantId',
+          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+        },
+      },
+      {$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} }],
+        },
+      },
+      {$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} }],
+        },
+      },
+      {$unwind:{path:'$branchInfo',preserveNullAndEmptyArrays:true}},
       {
         $project: {
           uid: 1,
@@ -346,6 +386,9 @@ export class UserContext extends UserContextInfo {
           timeZone: '$b.o.timeZone',
           currency: '$b.o.currency',
           country: '$b.o.country',
+          tenantInfo:1,
+          orgInfo:1,
+          branchInfo:1,
         },
       },
 
@@ -400,8 +443,40 @@ export class UserContext extends UserContextInfo {
           ],
         },
       },
-    ];    
+
+      //get invites
+      {
+        $lookup: {
+          from: 'user',
+          localField: 'email',
+          foreignField: 'email',
+          as: 'invites',
+          pipeline: [
+            { $match: { uid: '' } },
+            {
+              $lookup: {
+                from: 'tenant',
+                localField: 'tenantId',
+                foreignField: 'tenantId',
+                as: 'tenant',
+              },
+            },
+            {$unwind:'$tenant'},
+            {
+              $project:{
+                _id:1,
+                created:1,
+                tenantId: 1,
+                tenantName:'$tenant.tenantName'
+              }
+            }
+          ],
+        },
+      }
+    ];
+
     const userProfiles: UserContextInfo[] = await this.userModel.aggregate(pipelines).exec();
+    // console.log("userProfiles",userProfiles)
     return userProfiles[0];
   }
 
@@ -418,13 +493,16 @@ export class UserContext extends UserContextInfo {
     this.logger.debug(`User found ${this.uid}`);
 
     const userProfile = await this.obtainProfileFromDB();
-    // console.log('userProfile', userProfile);
+    // console.log('userProfile', JSON.stringify(userProfile,null,2));
     if (userProfile) {
       this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
 
       this._id = userProfile._id;
       this.branchCode = userProfile['branchCode'] ?? '';
       this.branchName = userProfile['branchName'] ?? '';
+      this.tenantInfo = userProfile.tenantInfo;
+      this.orgInfo = userProfile.orgInfo;
+      this.branchInfo = userProfile.branchInfo;
       this.orgCode = userProfile['orgCode'] ?? '';
       this.orgName = userProfile['orgName'] ?? '';
       this.timeZone = userProfile['timeZone'] ?? '';
@@ -433,6 +511,7 @@ export class UserContext extends UserContextInfo {
       this.offsetMinute = userProfile['offsetMinute'] ?? 0;
       this.orgRecordId = userProfile['orgRecordId'] ?? '';
       this.branchRecordId = userProfile['branchRecordId'] ?? '';
+      this.invites = userProfile.invites;
       userProfile['branches'].forEach((b) => {
         b.xOrg = this.generateXOrg(b.tenantId, b.orgId, b.branchId);
       });
@@ -445,8 +524,8 @@ export class UserContext extends UserContextInfo {
         support: false,
       };
       this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
-      // this.moreProps = this.setMoreProps(userProfile);
-      this.package = userProfile['package'];
+      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})`);
@@ -600,6 +679,9 @@ export class UserContext extends UserContextInfo {
       branchId: this.branchId,
       //branch id in string (branch._id)
       branchRecordId: this.branchRecordId,
+      tenantInfo: this.tenantInfo,
+      orgInfo: this.orgInfo,
+      branchInfo: this.branchInfo,
 
       branchCode: this.branchCode,
       branchName: this.branchName,
@@ -980,7 +1062,7 @@ export class UserContext extends UserContextInfo {
   /**
    * Define additional properties from user into moreProps
    */
-  setMoreProps(userProfile: UserProfile): Record<string, any> {
+  setMoreProps(userProfile: UserContextInfo): Record<string, any> {
     const allprops = Object.keys(userProfile);
     const excludekeys = [
       'created',
@@ -1003,6 +1085,9 @@ export class UserContext extends UserContextInfo {
       'country',
       'offsetMinute',
       'tenantId',
+      'tenantInfo',
+      'orgInfo',
+      'branchInfo',
       // 'lastActivity',
       'group',
       '__v',
@@ -1017,9 +1102,9 @@ export class UserContext extends UserContextInfo {
       }
     }
 
-    if (!data['package']) {
-      data['package'] = 'free';
-    }
+    // if (!data['package']) {
+    //   data['package'] = 'free';
+    // }
     return data;
   }
 
@@ -1054,7 +1139,7 @@ type UserProfile = {
   groups: string[];
   roles: Role[];
   tenantRecordId?: string;
-  package?: string;
+  // package?: string;
   branchRecordId?: string;
   branchCode?: string;
   branchName?: string;
@@ -1092,7 +1177,7 @@ type UserProfile = {
     currentTenant: {
       _id: string;
       tenantName: string;
-      package: string;
+      // package: string;
       clientSetting: TenantClientSetting;
       owner: {
         uid: string;

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -5,7 +5,7 @@
  * Author: Ks Tan
  */
 import { defineNuxtPlugin } from "#app";
-import { PROFILEApi,ProfileUserBranch,UserContextInfo } from "../simpleapp/generate/openapi";
+import { PROFILEApi,ProfileUserBranch,UserContextInfo , Branch, Tenant,Organization} from "../simpleapp/generate/openapi";
 import { UserProfile } from "~/types";
 import axios, { Axios, AxiosError, AxiosResponse } from "axios";
 import _ from "lodash";
@@ -30,6 +30,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       currency: ref(""),
       country: ref(""),
       offsetMinute: ref(0),
+      tenantInfo: ref<Tenant>(),
+      orgInfo: ref<Organization>(),
+      branchInfo: ref<Branch>(),
       uid: ref(""),
       email: ref(""),
       fullName: ref(""),