@simitgroup/simpleapp-generator 2.0.1-b-alpha → 2.0.1-d-alpha

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

@@ -357,106 +357,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
   }
 
-  // seems no use, and confusing
-  // async createManyWithId(appuser: UserContext, datas: T[]) {
-  //   if (Array.isArray(datas)) {
-  //     for (let i = 0; i < datas.length; i++) {
-  //       const data = datas[i];
-  //       let isolationFilter: any = { ...appuser.getCreateFilterWithId() };
-  //       isolationFilter = this.polishIsolationFilter(isolationFilter, data);
-
-  //       Object.assign(data, isolationFilter);
-  //       this.reCalculateValue(data);
-  //       await this.validateData(appuser, data);
-  //       this.applyNestedDateTime(appuser, data, 'create');
-  //     }
-
-  //     const dbsession = appuser.getDBSession();
-  //     if (dbsession && !dbsession.inTransaction()) {
-  //       dbsession.startTransaction({ readPreference: 'primary' });
-  //     }
-
-  //     const result = await this.doc.insertMany(datas, { session: dbsession });
-  //     await this.addManyAuditEvents(appuser, this.documentName, 'createMany', datas);
-  //     for (let i = 0; i < datas.length; i++) {
-  //       appuser.addInsertedRecordId(this.documentName, datas[i]._id);
-  //     }
-  //     return result;
-  //   } else {
-  //     throw new BadRequestException(this.getDocumentType() + ': create many only support array');
-  //   }
-  // }
-
-  /**
-   * create many from array with hooks (temporary used for generate sample data only)
-   * @param appuser
-   * @param datas
-   */
-  //seems nobody use. also confusing
-  // async createManyWithHook(appuser: UserContext, datas: T[]) {
-  //   if (Array.isArray(datas)) {
-  //     for (let i = 0; i < datas.length; i++) {
-  //       const data = datas[i];
-
-  //       let result;
-  //       const dbsession = appuser.getDBSession();
-  //       if (dbsession && !dbsession.inTransaction()) {
-  //         dbsession.startTransaction({ readPreference: 'primary' });
-  //       }
-
-  //       if (this.withDocNumberFormat && !data[this.documentIdentityCode]) {
-  //         await this.genNewDocNo(appuser, data);
-  //       }
-
-  //       let isolationFilter: any = { ...appuser.getCreateFilterWithId() };
-  //       isolationFilter = this.polishIsolationFilter(isolationFilter, data);
-
-  //       Object.assign(data, isolationFilter);
-  //       this.reCalculateValue(data);
-  //       await this.validateData(appuser, data);
-  //       this.applyNestedDateTime(appuser, data, 'create');
-
-  //       //new way of hook
-  //       await this.runEvent(appuser, this.setHookName('beforeCreate'), { data: data }, false);
-
-  //       const newdoc = new this.doc(data);
-
-  //       try {
-  //         result = await newdoc.save({ session: dbsession });
-  //         await this.addAuditEvent(appuser, this.documentName, result._id, 'create', data);
-  //         appuser.addInsertedRecordId(this.documentName, result._id);
-  //       } catch (err) {
-  //         this.logger.error(err);
-  //         throw new ProcessErrorException('ERR_CREATE_MANY',err.message,{
-  //           err:err
-  //         })
-  //         // const processdata = await this.runEvent(appuser, 'processdata.processError', {
-  //         //   err: err,
-  //         // });
-
-  //         // if (!processdata) {
-  //         //   throw new InternalServerErrorException(err);
-  //         // } else {
-  //         //   throw new CustomException(processdata.code, processdata.msg);
-  //         // }
-  //       }
-
-  //       try {
-  //         //new way of hook
-  //         await this.runEvent(appuser, this.setHookName('afterCreate'), { data: data }, false);
-  //         await this.callWebhook(appuser, 'create', result);
-
-  //         // return result as T;
-  //       } catch (err) {
-  //         throw new InternalServerErrorException(`createHook ${this.documentType} error: ${JSON.stringify(err)}`, `${this.documentType} createHook error`);
-  //       }
-  //     }
-  //   } else {
-  //     throw new BadRequestException(this.getDocumentType() + ': create many only support array');
-  //   }
-  //   return 'ok';
-  // }
-
+ 
   /**
    * create many from array, for performance reason it submit all item in 1 go, so it won't implement hooks
    * @param appuser
@@ -476,7 +377,7 @@ export class SimpleAppService<T extends SchemaFields> {
       }
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
 
       try {
@@ -495,71 +396,6 @@ export class SimpleAppService<T extends SchemaFields> {
     }
   }
 
-  //seems nobody use, also confusing
-  // async createWithId(appuser: UserContext, data: T) {
-  //   let result;
-
-  //   if (!data._id) {
-  //     data._id = crypto.randomUUID();
-  //   }
-  //   const dbsession = appuser.getDBSession();
-  //   if (dbsession && !dbsession.inTransaction()) {
-  //     dbsession.startTransaction({ readPreference: 'primary' });
-  //   }
-
-  //   this.logger.debug('this.withDocNumberFormat :' + this.withDocNumberFormat + '  && ' + '!data[this.documentIdentityCode] ==' + !data[this.documentIdentityCode]);
-  //   if (this.withDocNumberFormat && !data[this.documentIdentityCode]) {
-  //     await this.genNewDocNo(appuser, data);
-  //   }
-
-  //   let isolationFilter: any = { ...appuser.getCreateFilterWithId() };
-  //   isolationFilter = this.polishIsolationFilter(isolationFilter, data);
-
-  //   this.logger.debug('isolationFilter', 'SimpleAppService');
-  //   this.logger.debug(isolationFilter, 'SimpleAppService');
-  //   this.logger.debug('Create data before isolation', 'SimpleAppService');
-  //   this.logger.debug(data, 'SimpleAppService');
-  //   Object.assign(data, isolationFilter);
-  //   this.reCalculateValue(data);
-  //   await this.validateData(appuser, data);
-  //   this.logger.debug(data, `after create validation`);
-  //   this.applyNestedDateTime(appuser, data, 'create');
-
-  //   //new way of hook
-
-  //   await this.runEvent(appuser, this.setHookName('beforeCreate'), { data: data }, false);
-
-  //   this.logger.debug(data, `Create Record ${this.documentName}`);
-  //   const newdoc = new this.doc(data);
-  //   await this.identifyForeignKeys(appuser, data);
-  //   try {
-  //     result = await newdoc.save({ session: dbsession });
-  //     await this.addAuditEvent(appuser, this.documentName, result._id, 'create', data);
-  //     appuser.addInsertedRecordId(this.documentName, result._id);
-  //   } catch (err) {
-  //     this.logger.error(err);
-  //     const processdata = await this.runEvent(appuser, 'processdata.processError', {
-  //       err: err,
-  //     });
-
-  //     if (!processdata) {
-  //       throw new InternalServerErrorException(err);
-  //     } else {
-  //       throw new CustomException(processdata.code, processdata.msg);
-  //     }
-  //   }
-
-  //   try {
-  //     //new way of hook
-  //     await this.runEvent(appuser, this.setHookName('afterCreate'), { data: result }, false);
-
-  //     await this.callWebhook(appuser, 'create', result);
-  //     return result as T;
-  //   } catch (err) {
-  //     throw new InternalServerErrorException(`createHook ${this.documentType} error: ${JSON.stringify(err)}`, `${this.documentType} createHook error`);
-  //   }
-  // }
-
   async create(appuser: UserContext, data: T, noStartTransaction: boolean = false) {
     let result;
 
@@ -568,7 +404,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction() && !noStartTransaction) {
-      dbsession.startTransaction({ readPreference: 'primary' });
+      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
     }
 
     this.logger.debug('this.withDocNumberFormat :' + this.withDocNumberFormat + '  && ' + '!data[this.documentIdentityCode] ==' + !data[this.documentIdentityCode]);
@@ -714,7 +550,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
-      dbsession.startTransaction({ readPreference: 'primary' });
+      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
     }
 
     let dependency;
@@ -793,7 +629,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction() && !noStartTransaction) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
       // try {
       Object.assign(data, appuser.getUpdateFilter());
@@ -852,7 +688,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
       // try {
       // Object.assign(data, appuser.getUpdateFilter());
@@ -908,7 +744,7 @@ export class SimpleAppService<T extends SchemaFields> {
       await this.runEvent(appuser, this.setHookName('beforePatch'), { id: id, patchData: data, prevData: existingdata }, false);
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
       // try {
       Object.assign(data, appuser.getUpdateFilter());
@@ -963,7 +799,7 @@ export class SimpleAppService<T extends SchemaFields> {
     // Get DB Session
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
-      dbsession.startTransaction({ readPreference: 'primary' });
+      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
     }
 
     const result = await this.doc.updateMany(isolationFilter, { $set: patch }, { session: dbsession });
@@ -1316,63 +1152,63 @@ export class SimpleAppService<T extends SchemaFields> {
       },
     ];
 
-    // // Relation lookups
-    // Object.entries(option.relations).forEach(([relationName, relationOption]) => {
-    //   // Prevent mini api user lookup sensitive data
-    //   if (!allowedRelations.includes(relationName)) {
-    //     throw new BadRequestException(`Not allowed to lookup ${relationName}`);
-    //   }
-
-    //   const subPipeline: PipelineStage.Lookup['$lookup']['pipeline'] = [];
-
-    //   subPipeline.push({
-    //     $match: {
-    //       $expr: { $eq: [`$${relationOption.foreignField}`, '$$localValue'] },
-    //     },
-    //     ...relationOption.filter,
-    //   });
-
-    //   // Relation sort
-    //   if (relationOption.sort) {
-    //     subPipeline.push({
-    //       $sort: relationOption.sort,
-    //     });
-    //   }
-
-    //   // Relation projection
-    //   if (relationOption.projection) {
-    //     subPipeline.push({
-    //       $project: {
-    //         ...(relationOption.projection ?? {}),
-    //       },
-    //     });
-    //   }
-
-    //   pipeline.push({
-    //     $lookup: {
-    //       from: relationName.toLowerCase(),
-    //       as: `_${relationName}`,
-    //       let: { localValue: `$${relationOption.localField}` },
-    //       pipeline: subPipeline,
-    //     },
-    //   });
-    // });
-
-    // // Root sort
-    // if (option.root?.sort) {
-    //   pipeline.push({
-    //     $sort: option.root.sort,
-    //   });
-    // }
+    // Relation lookups
+    Object.entries(option.relations).forEach(([relationName, relationOption]) => {
+      // Prevent mini api user lookup sensitive data
+      if (!allowedRelations.includes(relationName)) {
+        throw new BadRequestException(`Not allowed to lookup ${relationName}`);
+      }
 
-    // // Root Projection
-    // if (option.root.projection) {
-    //   pipeline.push({
-    //     $project: {
-    //       ...(option.root?.projection ?? {}),
-    //     },
-    //   });
-    // }
+      const subPipeline: PipelineStage.Lookup['$lookup']['pipeline'] = [];
+
+      subPipeline.push({
+        $match: {
+          $expr: { $eq: [`$${relationOption.foreignField}`, '$$localValue'] },
+        },
+        ...relationOption.filter,
+      });
+
+      // Relation sort
+      if (relationOption.sort) {
+        subPipeline.push({
+          $sort: relationOption.sort,
+        });
+      }
+
+      // Relation projection
+      if (relationOption.projection) {
+        subPipeline.push({
+          $project: {
+            ...(relationOption.projection ?? {}),
+          },
+        });
+      }
+
+      pipeline.push({
+        $lookup: {
+          from: relationName.toLowerCase(),
+          as: `_${relationName}`,
+          let: { localValue: `$${relationOption.localField}` },
+          pipeline: subPipeline,
+        },
+      });
+    });
+
+    // Root sort
+    if (option.root?.sort) {
+      pipeline.push({
+        $sort: option.root.sort,
+      });
+    }
+
+    // Root Projection
+    if (option.root.projection) {
+      pipeline.push({
+        $project: {
+          ...(option.root?.projection ?? {}),
+        },
+      });
+    }
 
     return await this.aggregate(appUser, pipeline);
   }

package/templates/nuxt/middleware/30.acl.global.ts._eta

@@ -2,17 +2,24 @@ import { RouteLocationNormalizedGeneric } from 'vue-router';
 import { getUserProfile } from './../composables/getUserStore.generate';
 
 export default defineNuxtRouteMiddleware(async (to, from) => {
-  console.log(to.path)
-  const userProfile = getUserProfile()
+  // console.log("to",to.path)
+  const uauth = useAuthState()  
+
+  if(isPublicPath(to.path)) return true
+  if(!uauth.data.value) return navigateTo('/login')  
+
+  let userProfile = getUserProfile()
   const xorg = <string>to.params['xorg'] ?? 'MC0wLTA'
   useNuxtApp().$userstore.xOrg=xorg
   if(!userProfile?._id){
     // console.error("middleware detect no user id, reload under xorg",xorg)    
     await reloadUserStoreFromMiddleware(xorg)
+    userProfile = getUserProfile() 
     // console.log("after reload",userProfile)
-  }else if(userProfile.branchId===0 && xorg !='MC0wLTA'){
+  }else if(userProfile?.branchId===0 && xorg !='MC0wLTA'){
     // console.error("middleware detect wrong xorg reload profile for",xorg)
     await reloadUserStoreFromMiddleware(xorg)
+    userProfile = getUserProfile()
     // console.log("after reload",userProfile)
   }else{
     // console.log("use exists, use back the user store")
@@ -21,9 +28,9 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
   
 
   const currentgroup = useCookie('currentGroup').value
-  if(currentgroup && userProfile.groups.includes(currentgroup)){
+  if(currentgroup && userProfile?.groups?.includes(currentgroup)){
     //use back ground
-  }else if(userProfile.groups.length>0){
+  }else if(userProfile?.groups?.length>0){
     goTo('pickgroup')
   }
     // if (!currentgroup)goTo('pickgroup')
@@ -43,7 +50,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
   }
 
   const license = useLicense().getLicense()
-  console.log("metas check",metas)
+  // console.log("metas check",metas)
   if(metas.length == 0){
     throw createError({
         statusCode: 404,
@@ -83,7 +90,8 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
   if(to.meta['requiredGroups']){
     
     const requiredGroups:string[] = to.meta['requiredGroups']
-    const userGroups = userProfile.groups
+    const userGroups = userProfile?.groups || []
+    const userRoles = userProfile?.roles || []
     let allowAccess = false
     if(['','/'].includes(to.path)) allowAccess= true
 
@@ -92,7 +100,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
       if(userGroups.includes(g)){
         allowAccess = true
       }
-      if(userProfile.roles.includes(g)){
+      if(userRoles.includes(g)){
         allowAccess = true
       }
       
@@ -106,7 +114,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
       }); 
     }
   }
-  console.log("middleware check isexpired",useLicense().isExpired())
+  // console.log("middleware check isexpired",useLicense().isExpired())
   if(!useLicense().isExpired()) {
     return true
   }else if(allowAccessExpired(to)){
@@ -125,15 +133,22 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
   const allowAccessExpired = (to:RouteLocationNormalizedGeneric)=>{
     const userProfile = getUserProfile()
     let allowPass = false
-    const isSuperAdmin = userProfile.groups.includes('superadmin')    
+    const isSuperAdmin = userProfile?.groups?.includes('superadmin') ?? false
     if(isSuperAdmin){
       allowPass=true
     }
     const allowedPath = ['/billing','/pickgroup']
     for(const p of allowedPath){
-      console.log("to.path.includes",to.path,p)
+      // console.log("to.path.includes",to.path,p)
       if(to.path.includes(p))allowPass = true
     }
 
     return allowPass
+  }
+
+  const isPublicPath=(path:string)=>{
+    if(path.includes('/login')) return true
+    if(path.includes('/relogin')) return true
+    if(path.includes('/logout')) return true
+    return false
   }