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

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

@@ -10,20 +10,22 @@ import { ResourceGuard } from 'nest-keycloak-connect';
 
 @Injectable()
 export class CustomKeycloakGuard implements CanActivate {
-  constructor(private reflector: Reflector, private resourceGuard: ResourceGuard) {}
+  constructor(
+    private reflector: Reflector,
+    private resourceGuard: ResourceGuard,
+  ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
-    
 
-    //graphql no http request, exclude from capability of x-api-key
-    if(request?.headers){
-        const apiKey = request.headers['x-api-key'];
-        const apiSecret = request.headers['x-api-secret'];
-        // validate apikey and apisecret at middleware level, reach here mean approved as robot
-        if (apiKey && apiSecret ) {
-          return true;
-        }
+    //graphql no http request, exclude from capability of x-apikey
+    if (request?.headers) {
+      const apiKey = request.headers['x-apikey'];
+      const apiSecret = request.headers['x-apisecret'];
+      // validate apikey and apisecret at middleware level, reach here mean approved as robot
+      if (apiKey && apiSecret) {
+        return true;
+      }
     }
 
     // If API key is not present, fall back to Keycloak authentication
@@ -35,9 +37,9 @@ export class CustomKeycloakGuard implements CanActivate {
     }
   }
 
-  private validateApiKey(apiKey: string, apiSecret: string): boolean {    
+  private validateApiKey(apiKey: string, apiSecret: string): boolean {
     // Implement your API key and secret validation logic here
     // This is just a simple example
     return apiKey === 'your-valid-api-key' && apiSecret === 'your-valid-api-secret';
   }
-}
+}

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

@@ -4,48 +4,42 @@
  * last change 2024-06-21
  * Author: Ks Tan
  */
-import {
-    Injectable,
-    CanActivate,
-    ExecutionContext,
-    UnauthorizedException,
-  } from '@nestjs/common';
-  import { Reflector } from '@nestjs/core';
-  import { ResourceGuard } from 'nest-keycloak-connect';
-  
-  @Injectable()
-  export class CustomKeycloakGuard implements CanActivate {
-    constructor(
-      private reflector: Reflector,
-      private resourceGuard: ResourceGuard,
-    ) {}
-  
-    async canActivate(context: ExecutionContext): Promise<boolean> {
-      const request = context.switchToHttp().getRequest();
-  
-      //graphql no http request, exclude from capability of x-api-key
-      if (request?.headers) {
-        const apiKey = request.headers['x-api-key'];
-        const apiSecret = request.headers['x-api-secret'];
-        // validate apikey and apisecret at middleware level, reach here mean approved as robot
-        if (apiKey && apiSecret) {
-          return true;
-        }
-      }
-  
-      // If API key is not present, fall back to Keycloak authentication
-      try {
-        const canActivate = await this.resourceGuard.canActivate(context);
-        return canActivate as boolean;
-      } catch (error) {
-        throw new UnauthorizedException('Invalid API key or Keycloak token');
+import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { ResourceGuard } from 'nest-keycloak-connect';
+
+@Injectable()
+export class CustomKeycloakGuard implements CanActivate {
+  constructor(
+    private reflector: Reflector,
+    private resourceGuard: ResourceGuard,
+  ) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest();
+
+    //graphql no http request, exclude from capability of x-apikey
+    if (request?.headers) {
+      const apiKey = request.headers['x-apikey'];
+      const apiSecret = request.headers['x-apisecret'];
+      // validate apikey and apisecret at middleware level, reach here mean approved as robot
+      if (apiKey && apiSecret) {
+        return true;
       }
     }
-  
-    // private validateApiKey(apiKey: string, apiSecret: string): boolean {
-    //   // Implement your API key and secret validation logic here
-    //   // This is just a simple example
-    //   return apiKey === 'your-valid-api-key' && apiSecret === 'your-valid-api-secret';
-    // }
+
+    // If API key is not present, fall back to Keycloak authentication
+    try {
+      const canActivate = await this.resourceGuard.canActivate(context);
+      return canActivate as boolean;
+    } catch (error) {
+      throw new UnauthorizedException('Invalid API key or Keycloak token');
+    }
   }
-  
+
+  // private validateApiKey(apiKey: string, apiSecret: string): boolean {
+  //   // Implement your API key and secret validation logic here
+  //   // This is just a simple example
+  //   return apiKey === 'your-valid-api-key' && apiSecret === 'your-valid-api-secret';
+  // }
+}

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

@@ -47,12 +47,15 @@ export class DocNumberFormatGenerator {
     id: string = '',
   ) => {
     doctype = doctype.toUpperCase();
-    let filter = { docNoType: doctype };
+    const filter = { docNoType: doctype, active: true };
     if (id) {
       filter['_id'] = id;
     }
+    //
     Object.assign(filter, appuser.getBranchFilter());
-    const result = await this.docformat.find(filter).session(appuser.getDBSession());
+    const result = await this.docformat
+      .find(filter)
+      .session(appuser.getDBSession());
     //search(appuser, filter);
     if (result && result.length > 0) {
       const d: Docnoformat = result[0];
@@ -79,7 +82,7 @@ export class DocNumberFormatGenerator {
       }
     } else {
       throw new BadRequestException(
-        `invalid parameter doctype: "${doctype}" or id: ${id}`,
+        `No active document number found for ${doctype}. Please update in Settings > Document Numbering Format`,
       );
     }
   };

package/templates/nest/src/simpleapp/generate/commons/encryption.static.ts.eta

@@ -3,76 +3,71 @@
  * 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 {
+  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;
 
-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")
+  constructor() {
+    this.init();
+  }
+  public static getInstance(): Encryption {
+    if (!Encryption.instance) {
+      Encryption.instance = new Encryption();
     }
 
-
-    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
-
-    }
+    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;
+  };
 }
-
-
-
-

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