@simitgroup/simpleapp-generator 2.0.0-k-alpha → 2.0.0-m-alpha

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

@@ -30,9 +30,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       currency: ref(""),
       country: ref(""),
       offsetMinute: ref(0),
-      tenantInfo: ref<Tenant>(),
-      orgInfo: ref<Organization>(),
-      branchInfo: ref<Branch>(),
+      tenantInfo: ref<Tenant>({} as Tenant),
+      orgInfo: ref<Organization>({} as Organization),
+      branchInfo: ref<Branch>({} as Branch),
       uid: ref(""),
       email: ref(""),
       fullName: ref(""),
@@ -71,39 +71,44 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         }
         return await new PROFILEApi(undefined, apiurl, $axios)
           .getProfile()
-          .then((res: AxiosResponse) => {            
-            if (!res) {
+          .then((tmp: AxiosResponse) => {            
+            if (!tmp) {
               return;
             }
-            this._id = res.data._id;
-            this.uName = res.data.uName;
-            this.sessionId = res.data.sessionId;
-            this.tenantId = res.data.tenantId;
-            this.orgId = res.data.orgId;
-            this.orgRecordId = res.data.orgRecordId;
-            this.branchId = res.data.branchId;
-            this.branchRecordId = res.data.branchRecordId;
-            this.branchCode = res.data.branchCode;
-            this.branchName = res.data.branchName;
-            this.orgCode = res.data.orgCode;
-            this.orgName = res.data.orgName;
-            this.timeZone = res.data.timeZone;
-            this.currency = res.data.currency;
-            this.country = res.data.country;
-            this.offsetMinute = res.data.offsetMinute;
-            this.uid = res.data.uid;
-            this.email = res.data.email;
-            this.fullName = res.data.fullName;
-            this.branches = res.data.branches;
-            this.groups = res.data.groups;
-            this.roles = res.data.roles;
-            this.time = res.data.time;
-            this.xOrg = res.data.xOrg;
-            this.invites = res.data.invites;
-            this.moreProps = res.data.moreProps;
-            // this.package = res.data.moreProps.package;
-            // this.appintegration.einvoice = res.data.appintegration.einvoice;
-            // this.appintegration.simbiz6 = res.data.appintegration.simbiz6;
+            const res = tmp.data
+            
+            this._id = res._id;
+            this.uName = res.uName;
+            this.sessionId = res.sessionId;
+            this.tenantId = res.tenantId;
+            this.orgId = res.orgId;
+            this.orgRecordId = res.orgRecordId;
+            this.branchId = res.branchId;
+            this.branchRecordId = res.branchRecordId;
+            this.branchCode = res.branchCode;
+            this.branchName = res.branchName;
+            this.orgCode = res.orgCode;
+            this.orgName = res.orgName;
+            this.timeZone = res.timeZone;
+            this.currency = res.currency;
+            this.country = res.country;
+            this.offsetMinute = res.offsetMinute;
+            this.tenantInfo = res?.tenantInfo;
+            this.orgInfo = res?.orgInfo;
+            this.branchInfo = res?.branchInfo;
+            this.uid = res.uid;
+            this.email = res.email;
+            this.fullName = res.fullName;
+            this.branches = res.branches;
+            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;
+            // this.appintegration.einvoice = res.appintegration.einvoice;
+            // this.appintegration.simbiz6 = res.appintegration.simbiz6;
             let cachegroup = useCookie("currentGroup").value ?? "";
             if (!this.groups || !this.groups.includes(cachegroup)) {
               cachegroup = "";
@@ -267,7 +272,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         navigateTo(tourl, { external: true });
       },
       getUserInfo() {
-        const userinfo: UserProfile = {
+        const userinfo: UserContextInfo & {currentGroup:string} = {
           _id: this._id,
           sessionId: this.sessionId,
           tenantId: this.tenantId,
@@ -286,6 +291,10 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           timeZone: this.timeZone,
           country: this.country,
           offsetMinute: this.offsetMinute,
+          tenantInfo: this.tenantInfo,
+          orgInfo: this.orgInfo,
+          branchInfo:this.branchInfo,
+
           fullName: this.fullName,
           branches: this.branches ?? [],
           invites: this.invites ?? [],

package/templates/nuxt/server/api/profile/[...].ts.eta

@@ -62,7 +62,7 @@ export default defineEventHandler(async (event:any) => {
         }
 
         if(documentLink=='avatar' ){
-            axiosConfig.url = pathJoin([useRuntimeConfig().public.avatarUrl, documentLink]);
+            axiosConfig.url = pathJoin([useRuntimeConfig().public.imageUrl, documentLink]);
             delete axiosConfig.params
         }
         // console.log("axiosConfig",axiosConfig)

package/templates/nuxt/simpleapp/generate/commons/generator-version.ts.eta

@@ -0,0 +1 @@
+export generatorVersion='<%=it.version%>'

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

@@ -20,6 +20,6 @@ defineProps<{
 }>();
 
 function handleUpgradePlan() {
-  window.open("https://simitgroup.com/simtraineco/#simtrain-price", "_blank");
+  window.open("https://simtrainsystem.com/#pricing", "_blank");
 }
 </script>

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

@@ -26,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { MiniappStatusEnum } from "~/enums/enums.generate";
+import { MiniappStatusEnum } from "~/enums";
 import { MiniAppDetail } from "~/simpleapp/generate/openapi";
 import MiniAppIntegrationItemBadge from "./MiniAppIntegrationItemBadge.vue";
 import MiniAppIcon from "../MiniAppIcon.vue";

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

@@ -32,7 +32,7 @@
 </template>
 
 <script setup lang="ts">
-import { MiniappEnvEnum } from "~/enums/enums.generate";
+import { MiniappEnvEnum } from "~/enums";
 import { Miniapp, MiniAppDetail } from "~/simpleapp/generate/openapi";
 
 const props = defineProps<{

package/templates/nuxt/simpleapp/generate/features/miniApp/bridge/services/bridge.service.ts.eta

@@ -22,7 +22,12 @@ export class MiniAppBridgeService extends MiniAppBridgeResourceAccessor {
   /**************************************** Bridge Handler ***************************************/
 
   handleBridgeNavigate(message: MiniAppBridgeMessageNavigate) {
-    goTo(message.params.target, message.params.id, message.params.query);
+    goTo(
+      message.params.target,
+      message.params.id,
+      message.params.query,
+      message.params.options,
+    );
   }
 
   handleBridgeNavigateCurrentMiniApp(
@@ -40,7 +45,7 @@ export class MiniAppBridgeService extends MiniAppBridgeResourceAccessor {
       targetUrl = `${targetUrl}/${message.params.target}`;
     }
 
-    goTo(targetUrl, undefined, message.params.query);
+    goTo(targetUrl, undefined, message.params.query, message.params.options);
   }
 
   handleBridgeOpenOnScreenResourceForm(

package/templates/nuxt/simpleapp/generate/features/miniApp/bridge/types/bridge.type.ts.eta

@@ -27,6 +27,7 @@ export type MiniAppBridgeMessageNavigate = {
     target: string;
     id?: string;
     query?: string;
+    options?: Parameters<typeof navigateTo>[1];
   };
 };
 
@@ -35,6 +36,7 @@ export type MiniAppBridgeMessageNavigateCurrentMiniApp = {
   params: {
     target: string;
     query?: string;
+    options?: Parameters<typeof navigateTo>[1];
   };
 };
 

package/templates/nest/src/simple-app/_core/utils/encryption.static.ts.eta

@@ -1,73 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-31
- * Author: Ks Tan
- *
- * this class developed for implement field level encryption, however it still half way and keep here for future enhancement
- * it doesn't effect anything at the moment
- */
-
-import { Injectable } from '@nestjs/common';
-import {
-  createCipheriv,
-  createDecipheriv,
-  randomBytes,
-  scrypt,
-  Cipher,
-  Decipher,
-} from 'crypto';
-import { promisify } from 'util';
-
-export class Encryption {
-  private static instance: Encryption;
-  private algorithm = 'aes-256-ctr';
-  private iv = randomBytes(16);
-  private password = String(process.env.ENRYPTION_KEY);
-
-  private key: Buffer;
-
-  constructor() {
-    this.init();
-  }
-  public static getInstance(): Encryption {
-    if (!Encryption.instance) {
-      Encryption.instance = new Encryption();
-    }
-
-    return Encryption.instance;
-  }
-
-  async init() {
-    // console.log('Initialized encryption class');
-  }
-
-  getKey = async (salt) => {
-    const key = (await promisify(scrypt)(this.password, salt, 32)) as Buffer;
-    return key;
-  };
-
-  encrypt = async (value: string) => {
-    const salt = 'salt';
-    const key = await this.getKey(salt);
-    const cipher = createCipheriv(this.algorithm, key, this.iv);
-    // console.log('Encrypting text ', value, cipher);
-    const encryptedText = Buffer.concat([
-      cipher.update(value),
-      cipher.final(),
-    ]).toString('hex');
-    // console.log('encryptedText', encryptedText);
-    return encryptedText;
-  };
-
-  decrypt = async (value: string, salt: string) => {
-    const key = await this.getKey(salt);
-    const decipher = createDecipheriv('aes-256-ctr', key, this.iv);
-    const buf = Buffer.from(value);
-    const decryptedText = Buffer.concat([
-      decipher.update(buf),
-      decipher.final(),
-    ]).toString('hex');
-    return decryptedText;
-  };
-}