@simitgroup/simpleapp-generator 2.0.0-y-alpha → 2.0.1-b-alpha

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

@@ -1316,63 +1316,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}`);
+    //   }
+
+    //   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 ?? {}),
-        },
-      });
-    }
+    // // Root Projection
+    // if (option.root.projection) {
+    //   pipeline.push({
+    //     $project: {
+    //       ...(option.root?.projection ?? {}),
+    //     },
+    //   });
+    // }
 
     return await this.aggregate(appUser, pipeline);
   }

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

@@ -66,7 +66,7 @@ export class SimpleAppMiddleware implements NestMiddleware {
     tokenStr = tokenStr.replace('Bearer ', '');
     const xOrg = req.get('x-org') ?? this.defaultXOrg;
 
-    const user = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel);
+    const user = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel,envs[0]);
 
     if (req.baseUrl == '/graphql') {
       if (tokenStr) {

package/templates/nuxt/composables/getMenus.generate.ts.eta

@@ -67,4 +67,90 @@ export const getMenustFromPageMeta =() =>{
               
   return allmenus.sort((one:string, two:string) => (one > two ? -1 : 1))
   
+}
+export const hasAccessByPageMeta = (pageName: string): boolean => {
+  const userGroups = getUserStore().groups || []
+  const userRoles = getUserStore().roles || []
+  
+  if (
+    userRoles.includes('superadmin') ||
+    userRoles.includes('tenantowner') ||
+    userRoles.includes('superuser')
+  ) {
+    return true
+  }
+  
+  const routes = useRouter().getRoutes()
+  const route = routes.find((r) => {
+    const menuPath = r.meta?.menuPath as string | undefined
+    return menuPath && menuPath.endsWith(`/${pageName}`)
+  })
+  
+  if (!route || !route.meta) {
+    return false
+  }
+  
+  const requiredGroups = route.meta.requiredGroups as string[] | undefined
+  
+  if (!requiredGroups || requiredGroups.length === 0) {
+    return false
+  }
+  
+  return requiredGroups.some((group) => userGroups.includes(group))
+}
+
+export const getMenusWithPageMetaAccess = (xorg: string): MenuData[] => {
+  const routes = useRouter().getRoutes()
+  const allowedMenus: MenuData[] = []
+  const { getDescription, getIcon, getIconColor } = useSettingsMenu()
+  
+  const menuRoutes = routes.filter((route) => route.meta && route.meta.menuPath)
+  
+  for (const route of menuRoutes) {
+    const menuPath = route.meta.menuPath as string
+    const requiredGroups = route.meta.requiredGroups as string[] | undefined
+    
+    const pathParts = menuPath.split('/')
+    const pageName = pathParts[pathParts.length - 1]
+    
+    if (hasAccessByPageMeta(pageName)) {
+      const icon = getIcon(pageName)
+      const iconClass = getIconColor(pageName)
+      
+      const menuItem: MenuData = {
+        label: t(pageName),
+        url: `/${xorg}/${pageName}`,
+        isolationType: 'none',
+        icon: typeof icon === 'string' ? icon : '',
+      }
+      
+      allowedMenus.push(menuItem)
+    }
+  }
+  
+  return allowedMenus
+}
+
+export const getMenuMetadata = (pageName: string) => {
+  const routes = useRouter().getRoutes()
+  const route = routes.find((r) => {
+    const menuPath = r.meta?.menuPath as string | undefined
+    return menuPath && menuPath.endsWith(`/${pageName}`)
+  })
+  
+  if (route?.meta) {
+    return {
+      description: route.meta.description ? t(route.meta.description as string) : t(pageName),
+      icon: route.meta.icon || '',
+      colorClass: route.meta.colorClass || '',
+    }
+  }
+  
+  const { getDescription, getIcon, getIconColor } = useSettingsMenu()
+  
+  return {
+    description: t(getDescription(pageName)),
+    icon: getIcon(pageName),
+    colorClass: getIconColor(pageName),
+  }
 }

package/templates/nuxt/composables/getUserStore.generate.ts.eta

@@ -12,6 +12,10 @@ export const getUserStore = () => {
   const { $userstore } = useNuxtApp();
   return $userstore;
 };
+export const reloadUserStoreFromMiddleware = async (xorg:string) => {
+  const { $userstore } = useNuxtApp();
+  await $userstore.loadRemoteUserFromXorg(xorg)
+};
 export const reloadUserStore = async () => {
   const { $userstore } = useNuxtApp();
   await $userstore.loadRemoteUserInfo();
@@ -25,17 +29,15 @@ export const isGuideComplete = (guidename: string): boolean => {
   } else return false;
 };
 export const setGuideComplete = async (guidename: string) => {
-  const userstore = useNuxtApp().$userstore;
-  await getProfileApi().runTourComplete(guidename);
-  if (getUserProfile() !== undefined) {
-    if (!Array.isArray(getUserProfile()?.moreProps.completedTours))
-      userstore.moreProps.completedTours = [guidename];
-    else userstore.moreProps.completedTours.push(guidename);
-  }
-};
-export const getCurrentXorg = () => {
-  return useRoute().params.xorg ? String(useRoute().params.xorg) : undefined;
+  // const userstore = useNuxtApp().$userstore;
+  // await getProfileApi().runTourComplete(guidename);
+  // if (getUserProfile() !== undefined) {
+  //   if (!Array.isArray(getUserProfile()?.moreProps.completedTours))
+  //     userstore.moreProps.completedTours = [guidename];
+  //   else userstore.moreProps.completedTours.push(guidename);
+  // }
 };
+export const getCurrentXorg = () => getUserStore().xOrg ?? ''
 export const getPageBaseUrl = (resourcename: string) => {
   return `/${getCurrentXorg()}/${resourcename}`;
 };
@@ -60,19 +62,13 @@ export const getProfileEmail = () => getUserProfile()?.email;
 export const getProfileUid = () => getUserProfile()?.uid;
 export const getProfileFullName = () => getUserProfile()?.fullName;
 
-export const refreshOrgLogo = async () => {
-  const logodata = await useNuxtApp().$OrganizationDoc().getApi().runGetlogo();
-  orgLogo = logodata.data;
-};
-export const getOrgLogo = () => orgLogo;
-export const setOrgLogo = (str: string) => (orgLogo = str);
-export const getCurrentBranch = () => {
-  const branchId = getUserStore().branchId;
-  const branchinfo = getUserStore().branches.find(
-    (item) => item.branch.branchId == branchId,
-  );
-  return branchinfo;
-};
+// export const refreshOrgLogo = async () => {
+//   const logodata = await useNuxtApp().$OrganizationDoc().getApi().runGetlogo();
+//   orgLogo = logodata.data;
+// };
+// export const getOrgLogo = () => orgLogo;
+// export const setOrgLogo = (str: string) => (orgLogo = str);
+export const getCurrentBranch = () => getUserProfile().branchInfo;
 
 export const getMySimpleAppUserPicker = () => {
   return {

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

@@ -0,0 +1,139 @@
+import { RouteLocationNormalizedGeneric } from 'vue-router';
+import { getUserProfile } from './../composables/getUserStore.generate';
+
+export default defineNuxtRouteMiddleware(async (to, from) => {
+  console.log(to.path)
+  const 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)
+    // console.log("after reload",userProfile)
+  }else if(userProfile.branchId===0 && xorg !='MC0wLTA'){
+    // console.error("middleware detect wrong xorg reload profile for",xorg)
+    await reloadUserStoreFromMiddleware(xorg)
+    // console.log("after reload",userProfile)
+  }else{
+    // console.log("use exists, use back the user store")
+  }
+  
+  
+
+  const currentgroup = useCookie('currentGroup').value
+  if(currentgroup && userProfile.groups.includes(currentgroup)){
+    //use back ground
+  }else if(userProfile.groups.length>0){
+    goTo('pickgroup')
+  }
+    // if (!currentgroup)goTo('pickgroup')
+
+  // console.log("userProfile1",userProfile)
+  // console.log(xorg)
+
+  const { status } = useAuth();   
+  const metas = Object.keys(to.meta)
+
+  if(status.value=='unauthenticated'){
+    if(to.meta.auth===false){
+      return true
+    }else{
+        navigateTo('/login')
+    }    
+  }
+
+  const license = useLicense().getLicense()
+  console.log("metas check",metas)
+  if(metas.length == 0){
+    throw createError({
+        statusCode: 404,
+        statusMessage: 'pageDoesNotExists',
+        message: 'pageDoesNotExistsMsg',
+        fatal: true,
+      });    
+  }
+  if(to.meta['licenseWeight'] === undefined){
+    throw createError({
+        statusCode: 403,
+        statusMessage: 'undefinePageMetaLicenseWeight',
+        message: 'undefinePageMetaLicenseWeightMsg',
+        fatal: true,
+      });    
+  }
+  
+  if(to.meta['requiredGroups']===undefined || !Array.isArray(to.meta['requiredGroups'])){
+    throw createError({
+        statusCode: 403,
+        statusMessage: 'undefinePageMetaRequiredGroups',
+        message: 'undefinePageMetaRequiredGroupsMsg',
+        fatal: true,
+      });    
+  }
+
+  if(to.meta['licenseWeight'] && <number>to.meta['licenseWeight']> license.licenseWeight){
+    throw createError({
+        statusCode: 403,
+        statusMessage: 'upgradeSoftwareLicenseRequired',
+        message: 'upgradeSoftwareLicenseRequiredMsg',
+        fatal: true,
+      });    
+  }
+
+  
+  if(to.meta['requiredGroups']){
+    
+    const requiredGroups:string[] = to.meta['requiredGroups']
+    const userGroups = userProfile.groups
+    let allowAccess = false
+    if(['','/'].includes(to.path)) allowAccess= true
+
+    for(const g of requiredGroups){
+      
+      if(userGroups.includes(g)){
+        allowAccess = true
+      }
+      if(userProfile.roles.includes(g)){
+        allowAccess = true
+      }
+      
+    }
+    if(!allowAccess){
+      throw createError({
+            statusCode: 403,
+            statusMessage: 'insufficientPriviledge',
+            message: 'insufficientPriviledgeMsg',
+            fatal: true,
+      }); 
+    }
+  }
+  console.log("middleware check isexpired",useLicense().isExpired())
+  if(!useLicense().isExpired()) {
+    return true
+  }else if(allowAccessExpired(to)){
+    return true
+  }else{
+    throw createError({
+            statusCode: 402,
+            statusMessage: 'systemExpired',
+            message:'systemExpiredMsg',                        
+            fatal: true,
+        }); 
+    }
+  })
+
+
+  const allowAccessExpired = (to:RouteLocationNormalizedGeneric)=>{
+    const userProfile = getUserProfile()
+    let allowPass = false
+    const isSuperAdmin = userProfile.groups.includes('superadmin')    
+    if(isSuperAdmin){
+      allowPass=true
+    }
+    const allowedPath = ['/billing','/pickgroup']
+    for(const p of allowedPath){
+      console.log("to.path.includes",to.path,p)
+      if(to.path.includes(p))allowPass = true
+    }
+
+    return allowPass
+  }

package/templates/nuxt/pages/[xorg]/profile.vue.eta

@@ -10,6 +10,9 @@
  */
 import profile from "../profile.vue";
 definePageMeta({
-//  menuPath:'setting/profile'
-})
+   menuPath:'setting/profile',
+  licenseWeight: 0,
+  requiredGroups: ["everyone",]
+
+});
 </script>

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

@@ -53,12 +53,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     }),
 
     actions: {
-      async loadRemoteUserInfo() {
-        // console.log('loadRemoteUserInfo')
-
+      async loadRemoteUserFromXorg(xorg:string) {
         const { $axios, $miniAppStore, $customFieldStore } = useNuxtApp();
-        const route = useRoute();
-        let xorg = this.getCurrentXorg();
+        
         let apiurl = "";
         if (!xorg) {
           apiurl = `${useRuntimeConfig().public.appUrl}/api`;
@@ -76,7 +73,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
               return;
             }
             const res = tmp.data
-            
+            this.xOrg= xorg
             this._id = res._id;
             this.uName = res.uName;
             this.sessionId = res.sessionId;
@@ -103,7 +100,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
             this.groups = res.groups;
             this.roles = res.roles;
             this.time = res.time;
-            this.xOrg = res.xOrg;
+            
             this.invites = res.invites;
             this.moreProps = res.moreProps;
             // this.package = res.moreProps.package;
@@ -122,15 +119,14 @@ export default defineNuxtPlugin(async (nuxtApp) => {
             return Promise.reject(err);
           });
       },
+      async loadRemoteUserInfo() {
+        const route = useRoute();
+        let xorg = this.getCurrentXorg();
+        await this.loadRemoteUserFromXorg(xorg)
+        
+      },
       getCurrentXorg() {
-        const xorg = useRoute().params.xorg
-        let result = ''
-        if(typeof xorg == 'string'){
-          result = xorg
-        }else{
-          result =''
-        }
-        return result
+        return this.xOrg
       },
       async pingSession(): Promise<string> {
         let xorg = this.getCurrentXorg();
@@ -184,59 +180,57 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           this.roles.includes(permission),
         );
       },
-      canPerform(resourcename: string, action: string): boolean {        
+      canPerform(resourcename: string, action: string): boolean {
+        const normalizedResource = resourcename.toLowerCase();
+        
         if (
           this.roles.includes("superadmin") ||
           this.roles.includes("tenantowner") ||
           this.roles.includes("superuser")
         ) {
           return true;
-        } else if (resourcename == "Paymentverify") {
-          if (this.roles.includes("admin") || this.roles.includes("manager")) {
-            return true;
-          }
-        } else if (resourcename == "Reminder") {
-          if (this.roles.includes("admin") || this.roles.includes("manager")) {
-            return true;
-          }
-        } else if (resourcename == "Generateinvoice") {
-          if (
-            this.roles.includes("admin") ||
-            this.roles.includes("manager") ||
-            this.roles.includes("executive")
-          ) {
-            return true;
-          }
-        } else if (resourcename == "Upgradelevel") {
-          if (
-            this.roles.includes("admin") ||
-            this.roles.includes("manager") ||
-            this.roles.includes("executive")
-          ) {
-            return true;
-          }
-        } else if (resourcename == "Appintegration") {
-          if (this.roles.includes("admin") || this.roles.includes("manager")) {
-            return true;
-          }
-        } else if (resourcename == "Postingtosimbiz") {
-          if (this.roles.includes("admin")) {
+        }
+        
+        const specialCases: Record<string, string[]> = {
+          // paymentverify: ["admin", "manager"],
+          // reminder: ["admin", "manager"],
+          // generateinvoice: ["admin", "manager", "executive"],
+          // upgradelevel: ["admin", "manager", "executive"],
+          appintegration: ["admin", "manager"],
+          miniapp: ["admin", "manager"],
+          studentdescription: ["admin", "manager", "executive"],
+          miniappinstallation: ["admin", "manager"],
+        };
+        
+        if (specialCases[normalizedResource]) {
+          const requiredGroups = specialCases[normalizedResource];
+          if (requiredGroups.some((group) => this.roles.includes(group))) {
             return true;
           }
-        } else if (resourcename == "Studentdescription") {
-          if (
-            this.roles.includes("admin") ||
-            this.roles.includes("manager") ||
-            this.roles.includes("executive")
-          ) {
-            return true;
+        }
+        
+        try {
+          const routes = useRouter().getRoutes();
+          const route = routes.find((r) => {
+            const menuPath = r.meta?.menuPath as string | undefined;
+            return menuPath && menuPath.endsWith(`/${normalizedResource}`);
+          });
+          
+          if (route?.meta?.requiredGroups) {
+            const requiredGroups = route.meta.requiredGroups as string[];
+            const userGroups = this.groups || [];
+            
+            if (requiredGroups.some((group) => userGroups.includes(group))) {
+              return true;
+            }
           }
-        } else {
-          const checkstr = `${resourcename}:${action}`;
-          // console.log("verify",checkstr)
-          return this.roles.includes(checkstr);
+        } catch (e) {
+          console.error(e)
         }
-        return false;
+        
+        const checkstr = `${normalizedResource}:${action}`;
+        const checkstrOriginal = `${resourcename}:${action}`;
+        return this.roles.includes(checkstr) || this.roles.includes(checkstrOriginal);
       },
       haveAccess(resourcename: string) {
         //super admin always full access right
@@ -248,11 +242,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           this.roles.includes("superuser")
         ) {
           return true;
-        } else if (resourcename == "Paymentverify") {
-          if (this.roles.includes("admin") || this.roles.includes("manager")) {
-            return true;
-          }
-        }
+        } 
         for (let i = 0; i < this.roles.length; i++) {
           const role: string = this.roles[i];
           if (role.includes(resourcename)) {
@@ -343,7 +333,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           },
         };
       }
-    }
+    } 
     // else
     //
   }

package/templates/nuxt/simpleapp/generate/features/miniApp/app/components/MiniAppPageIframe.vue.eta

@@ -12,6 +12,7 @@
       "
       :title="pageInfo.title || t('miniAppLang.content')"
       sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-presentation allow-modals"
+      allow="clipboard-write"
       referrerpolicy="origin"
       loading="lazy"
       @error="handleError"

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

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