@simitgroup/simpleapp-generator 2.0.0-i-alpha → 2.0.0-j-alpha

package/ReleaseNote.md

@@ -1,3 +1,6 @@
+[2.0.0j-alpha]
+1. fix webhook no trigger
+
 [2.0.0i-alpha]
 1. fix some document no print api available
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.0i-alpha",
+  "version": "2.0.0j-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/basic/nest/service.ts.eta

@@ -48,7 +48,7 @@ export class <%= it.typename %>Service extends SimpleAppService<schema.<%= it.ty
   protected foreignkeys = <%~ JSON.stringify(it.foreignkeys)%>;
     constructor(
         @InjectModel('<%= it.typename %>')  mydoc: Model<schema.<%= it.typename %>>,
-        @Inject(forwardRef(() => EventEmitter2)) event2:EventEmitter2,
+        event2:EventEmitter2,
         docNoGen:SimpleAppDocumentNoFormatService,
         logSvc: SimpleAppLogService,
         webhookSvc:RunWebhookService

package/templates/nest/src/simple-app/.core/features/queue/queue-base/queue-base.consumer.ts.eta

@@ -16,7 +16,7 @@ export abstract class BaseQueueConsumer extends WorkerHost {
   protected abstract readonly processor: string;
 
   constructor(
-    @Inject(forwardRef(() => QueueUserContext)) protected readonly queueUserContext: QueueUserContext,
+    protected readonly queueUserContext: QueueUserContext,
     @InjectModel('Queuejob') protected queueJobModel: Model<Queuejob>,
     @InjectConnection() private readonly connection: Connection,
     protected eventEmitter: EventEmitter2,

package/templates/nest/src/simple-app/.core/features/user-context/user.context.ts.eta

@@ -212,12 +212,13 @@ export class UserContext extends UserContextInfo {
 
   setCurrentUserInfo = async (tokenstr: string, xOrg: string, webhookModel: Model<Webhook>) => {
     this.setXOrg(xOrg);
-    // console.log('xOrg',xOrg)
     await this.setUserToken(tokenstr);
     this.setUserType('normal');
-    // const wh = await webhookModel.find({ branchId: this.getBranchId(), active: true });
-
-    // if (Array.isArray(wh) && wh.length > 0) this.webhooks = this.webhooks.concat(wh);
+    // branchId: this.getBranchId(), active: true 
+    const wh = await webhookModel.find({});
+    if (Array.isArray(wh) && wh.length > 0) {
+      this.webhooks = this.webhooks.concat(wh);      
+    }
   };
 
   // setPackage = (packageName: string) => {
@@ -276,10 +277,10 @@ export class UserContext extends UserContextInfo {
           as: 'tenantInfo',
           localField: 'tenantId',
           foreignField: 'tenantId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$tenantInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$tenantInfo', preserveNullAndEmptyArrays: true } },
       {
         $lookup: {
           from: 'permission',
@@ -343,30 +344,30 @@ export class UserContext extends UserContextInfo {
           as: 'tenantInfo',
           localField: 'tenantId',
           foreignField: 'tenantId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$tenantInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$tenantInfo', preserveNullAndEmptyArrays: true } },
       {
         $lookup: {
           from: 'organization',
           as: 'orgInfo',
           localField: 'orgId',
           foreignField: 'orgId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$orgInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$orgInfo', preserveNullAndEmptyArrays: true } },
       {
         $lookup: {
           from: 'branch',
           as: 'branchInfo',
           localField: 'branchId',
           foreignField: 'branchId',
-          pipeline: [{ $project:{ created:0,updated:0,createdBy:0,updatedBy:0,__v:0} }],
+          pipeline: [{ $project: { created: 0, updated: 0, createdBy: 0, updatedBy: 0, __v: 0 } }],
         },
       },
-      {$unwind:{path:'$branchInfo',preserveNullAndEmptyArrays:true}},
+      { $unwind: { path: '$branchInfo', preserveNullAndEmptyArrays: true } },
       {
         $project: {
           uid: 1,
@@ -386,9 +387,9 @@ export class UserContext extends UserContextInfo {
           timeZone: '$b.o.timeZone',
           currency: '$b.o.currency',
           country: '$b.o.country',
-          tenantInfo:1,
-          orgInfo:1,
-          branchInfo:1,
+          tenantInfo: 1,
+          orgInfo: 1,
+          branchInfo: 1,
         },
       },
 
@@ -461,22 +462,21 @@ export class UserContext extends UserContextInfo {
                 as: 'tenant',
               },
             },
-            {$unwind:'$tenant'},
+            { $unwind: '$tenant' },
             {
-              $project:{
-                _id:1,
-                created:1,
+              $project: {
+                _id: 1,
+                created: 1,
                 tenantId: 1,
-                tenantName:'$tenant.tenantName'
-              }
-            }
+                tenantName: '$tenant.tenantName',
+              },
+            },
           ],
         },
-      }
+      },
     ];
 
     const userProfiles: UserContextInfo[] = await this.userModel.aggregate(pipelines).exec();
