@simitgroup/simpleapp-generator 2.0.0-g-alpha → 2.0.0-h-alpha

package/ReleaseNote.md

@@ -1,3 +1,6 @@
+[2.0.0h-alpha]
+1. add software license config folder
+
 [2.0.0g-alpha]
 1. fix create many no await cause transaction error
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.0g-alpha",
+  "version": "2.0.0h-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

@@ -5,7 +5,7 @@ import { PolicyService } from 'src/simple-app/.core/features/policy/policy.servi
 import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
 import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
 import { MiniApp } from '../dto';
-import * as plans from 'src/simple-app/features/subscription/license/plans'
+import * as licenseTypes from 'src/simple-app/config/license-types';
 @Injectable()
 export class MiniAppManagerPolicyService {
   readonly _RELEASED_STATUSES = [MiniAppStatusEnum.PUBLISHED];
@@ -29,15 +29,14 @@ export class MiniAppManagerPolicyService {
   }
 
   hasRequiredPlan(appUser: UserContext, miniApp: MiniApp) {
-    const currentPlan = appUser.tenantInfo.package;
+    const currentLicense = appUser.tenantInfo?.license ?? 'free';
     // const requiredPlans = miniApp.access.requiredPlans ?? [];
-    
-    if(plans[currentPlan]){
-      const plansetting = plans[currentPlan]()
-      return plansetting?.features?.advance?.features?.miniApp ?? false
 
-    }else{
-      return false
+    if (licenseTypes[currentLicense]) {
+      const licenseSetting = licenseTypes[currentLicense]();
+      return licenseSetting?.features?.advance?.features?.miniApp ?? false;
+    } else {
+      return false;
     }
     // if (_.isEmpty(requiredPlans)) return true;
 

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

@@ -9,7 +9,7 @@ import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-
 import _ from 'lodash';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import { MiniAppError } from './mini-app-manager.error';
-import * as plans from 'src/simple-app/features/subscription/license/plans'
+
 @Injectable()
 export class MiniAppManagerService {
   constructor(
@@ -82,7 +82,7 @@ export class MiniAppManagerService {
     });
 
     const permissions = this.getMiniAppActionAccess(appUser);
-    
+
     const installedMiniApps = miniAppInstallations.map((installation) => {
       const miniApp = miniApps.find((miniApp) => miniApp._id === installation.miniApp._id);
       if (!miniApp) {
@@ -175,10 +175,7 @@ export class MiniAppManagerService {
     };
   }
 
-  private getMiniAppActionAccess(appUser: UserContext) {
-    const currentPlan = appUser.tenantInfo.package; 
-    const planSetting =  plans[currentPlan]()
-
+  private getMiniAppActionAccess(appUser: UserContext) {    
     return {
       hasMiniAppFeature: this.policyService.hasFeature(appUser),
       canInstall: this.policyService.canInstall(appUser),

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
 import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import * as plans from 'src/simple-app/features/subscription/license/plans'
+import * as licenseTypes from 'src/simple-app/config/license-types';
 @Injectable()
 export class PolicyService {
   private readonly _HIGH_PRIVILEGE_ROLES = [Role.SuperAdmin, Role.SuperUser, Role.TenantOwner];
@@ -27,12 +27,12 @@ export class PolicyService {
    * - plans/pro.ts
    * - plans/enterprise.ts
    */
-  hasFeature(appUser: UserContext, feature: keyof typeof this._FEATURES): boolean {    
-    const appPackage = appUser.tenantInfo.package;
-    const allowedPlans = this._FEATURES[feature];
-    const planSetting = plans[appPackage]();
-    const allowed = planSetting.features?.advance?.features[feature]  ?? false;
-    return allowed
+  hasFeature(appUser: UserContext, feature: keyof typeof this._FEATURES): boolean {
+    const appLicense = appUser.tenantInfo?.license ?? 'free';
+    // const allowedPlans = this._FEATURES[feature];
+    const licenseSetting = licenseTypes[appLicense]();
+    const allowed = licenseSetting.features?.advance?.features[feature] ?? false;
+    return allowed;
   }
 
   can(appUser: UserContext, role: Role) {

package/templates/nest/src/simple-app/config/license-types/index.ts._eta

@@ -0,0 +1 @@
+export const license1 = {id:"app"}