@simitgroup/simpleapp-generator 1.6.6-i-alpha → 1.6.6-k-alpha

package/templates/nest/src/simpleapp/generate/commons/middlewares/tenant.middleware.ts.eta

@@ -4,135 +4,112 @@
  * last change 2024-03-17
  * Author: Ks Tan
  */
-import {
-  Injectable,
-  NestMiddleware,
-  Logger,
-  Scope,
-  Inject,
-  BadRequestException,
-} from '@nestjs/common';
-import { Request, Response, NextFunction } from 'express';
+
+import Base64URL from '@darkwolf/base64url';
+import { BadRequestException, Injectable, Logger, NestMiddleware } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import { Model, Connection } from 'mongoose';
-// import * as mongoose from 'mongoose';
-import { User } from '../../types/user.type';
+import { NextFunction, Request, Response } from 'express';
+import { Model } from 'mongoose';
 import { Permission } from '../../types/perm.type';
-import { InjectConnection } from '@nestjs/mongoose';
-
-const Base64URL = require('@darkwolf/base64url');
-// import * as jwt from 'nestjs-jwt'
-
+import { User } from '../../types/user.type';
+import { Appintegration } from '../../types/appintegration.type';
 import { UserContext } from '../user.context';
-// import {KeycloakConfigService} from "../keycloak/keycloak.service"
+
 @Injectable()
 export class TenantMiddleware implements NestMiddleware {
-  protected defaultxorg = Base64URL.encodeText('0-0-0');
-  protected excludeXorgs = ['/profile', '/profile/tenant', '/profile/session'];
-  protected logger = new Logger();
-  protected transController;
+  protected defaultXOrg = Base64URL.encodeText('0-0-0');
+
+  protected excludeXOrgPaths = ['/profile', '/profile/tenant', '/profile/session'];
+
+  private readonly logger = new Logger(this.constructor.name);
+
   constructor(
-    @InjectModel('User') private readonly usermodel: Model<User>,
-    @InjectModel('Permission') private readonly permmodel: Model<Permission>,
+    @InjectModel('User') private readonly userModel: Model<User>,
+    @InjectModel('Permission') private readonly permModel: Model<Permission>,
+    @InjectModel('Appintegration') private readonly appModel: Model<Appintegration>,
   ) {}
 
-  requireXorg(baseurl: string): boolean {
-    // console.log('requireXorg')
-    for (let i = 0; i < this.excludeXorgs.length; i++) {
-      if (baseurl.includes(this.excludeXorgs[i])) {
-        this.logger.verbose('requireXorg = false');
+  requireXOrg(baseurl: string): boolean {
+    for (let i = 0; i < this.excludeXOrgPaths.length; i++) {
+      if (baseurl.includes(this.excludeXOrgPaths[i])) {
+        this.logger.verbose('requireXOrg = false');
         return false;
       }
     }
-    // console.log("Require xorg")
     return true;
   }
+
   async use(req: Request, res: Response, next: NextFunction) {
     if (req.baseUrl == '/oauth2-redirect.html') {
       next();
       return;
     }
-    const u = new UserContext(this.usermodel, this.permmodel);
+
+    let tokenStr: string = req.get('authorization') ?? '';
+    tokenStr = tokenStr.replace('Bearer ', '');
+    const xOrg = req.get('x-org') ?? this.defaultXOrg;
+
+    const user = new UserContext(this.userModel, this.permModel, this.appModel);
 
     if (req.baseUrl == '/graphql') {
-      let tokenstr: string = req.headers['authorization'] ?? '';
-      tokenstr = tokenstr.replace('Bearer ', '');
-      const xorg = req.headers['x-org'] ?? this.defaultxorg;
-      if (tokenstr) {        
-        await u.setCurrentUserInfo(tokenstr, xorg);
+      if (tokenStr) {
+        await user.setCurrentUserInfo(tokenStr, xOrg);
       }
-      req['sessionuser'] = u;
+      req['sessionuser'] = user;
       next();
       return;
     }
-    this.logger.debug(`running TenantMiddleware for ${req.baseUrl}`);
-
-    
-    //if APIKEY defined, and there is api key and secret supplied. use robot user
-    if(process.env.X_API_KEY &&req.headers['x-api-key'] && req.headers['x-api-secret']){
-    
-      if(req.headers['x-api-key']==process.env.X_API_KEY &&
-        req.headers['x-api-secret']==process.env.X_API_SECRET){        
+    this.logger.debug(`Running TenantMiddleware for ${req.baseUrl}`);
 
-         u.setAsStaticUser(
-            '00000000-0000-0000-0000-000000000000',
-            'robot',
-            'Robot',
-            'robot@a.org',
-            req.headers['x-org']?? this.defaultxorg
-          );
-        if(req.headers['x-guest-accesstoken']) {
-          u.setGuestToken(<string>req.headers['x-guest-accesstoken']);
+    // If X_APIKEY defined, and there is api key and secret supplied. use robot user
+    if (process.env.X_APIKEY && req.get('x-apikey') && req.get('x-apisecret')) {
+      if (req.get('x-apikey') == process.env.X_APIKEY && req.get('x-apisecret') == process.env.X_APISECRET) {
+        user.setAsStaticUser('00000000-0000-0000-0000-000000000000', 'robot', 'Robot', 'robot@a.org', req.get('x-org') ?? this.defaultXOrg);
+        if (req.get('x-guest-accesstoken')) {
+          user.setGuestToken(req.get('x-guest-accesstoken'));
         }
-        req['sessionuser'] = u;
+        req['sessionuser'] = user;
         next();
         return;
-      }else{
-        this.logger.log('invalid api key/scret');
-        throw new BadRequestException('invalid api key/scret');
+      } else {
+        this.logger.log('Invalid API Key / Secret');
+        throw new BadRequestException('Invalid API Key / Secret');
       }
     }
 
-    if (!req.headers['authorization']) {
-      this.logger.log('undefine bearer token');
-      return res.status(401).send('Undefine bearer token');
+    if (!req.get('authorization')) {
+      this.logger.log('Undefine Bearer Token');
+      return res.status(401).send('Undefine Bearer Token');
     }
-    if (!req.headers['x-org'] && this.requireXorg(req.baseUrl)) {
-      this.logger.log(
-        'undefine x-org and require that at ' + req.baseUrl,
-        'TenantMiddleware',
-      );
-      throw new BadRequestException('undefine header string x-org');
-      // return res.status(401).send('undefine header string x-org');
+
+    if (!req.get('x-org') && this.requireXOrg(req.baseUrl)) {
+      this.logger.log('Undefine header X-Org and require that at ' + req.baseUrl, 'TenantMiddleware');
+      throw new BadRequestException('Undefine header X-Org');
     }
-    // const session = await this.connection.startSession();
-    // console.log("line 43")
-    try {
-      let tokenstr: string = req.headers['authorization'];
-      tokenstr = tokenstr.replace('Bearer ', '');
 
-      const xorg = req.headers['x-org'] ?? this.defaultxorg;      
-      await u.setCurrentUserInfo(tokenstr, xorg);
-      if (u.getId() == '' && this.requireXorg(req.baseUrl)) {
-        this.logger.log('access deny of no user:', req.baseUrl);
-        return res.status(401).send('access deny');
+    try {
+      await user.setCurrentUserInfo(tokenStr, xOrg);
+      if (user.getId() == '' && this.requireXOrg(req.baseUrl)) {
+        this.logger.log('Access deny for user:', req.baseUrl);
+        return res.status(401).send('Access deny for user');
       } else {
-        if (u.getId() == '') {
-          this.logger.verbose(
-            `grant new user (${u.getUid()}) access ${req.baseUrl}`,
-          );
+        if (user.getId() == '') {
+          this.logger.verbose(`Grant new user (${user.getUid()}) access ${req.baseUrl}`);
         } else {
-          this.logger.verbose(
-            `grant user (${u.getId()}) access ${req.baseUrl}`,
-          );
+          this.logger.verbose(`Grant user (${user.getId()}) access ${req.baseUrl}`);
         }
-        req['sessionuser'] = u;
-        this.logger.verbose(u.getRoles());
+        req['sessionuser'] = user;
+        this.logger.verbose('User roles: ' + user.getRoles().join(','));
 
         next();
+        return;
       }
     } catch (err) {
-      this.logger.error(err);
+      let errorMsg: string = <string>err;
+      if (err instanceof Error) {
+        errorMsg = 'Code: ' + err.name + ', Msg: ' + err.message;
+      }
+      this.logger.error('Error set user context: ' + errorMsg);
       throw new BadRequestException(err);
     }
   }

package/templates/nest/src/simpleapp/generate/commons/robotuser.service.ts.eta

@@ -1,6 +1,5 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * DONT CHANGE THIS FILE !!
+ * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2024-03-19
  * Author: Ks Tan
@@ -9,8 +8,9 @@ import { Injectable, Logger } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import { User } from 'src/simpleapp/services/user.service';
 import { Permission } from 'src/simpleapp/services/perm.service';
+import { User } from 'src/simpleapp/services/user.service';
+import { Appintegration } from 'src/simpleapp/services/appintegration.service';
 const Base64URL = require('@darkwolf/base64url');
 @Injectable()
 export class SimpleAppRobotUserService {
@@ -21,6 +21,7 @@ export class SimpleAppRobotUserService {
   logger = new Logger();
   @InjectModel('User') private readonly usermodel: Model<User>;
   @InjectModel('Permission') private readonly permmodel: Model<Permission>;
+  @InjectModel('Appintegration') private readonly appmodel: Model<Appintegration>;
 
   constructor() {
     this.init();
@@ -77,7 +78,7 @@ export class SimpleAppRobotUserService {
       });
 
     this.setToken(tokens.access_token);
-    console.log("access token ",this.getToken())
+    // console.log('access token ', this.getToken());
     const nextrefresh = tokens.expires_in * 0.8;
     const appuser = this.prepareAppUser(undefined);
 
@@ -89,23 +90,23 @@ export class SimpleAppRobotUserService {
   }
 
   prepareAppUser(data: any) {
-    console.log("prepareAppUserprepareAppUser");
-    const appuser = new UserContext(this.usermodel, this.permmodel);
+    // console.log('prepareAppUserprepareAppUser');
+    const appuser = new UserContext(this.usermodel, this.permmodel, this.appmodel);
     appuser.setAsStaticUser(
       '00000000-0000-0000-0000-000000000000',
       'robot',
       'Robot',
       'robot@a.org',
-      Base64URL.encodeText('0-0-0')
+      Base64URL.encodeText('0-0-0'),
     );
 
     const tenantId = data?.tenantId ?? 0;
     const orgId = data?.orgId ?? 0;
     const branchId = data?.branchId ?? 0;
 
-    appuser.setXorg(appuser.generateXorg(tenantId, orgId, branchId));
+    appuser.setXOrg(appuser.generateXOrg(tenantId, orgId, branchId));
     appuser.setUserToken(this.getToken());
-  
+
     return appuser;
   }
 }

package/templates/nest/src/simpleapp/generate/commons/roles/roles.guard.ts.eta

@@ -24,9 +24,16 @@ export class RolesGuard implements CanActivate {
     const requiredRoles = this.reflector.getAllAndOverride<Role[]>(ROLES_KEY, [
       context.getHandler(),
       context.getClass(),
-    ]);
+    ]) || [];
+    const criticalRoles = [Role.SuperAdmin, Role.SuperUser, Role.TenantOwner];
 
-    let sessionuser:UserContext 
+    criticalRoles.forEach((role) => {
+      if (!requiredRoles.includes(role)) {
+        requiredRoles.push(role);
+      }
+    });
+
+    let sessionuser: UserContext;
     if (context.getType() == 'http') {
       const request = context.switchToHttp().getRequest();
       sessionuser = request['sessionuser'];
@@ -34,7 +41,7 @@ export class RolesGuard implements CanActivate {
       const req = context.getArgs()[2].req;
       sessionuser = req['sessionuser'];
     }
-    
+
     if (!requiredRoles) {
       return true;
     }

package/templates/nest/src/simpleapp/generate/commons/runwebhook.service.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-03-17
+ * Author: Ks Tan
+ */
 import {
   BadRequestException,
   Injectable,
@@ -11,27 +17,22 @@ import {
   Webhook,
   WebhookService,
 } from 'src/simpleapp/services/webhook.service';
-import {alldocuments} from 'src/simpleapp/generate/commons/dicts/documents'
+import { alldocuments } from 'src/simpleapp/generate/commons/dicts/documents';
 
 @Injectable()
 export class RunWebhookService {
-  private webhookApiKey = process.env.WEBHOOK_SERVER_APIKEY
-  private webhookAppId=process.env.WEBHOOK_SERVER_APP_ID
+  private webhookApiKey = process.env.WEBHOOK_SERVER_APIKEY;
+  private webhookAppId = process.env.WEBHOOK_SERVER_APP_ID;
   private webhookurl = process.env.WEBHOOK_SERVER_URL;
-  private webhookprefix = process.env.PROJECT_CODE+'.'
-  private  webhookeventurl = `${process.env.WEBHOOK_SERVER_URL}/event/`;
-  private  webhookeventtypeurl = `${process.env.WEBHOOK_SERVER_URL}/event_types/`;
-  private webhooksync:boolean = process.env.WEBHOOKER_SYNC_EVENTTYPE=='true'
+  private webhookprefix = process.env.PROJECT_CODE + '.';
+  private webhookeventurl = `${process.env.WEBHOOK_SERVER_URL}/event/`;
+  private webhookeventtypeurl = `${process.env.WEBHOOK_SERVER_URL}/event_types/`;
+  private webhooksync: boolean = process.env.WEBHOOKER_SYNC_EVENTTYPE == 'true';
 
-
-
-  public constructor(
-    private webhookService: WebhookService,    
-  ) {
-    if(this.webhooksync) this.syncEventTypes()
+  public constructor(private webhookService: WebhookService) {
+    if (this.webhooksync) this.syncEventTypes();
   }
 
-
   @OnEvent('webhook')
   async loadWebhook(
     appuser: UserContext,
@@ -39,18 +40,16 @@ export class RunWebhookService {
     actionName: string,
     data?: any,
   ) {
-
     //no webhook server implemented
-    if(!this.webhookApiKey) return true
-
+    if (!this.webhookApiKey) return true;
 
     const filter = {
-      eventTypes: documentName + '.' + actionName ,
+      eventTypes: documentName + '.' + actionName,
       active: true,
-    }
-    console.log("Load webhook",documentName,actionName,filter)
+    };
+    // console.log('Load webhook', documentName, actionName, filter);
     const webhooks = await this.webhookService.search(appuser, filter);
-    console.log("Loaded webhook",webhooks)
+    // console.log('Loaded webhook', webhooks);
     if (webhooks.length == 0) return;
 
     for (let i = 0; i < webhooks.length; i++) {
@@ -76,10 +75,9 @@ export class RunWebhookService {
     actionName: string,
     data: any,
   ) {
-    
     const headers = {};
 
-    console.log("Run webhook ",documentName,actionName)
+    // console.log('Run webhook ', documentName, actionName);
     if (Array.isArray(webhook.headers)) {
       webhook.headers.forEach((h) => {
         headers[h.name] = h.value;
@@ -88,7 +86,7 @@ export class RunWebhookService {
     headers['accept'] = 'application/json';
     headers['content-type'] = 'application/json';
     headers['Authorization'] = this.webhookApiKey;
-    const eventname = `${this.webhookprefix}${documentName}.${actionName}`
+    const eventname = `${this.webhookprefix}${documentName}.${actionName}`;
     const options = {
       method: webhook.requestMethod.toUpperCase(),
       headers: headers,
@@ -109,93 +107,89 @@ export class RunWebhookService {
       }),
     };
     try {
-      console.log("webhook request ",this.webhookeventurl,options)
+      // console.log('webhook request ', this.webhookeventurl, options);
       const req = await fetch(this.webhookeventurl, options);
       const statusCode = req.status;
-      if(statusCode>=300){
-        throw new InternalServerErrorException(`create event ${eventname} failed to webhook server`)
+      if (statusCode >= 300) {
+        throw new InternalServerErrorException(
+          `create event ${eventname} failed to webhook server`,
+        );
       }
-      
+
       // const body = req.body;
     } catch (e) {
-      return e
+      return e;
     }
   }
 
-
-
-  async syncEventTypes(){
+  async syncEventTypes() {
     const options = {
-      method: 'GET', 
+      method: 'GET',
       headers: {
         accept: 'application/json',
-        Authorization: this.webhookApiKey
-      }};
+        Authorization: this.webhookApiKey,
+      },
+    };
     //  {
     //   "service_name": "billing",
     //   "resource_type_name": "invoice",
     //   "verb_name": "documentno",
     //   "event_type_name": "billing.invoice.documentno"
     // },
-    try{
-
-
-    const res = await fetch(
-      `${this.webhookeventtypeurl}?application_id=${this.webhookAppId}`, 
-      options)
-
-    const locallist = this.getSchemaEventTypes()
-    const eventlist = (await res.json()).map(item=>item.event_type_name)
-
-    for(let i=0; i<locallist.length;i++){
-      const item = locallist[i]
-      if(!eventlist.includes(item)){
-        //create remote event type
-        await this.createEventType(item)
+    try {
+      const res = await fetch(
+        `${this.webhookeventtypeurl}?application_id=${this.webhookAppId}`,
+        options,
+      );
+
+      const locallist = this.getSchemaEventTypes();
+      const eventlist = (await res.json()).map((item) => item.event_type_name);
+
+      for (let i = 0; i < locallist.length; i++) {
+        const item = locallist[i];
+        if (!eventlist.includes(item)) {
+          //create remote event type
+          await this.createEventType(item);
+        }
       }
+    } catch (e) {
+      throw new InternalServerErrorException(e);
     }
-
-   
-    }catch(e){
-      throw new InternalServerErrorException(e)
-    }
-
-
   }
 
-
-  async createEventType(eventname:string){
-    const para = eventname.split('.')
+  async createEventType(eventname: string) {
+    const para = eventname.split('.');
     const options = {
       method: 'POST',
       headers: {
         accept: 'application/json',
         'content-type': 'application/json',
-        Authorization: this.webhookApiKey
+        Authorization: this.webhookApiKey,
       },
       body: JSON.stringify({
         application_id: this.webhookAppId,
         resource_type: para[0],
         service: para[1],
-        verb: para[2]
-      })
+        verb: para[2],
+      }),
     };
 
-    await fetch(this.webhookeventtypeurl, options)
-      // .then(response => response.json())
-      // .then(response => console.log(response))
-      // .catch(err => console.error(err));
+    await fetch(this.webhookeventtypeurl, options);
+    // .then(response => response.json())
+    // .then(response => console.log(response))
+    // .catch(err => console.error(err));
   }
-  getSchemaEventTypes(){
-    const alleventtypes:string[] = []
-    alldocuments.filter(item=>Array.isArray(item.webhook))
-      .forEach(item=>{
-        item.webhook.forEach(h=>{
+  getSchemaEventTypes() {
+    const alleventtypes: string[] = [];
+    alldocuments
+      .filter((item) => Array.isArray(item.webhook))
+      .forEach((item) => {
+        item.webhook.forEach((h) => {
           alleventtypes.push(
-            `${this.webhookprefix}${item.docName.toLowerCase()}.${h}`)
-        })
-      })
-    return alleventtypes
-
+            `${this.webhookprefix}${item.docName.toLowerCase()}.${h}`,
+          );
+        });
+      });
+    return alleventtypes;
   }
 }