@simitgroup/simpleapp-generator 1.1.7 → 1.1.9

package/templates/nest/src/simpleapp/generate/commons/interceptors/response.interceptor.ts.eta

@@ -4,77 +4,128 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-import { Injectable, NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
-import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
-import { Model,Connection, ClientSession } from 'mongoose';
-import { InjectConnection,InjectModel } from '@nestjs/mongoose';
+import {
+  Injectable,
+  NestInterceptor,
+  ExecutionContext,
+  CallHandler,
+  BadGatewayException,
+  HttpException,
+} from '@nestjs/common';
+import { Observable, throwError } from 'rxjs';
+import { catchError, tap } from 'rxjs/operators';
+import { Model, Connection, ClientSession } from 'mongoose';
+import { InjectConnection, InjectModel } from '@nestjs/mongoose';
 import { UserContext } from '../user.context';
 import { ApiEvent } from '../../types/apievent.type';
 @Injectable()
 export class ResponseInterceptor implements NestInterceptor {
-  
-    constructor(
-      @InjectConnection() private readonly connection: Connection,
-      @InjectModel('ApiEvent') private apieventmodel: Model<ApiEvent>,
-      ){
-     
-      
-    }
-  async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<any>> {
-    const req = context.switchToHttp().getRequest()    
-    const resp = context.switchToHttp().getResponse()
-    const usersession:UserContext = req['sessionuser']
-    const method = req['method']
-    const headers = {...req['headers']}
-    const ip = req['ip']
-    const url = req['url']
-    // let { url, method, headers, body } 
-    const session:ClientSession =   usersession.getDBSession()
-    const logid:string = crypto.randomUUID()    
-    const starttime =new Date()
+  constructor(
+    @InjectConnection() private readonly connection: Connection,
+    @InjectModel('ApiEvent') private apieventmodel: Model<ApiEvent>,
+  ) {}
 
+  
+  async intercept(
+    context: ExecutionContext,
+    next: CallHandler,
+  ): Promise<Observable<any>> {
+    const req = context.switchToHttp().getRequest();
+    const resp = context.switchToHttp().getResponse();
+    const usersession: UserContext = req['sessionuser'];
+    
+    const method = req['method'];
+    const headers = { ...req['headers'] };
+    const ip = req['ip'];
+    const url = req['url'];
+    // let { url, method, headers, body }
+    const session = await this.connection.startSession();
+    if(!session['runCount']){
+      session['runCount']=0
+    }else{
+      session['runCount']=session['runCount']+1
+    }    
+    usersession.setDBSession(session)
+    // const session: ClientSession = usersession.getDBSession();
+    const logid: string = crypto.randomUUID();
+    const starttime = new Date();
+    let canCommit = true
     //authorization no need
-    delete headers['authorization']//='--removed--'
-    const data:ApiEvent = {
+    delete headers['authorization']; //='--removed--'
+    const eventdata: ApiEvent = {
       _id: logid,
       created: starttime.toISOString(),
-      duration : 0,
+      duration: 0,
       createdBy: usersession.getUid(),
       path: url,
       method: method,
       headers: headers,
-      ip:ip,
+      ip: ip,
       // data: req.body,
-      statusCode:0,
-      status:'D'
-    }
-    const eventmodel = new this.apieventmodel(data)      
-    
-    const eventObj = await eventmodel.save()
-    
-    req['eventObj']=eventObj
-    return next
-      .handle()
-      .pipe(
-        tap(async () => {
-          
-          const endtime =new Date()
-          eventObj.isNew=false
-          eventObj.statusCode=resp['statusCode']
-          eventObj.updated = endtime.toISOString()
-          eventObj.status="OK"
-          eventObj.duration =  endtime.getTime() - starttime.getTime()
-          const result = await eventObj.save()//({_id:logid},{statusCode:resp['statusCode']})
-          // console.log("result===",logid,result)
+      statusCode: 0,
+      status: 'D',
+    };
+    const eventmodel = new this.apieventmodel(eventdata);
+
+    const eventObj = await eventmodel.save();
+
+    // req['eventObj'] = eventObj;
+    return next.handle().pipe(
+
+      catchError( async(err,caught)=>{
+
+        // console.log('**************catchError at interceptor ',method,url)
+          if (session.inTransaction()) {
+            await session.abortTransaction()
+            canCommit=false
+          }      
           
-          if(process.env.DRYRUN=='true'){
-            console.warn("--------dryrun! roll back everything-----------")
-            if(session.inTransaction())session.abortTransaction()
-          }else{
-            if(session.inTransaction())session.commitTransaction()
-          }                            
-        }),
-      );
+     
+         const responseBody = {
+          message: err.message,
+          timestamp: new Date().toISOString(),
+          path: url,
+          error: err.options,
+        };
+    
+          // eventObj.statusCode = err.status;
+          // eventObj.errMsg = responseBody.message;
+          // const endtime = new Date();
+          // eventObj.updated = endtime.toISOString();
+          // eventObj.data = req.body;
+          // eventObj.errData = responseBody.error;
+          // eventObj.status = 'NG';
+          // eventObj.duration =
+          // endtime.getTime() - new Date(eventObj.created).getTime();
+          // eventObj.save();
+
+          resp.status(err.status)
+          return responseBody
+
+      }),
+      tap(async () => {
+        // console.log("============interceptor tap",method,url)
+        const endtime = new Date();
+        eventObj.isNew = false;
+        eventObj.statusCode = resp['statusCode'];
+        eventObj.updated = endtime.toISOString();
+        eventObj.status = 'OK';
+        eventObj.duration = endtime.getTime() - starttime.getTime();
+        await eventObj.save(); 
+        
+
+        if (process.env.DRYRUN == 'true') {
+          console.warn('--------dryrun! roll back everything-----------');
+          if (session.inTransaction() && canCommit ) {
+            await session.abortTransaction()            
+          }
+        } else {
+          if (session.inTransaction() && canCommit ) {
+            await session.commitTransaction()//.then(()=>session.endSession());
+          }
+        }
+        // session.endSession()
+      }),
+    );
   }
-}
+}

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

@@ -4,13 +4,19 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-import { Injectable, NestMiddleware, Logger,Scope,Inject } from '@nestjs/common';
+import {
+  Injectable,
+  NestMiddleware,
+  Logger,
+  Scope,
+  Inject,
+} from '@nestjs/common';
 import { Request, Response, NextFunction } from 'express';
 import { InjectModel } from '@nestjs/mongoose';
-import { Model,Connection } from 'mongoose';
+import { Model, Connection } from 'mongoose';
 // import * as mongoose from 'mongoose';
-import {   User,  }  from '../../types/user.type';
-import {   Permission,  }  from '../../types/perm.type';
+import { User } from '../../types/user.type';
+import { Permission } from '../../types/perm.type';
 import { InjectConnection } from '@nestjs/mongoose';
 
 const Base64URL = require('@darkwolf/base64url');
@@ -20,75 +26,80 @@ 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']
-  protected logger = new Logger()
-  protected transController
-  constructor(     
-    @InjectModel('User') private readonly usermodel:Model<User>,
-    @InjectModel('Permission') private readonly permmodel:Model<Permission>,
-    @InjectConnection() private readonly connection: Connection,
-    ){}
-  
-  requireXorg(baseurl:string):boolean{
+  protected defaultxorg = Base64URL.encodeText('0-0-0');
+  protected excludeXorgs = ['/profile', '/profile/tenant'];
+  protected logger = new Logger();
+  protected transController;
+  constructor(
+    @InjectModel('User') private readonly usermodel: Model<User>,
+    @InjectModel('Permission') private readonly permmodel: Model<Permission>,
+    
+  ) {}
+
+  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")
-        return false
+    for (let i = 0; i < this.excludeXorgs.length; i++) {
+      if (baseurl.includes(this.excludeXorgs[i])) {
+        this.logger.verbose('requireXorg = false');
+        return false;
       }
     }
     // console.log("Require xorg")
-    return true
+    return true;
   }
   async use(req: Request, res: Response, next: NextFunction) {
     if (req.baseUrl == '/oauth2-redirect.html') {
       next();
       return;
     }
-    this.logger.debug(`running TenantMiddleware for ${req.baseUrl}`)
+    this.logger.debug(`running TenantMiddleware for ${req.baseUrl}`);
     if (!req.headers['authorization']) {
-      this.logger.log("undefine bearer token")
+      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")
+      this.logger.log(
+        'undefine x-org and require that at ' + req.baseUrl,
+        'TenantMiddleware',
+      );
       return res.status(401).send('undefine header string x-org');
     }
-    const session = await this.connection.startSession()
-    const u = new UserContext(this.usermodel,this.permmodel,session)
+    // const session = await this.connection.startSession();
+    const u = new UserContext(this.usermodel, this.permmodel);
     // 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');  
-      }else{
-        if(u.getId()==''){
-          this.logger.verbose(`grant new user (${u.getUid()}) access ${req.baseUrl}`)
-        }else{
-          this.logger.verbose(`grant user (${u.getId()}) access ${req.baseUrl}`)
+      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');
+      } else {
+        if (u.getId() == '') {
+          this.logger.verbose(
+            `grant new user (${u.getUid()}) access ${req.baseUrl}`,
+          );
+        } else {
+          this.logger.verbose(
+            `grant user (${u.getId()}) access ${req.baseUrl}`,
+          );
         }
-        req['sessionuser'] = u
-        this.logger.verbose(u.getRoles())
+        req['sessionuser'] = u;
+        this.logger.verbose(u.getRoles());
 
         next();
       }
-      
-    } catch(err) {
-      this.logger.warn(err,"invalid xorg or user info",)
-      this.logger.error(err)
-      if(err=='invalid x-org'){
+    } catch (err) {
+      this.logger.warn(err, 'invalid xorg or user info');
+      this.logger.error(err);
+      if (err == 'invalid x-org') {
         return res.status(403).send(err);
-      }else{
+      } else {
         return res.status(401).send(err);
       }
-      
     }
   }
 }