-    // console.log("userProfiles",userProfiles)
     return userProfiles[0];
   }
 
@@ -492,8 +492,7 @@ export class UserContext extends UserContextInfo {
     this.ssoACL = <Record<string, { roles: string[] }>>tokeninfo?.resource_access ?? {};
     this.logger.debug(`User found ${this.uid}`);
 
-    const userProfile = await this.obtainProfileFromDB();
-    // console.log('userProfile', JSON.stringify(userProfile,null,2));
+    const userProfile = await this.obtainProfileFromDB();    
     if (userProfile) {
       this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
 
@@ -535,8 +534,7 @@ export class UserContext extends UserContextInfo {
 
     if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
       this.roles.push(Role.SuperAdmin);
-    }
-    // console.log('this.roles',this.roles)
+    }    
     // this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
   };
 
@@ -924,7 +922,7 @@ export class UserContext extends UserContextInfo {
       //   }
     }
 
-    // console.log(JSON.stringify(results,null,2))
+    
     return results;
   }
 
@@ -1007,7 +1005,7 @@ export class UserContext extends UserContextInfo {
       tenantId: this.tenantId,
       orgId: this.orgId,
       branchId: this.branchId,
-    });    
+    });
     return miniAppInstallation.miniApp;
   }
 

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

@@ -1,5 +1,8 @@
 import { BadRequestException, Injectable, Inject, InternalServerErrorException, Logger, NotFoundException } from '@nestjs/common';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+import { Model } from 'mongoose';
+import { InjectModel } from '@nestjs/mongoose';
+
 import { UserContext } from '../user-context/user.context';
 import { Webhook, WebhookLog } from './schemas';
 import { alldocuments } from '../document-no-format/document.dict';
