@simitgroup/simpleapp-generator 2.0.0-y-alpha → 2.0.0-z-alpha

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();

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;
-}

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

@@ -1,48 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
- */
-import { getUserProfile } from './../composables/getUserStore.generate';
-import  {MenuData} from '~/types'
-export default defineNuxtRouteMiddleware((to, from) => {      
-  // const userprofile = getUserProfile()
-  //skip auto then simply allow
-  if(!to.meta.auth){
-    return true
-  }else if(to.path=='/relogin'){
-    return true
-  }else if( getPublicResource(String(to.params['xorg'])).filter((item:MenuData)=>to.fullPath === item.url)){        
-    return true
-  }// no permission control needed yet    
-    else if(!to.params['xorg']){
-      
-      return true  //no permission needed
-    }else{
-      
-      const resourcename = to.fullPath.split('/')[2]
-      
-      if(resourcename===undefined){//home page
-        
-        // return true  //no permission needed
-        //if(userprofile.group==''){
-        //  console.error("no access right to current xorg")
-        //  return navigateTo('/')
-        //}else{
-          return true
-        //}
-        
-      }else{        
-        const {$userstore} = useNuxtApp()  
-        if($userstore.haveAccess(resourcename)){                    
-          return true
-        }else{
-       //   congetWorkflowApisole.error("access deny, redirect to '/'")
-          return navigateTo('/')
-          // abortNavigation()
-        }
-      }    
-    }
-  
-  })