@@ -8,38 +11,40 @@ import { alldocuments } from '../document-no-format/document.dict';
 export class RunWebhookService {
   @Inject(EventEmitter2)
   protected eventEmitter: EventEmitter2;
-  protected systemWebhooks : Webhook[] = []
+  protected systemWebhooks: Webhook[] = [];
   protected logger = new Logger();
   protected maxRetries = 5;
-  public constructor() {}
-  public addWebhook = (wh:Webhook)=> this.systemWebhooks.push(wh)
+  public constructor(
+    @InjectModel('WebhookLog') private webHookLogModel: Model<WebhookLog>
+    ) {}
+  public addWebhook = (wh: Webhook) => this.systemWebhooks.push(wh);
 
   /**
    * trigger
    */
-  async run(appuser: UserContext, documentName: string, actionName: string, data: any) {
-    if (process.env.WEBHOOK_ONOFF && process.env.WEBHOOK_ONOFF.toLowerCase() == 'on') {
-      return await this.runRealtimeWebhook(appuser, documentName, actionName, data);
-    }
-    else {
+  async run(appUser: UserContext, documentName: string, actionName: string, data: any) {
+    if (process.env.WEBHOOK_ONOFF && process.env.WEBHOOK_ONOFF.toLowerCase() == 'on') {      
+      return await this.runRealtimeWebhook(appUser, documentName, actionName, data);
+    } else {
       this.logger.warn(`Webhook off, not run for ${documentName}:${actionName}`);
     }
   }
 
-  async runRealtimeWebhook(appuser: UserContext, documentName: string, actionName: string, data: any) {
+  async runRealtimeWebhook(appUser: UserContext, documentName: string, actionName: string, data: any) {
     this.logger.debug(`Run webhook ${documentName}, ${actionName}`);
-
-    const userWebhooks = appuser.getWebHooks().filter((wh) => wh.resourceName == documentName && wh.eventType == actionName && wh.active);
-    const systemWebhooks = this.systemWebhooks.filter((wh) => wh.resourceName == documentName && wh.eventType == actionName && wh.active);    
-    const webhooks = []
-    webhooks.concat(userWebhooks).concat(systemWebhooks)    
-
+    
+    const userWebhooks = appUser.getWebHooks().filter((wh) => wh.resourceName === documentName && wh.eventType === actionName && wh.active);
+    const systemWebhooks = this.systemWebhooks.filter((wh) => wh.resourceName === documentName && wh.eventType === actionName && wh.active);
+    let webhooks = [];
+    webhooks = webhooks.concat(userWebhooks)
+    webhooks = webhooks.concat(systemWebhooks);
+    console.log("implement webhooks",webhooks)
     const systemVars = {
-      $xOrg: appuser.getXOrg(),
-      $accessToken: appuser.getUserToken(),
-      $fullName: appuser.getFullname(),
-      $email: appuser.getEmail(),
-      $uid: appuser.getUid(),
+      $xOrg: appUser.getXOrg(),
+      $accessToken: appUser.getUserToken(),
+      $fullName: appUser.getFullname(),
+      $email: appUser.getEmail(),
+      $uid: appUser.getUid(),
       $resourceName: documentName,
       $actionName: actionName,
       $url: process.env.APP_URL ?? 'http://localhost:8080',
@@ -90,7 +95,7 @@ export class RunWebhookService {
       // console.log("options",options)
 
       if (['POST', 'PUT', 'PATCH'].includes(options.method)) {
-        options.body = this.prepareBody(appuser, webhook, data, systemVars);
+        options.body = this.prepareBody(appUser, webhook, data, systemVars);
       }
 
       while (tries > 0) {
@@ -107,16 +112,16 @@ export class RunWebhookService {
           msg = `Try: ${tryno}/${maxtries} ${documentName}:${actionName}, ${reqMethod} ${webhookUrl}, ${statusCode},${req.statusText}`;
           if (statusCode >= 200 && statusCode <= 300) {
             //success, continue next webhook
-            this.addLog(appuser, documentName, webhook, actionName, data, options, 'success', statusCode, msg);
+            await this.addLog(appUser, documentName, webhook, actionName, data, options, 'success', statusCode, msg);
             break;
           } else {
             //common error like 404
-            this.addLog(appuser, documentName, webhook, actionName, data, options, 'failed', statusCode, msg);
+            await this.addLog(appUser, documentName, webhook, actionName, data, options, 'failed', statusCode, msg);
           }
         } catch (e) {
           // exception, usually server not accessible. use error 500
           msg = `Try: ${tryno}/${maxtries}, error ${documentName}:${actionName}  (${webhook._id}) ${e} at ${webhookUrl}`;
-          this.addLog(appuser, documentName, webhook, actionName, data, options, 'failed', 500, msg);
+          await this.addLog(appUser, documentName, webhook, actionName, data, options, 'failed', 500, msg);
         }
 
         //finish tries, throw error
@@ -129,7 +134,7 @@ export class RunWebhookService {
     return true;
   }
 
-  addLog(appuser: UserContext, documentName: string, webhook: Webhook, actionName: string, data: any, options, status: string, statusCode: number, msg: string) {
+  async addLog(appUser: UserContext, documentName: string, webhook: Webhook, actionName: string, data: any, options, status: string, statusCode: number, msg: string) {
     if (status == 'success') {
       this.logger.debug(msg);
     } else {
@@ -140,14 +145,14 @@ export class RunWebhookService {
 
     const whlog: WebhookLog = {
       _id: crypto.randomUUID(),
-      tenantId: appuser.getTenantId(),
-      orgId: appuser.getOrgId(),
-      branchId: appuser.getBranchId(),
+      tenantId: appUser.getTenantId(),
+      orgId: appUser.getOrgId(),
+      branchId: appUser.getBranchId(),
       webHookId: webhook._id,
       created: new Date().toISOString(),
-      createdBy: appuser.getUid(),
+      createdBy: appUser.getUid(),
       updated: new Date().toISOString(),
-      updatedBy: appuser.getUid(),
+      updatedBy: appUser.getUid(),
       title: `${webhook.requestMethod} ${webhook.url}`,
       dataId: data._id,
       resource: documentName,
@@ -157,10 +162,11 @@ export class RunWebhookService {
       body: body,
       msg: msg,
     };
-
-    this.eventEmitter.emit('webhooklog.add', appuser, whlog);
+    
+    const doc = new this.webHookLogModel(whlog)
+    await doc.save({ session:appUser.getDBSession() })
   }
-  prepareBody(appuser: UserContext, webhook: Webhook, data: any, systemVars: any) {
+  prepareBody(appUser: UserContext, webhook: Webhook, data: any, systemVars: any) {
     const cleandata = JSON.parse(JSON.stringify(data));
 
     if (webhook.body?.trim() == '*') {

package/templates/nest/src/simple-app/.core/framework/schemas/simple-app.schema.ts.eta

@@ -121,13 +121,13 @@ export class SchemaConfig {
 export class ForeignKey {
   @Field()
   @ApiProperty({ type: () => String })
-  _id?: String;
+  _id?: string;
   @Field()
   @ApiProperty({ type: () => String })
-  code?: String;
+  code?: string;
   @Field()
   @ApiProperty({ type: () => String })
-  label?: String;
+  label?: string;
   [key: string]: any;
 }
 export class MyForeignKey {

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

@@ -4,9 +4,11 @@
       v-if="iframeSource !== ''"
       :ref="(el) => (iframeRef = el as HTMLIFrameElement)"
       :src="
-        generateIframeSource(iframeSource, {
-          miniAppInstallationId: miniAppInstallationId,
-        })
+        copyQueryToIframeSource(
+          generateIframeSource(iframeSource, {
+            miniAppInstallationId: miniAppInstallationId,
+          }),
+        )
       "
       :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"
@@ -25,17 +27,19 @@
 <script setup lang="ts">
 import {
   MiniAppDetail,
-  MiniappIntegrationCustomPagePages,
+  MiniAppIntegrationCustomPagePages,
 } from "~/simpleapp/generate/openapi";
 
 const props = defineProps<{
   miniApp: MiniAppDetail;
-  pageInfo: MiniappIntegrationCustomPagePages;
+  pageInfo: MiniAppIntegrationCustomPagePages;
   miniAppCode: string;
   miniAppInstallationId: string;
   developerPortalAppId: string;
 }>();
 
+const route = useRoute();
+
 const _xOrg = getPathPara("xorg", "");
 const hasError = ref(false);
 
@@ -53,6 +57,26 @@ function generateIframeSource(template: string, options: Option = {}) {
   });
 }
 
+function copyQueryToIframeSource(url: string): string {
+  const query = route.query;
+  const searchParams = new URLSearchParams();
+
+  Object.entries(query).forEach(([key, value]) => {
+    if (Array.isArray(value)) {
+      value.forEach((v) => {
+        if (v != null) searchParams.append(key, v);
+      });
+    } else if (value != null) {
+      searchParams.append(key, value);
+    }
+  });
+
+  const hasQuery = url.includes("?");
+  const queryString = searchParams.toString();
+
+  return queryString ? url + (hasQuery ? "&" : "?") + queryString : url;
+}
+
 const { iframeRef, onIframeLoad } = useMiniAppBridge(
   props.miniAppInstallationId,
   props.pageInfo,