@simitgroup/simpleapp-generator 2.0.2-w-alpha → 2.0.2-x-alpha

package/ReleaseNote.md

@@ -1,3 +1,8 @@
+
+[2.0.2x-alpha]
+1. Add id_token_hint to Keycloak logout 
+2. tighten types
+
 [2.0.2w-alpha]
 1. Add tenant health to user context
 2. Add Day js isBetween plugin

package/package.json

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

package/templates/nest/src/simple-app/_core/features/document-no-format/document-no-format.service.ts.eta

@@ -1,19 +1,20 @@
-import { UserContext } from '../user-context/user.context';
+import { BadRequestException, InternalServerErrorException } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import { Model, FilterQuery } from 'mongoose';
-import { DocNumberFormatResult, ForeignKey, IsolationType, SchemaFields } from '../../framework/schemas';
+import { Branch } from '@resources/branch/branch.schema';
+import dayjs from 'dayjs';
+import { AnyObject, FilterQuery, Model } from 'mongoose';
+import { DocNumberFormatResult, ForeignKey, IsolationType } from '../../framework/schemas';
+import { UserContext } from '../user-context/user.context';
 import { DocumentNoFormat, DocumentNoFormatPreview } from './document-no-format.schema';
-import { Injectable, InternalServerErrorException, BadRequestException } from '@nestjs/common';
 import { alldocuments } from './document.dict';
-import dayjs from 'dayjs';
 
 export class SimpleAppDocumentNoFormatService {
   constructor(@InjectModel('DocumentNoFormat') private docformat: Model<DocumentNoFormat>) {}
-  getDocumentMeta = (docType:string)=> alldocuments.find(x => x.docType === docType)
+  getDocumentMeta = (docType: string) => alldocuments.find((x) => x.docType === docType);
 
   async runListDocFormats(appUser: UserContext, doctype: string) {
     doctype = doctype.toUpperCase();
-    const searchresult = await this.docformat.aggregate([
+    const searchresult = await this.docformat.aggregate<DocumentNoFormat>([
       {
         $match: {
           docNoType: doctype,
@@ -40,7 +41,15 @@ export class SimpleAppDocumentNoFormatService {
     }
     return data;
   }
-  async generateNextNumberFromDocument(appUser: UserContext, docType: string, data: any) {
+
+  async generateNextNumberFromDocument(
+    appUser: UserContext,
+    docType: string,
+    // ! Not sure what this type is. Where does "DocumentNoFormat" come from??? Why this field is PascalCase???
+    data: object & {
+      DocumentNoFormat?: ForeignKey;
+    },
+  ) {
     let formatId = '';
     if (data.DocumentNoFormat && data.DocumentNoFormat._id) {
       formatId = data.DocumentNoFormat._id;
@@ -51,6 +60,7 @@ export class SimpleAppDocumentNoFormatService {
       code: docnoobj.formatName,
       label: docnoobj.formatName,
     };
+
     data.DocumentNoFormat = result;
     return docnoobj.result;
   }
@@ -70,27 +80,27 @@ export class SimpleAppDocumentNoFormatService {
     const result = await this.docformat.find(filter).session(session);
     if (result && result.length > 0) {
       const d: DocumentNoFormat = result[0];
-      const initNumber = d.nextNumber
+      const initNumber = d.nextNumber;
       const recordId = d._id;
       // const newdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
 
-      const checker = await this.documentNumberChecker(appUser,doctype,d)
+      const checker = await this.documentNumberChecker(appUser, doctype, d);
 
-      if(!checker.accept){
-        d.nextNumber = initNumber
-        const errdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);        
+      if (!checker.accept) {
+        d.nextNumber = initNumber;
+        const errdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
         throw new InternalServerErrorException(`Unique Key ${errdocno} conflict`);
       }
 
-      const newdocno = checker.newDocNo
+      const newdocno = checker.newDocNo;
       const newnextnumber = initNumber + checker.offset;
       const updatedata = { nextNumber: newnextnumber } as DocumentNoFormat;
 
       const options = process.env.BlockGenerateDocNumberWithSession ? {} : { session: session };
       const updateresult = await this.docformat.findByIdAndUpdate(recordId, updatedata, options);
-      result[0].nextNumber = initNumber
+      result[0].nextNumber = initNumber;
       // console.log('add transaction step for update document no',[result[0]])
-      appUser.addTransactionStep('update','documentnoformat',[recordId],[result[0]])
+      appUser.addTransactionStep('update', 'documentnoformat', [recordId], [result[0]]);
       if (updateresult) {
         const result: DocNumberFormatResult = {
           formatId: d._id,
@@ -107,7 +117,7 @@ export class SimpleAppDocumentNoFormatService {
     }
   }
 
-  async generateBranchDefaultDocNumbers(appUser: UserContext, data: SchemaFields) {
+  async generateBranchDefaultDocNumbers(appUser: UserContext, data: Branch) {
     const branchName = data.branchName;
     const branchCode = data.branchCode;
     const recordId = data._id;
@@ -126,9 +136,8 @@ export class SimpleAppDocumentNoFormatService {
     const docformats = alldocuments.filter((item) => item.docNumber);
     const allFormats: DocumentNoFormat[] = [];
     for (let i = 0; i < docformats.length; i++) {
-
       const doc = docformats[i];
-      if(['tenantinvoice'].includes(doc.docType)) continue;
+      if (['tenantinvoice'].includes(doc.docType)) continue;
       const pattern = doc.docNoPattern.replace('@BranchCode', branchCode);
       const formatdata: DocumentNoFormat = {
         _id: crypto.randomUUID(),
@@ -154,10 +163,10 @@ export class SimpleAppDocumentNoFormatService {
     try {
       //rollback when not able to create branch
       const result = await this.docformat.insertMany(allFormats, { session: appUser.getDBSession() });
-      const allRecordIds = result.map(item=>item._id)
-      const allLogData = result.map(item=>null)
-      
-      appUser.addTransactionStep('create','documentnoformat',allRecordIds,allLogData)
+      const allRecordIds = result.map((item) => item._id);
+      const allLogData = result.map((item) => null);
+
+      appUser.addTransactionStep('create', 'documentnoformat', allRecordIds, allLogData);
       if (!result) {
         throw new InternalServerErrorException(`Generate ${allFormats.length} document formats for "${branchCode}" failed.`, 'generateDefaultDocNumbers');
       }
@@ -203,7 +212,7 @@ export class SimpleAppDocumentNoFormatService {
     }
   };
 
-  async search(appUser, filter: FilterQuery<DocumentNoFormat>) {
+  async search(appUser: UserContext, filter: FilterQuery<DocumentNoFormat>) {
     const isolationFilter: FilterQuery<DocumentNoFormat> = {
       tenantId: appUser.tenantId,
       orgId: appUser.orgId,
@@ -228,77 +237,74 @@ export class SimpleAppDocumentNoFormatService {
 
     if (result && result.length > 0) {
       const d: DocumentNoFormat = result[0];
-      const initNumber = d.nextNumber
-      const checker = await this.documentNumberChecker(appUser,doctype,d)
+      const initNumber = d.nextNumber;
+      const checker = await this.documentNumberChecker(appUser, doctype, d);
 
-      if(!checker.accept){
-        d.nextNumber = initNumber
-        const errdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);        
+      if (!checker.accept) {
+        d.nextNumber = initNumber;
+        const errdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
         throw new InternalServerErrorException(`Unique Key ${errdocno} conflict during request-multiple-number`);
       }
 
-
-      d.nextNumber=initNumber + checker.offset - 1 //offset will return >=1, we want start from 0
+      d.nextNumber = initNumber + checker.offset - 1; //offset will return >=1, we want start from 0
       const recordId = d._id;
-      for (let i = 0; i < quantity; i++) {        
+      for (let i = 0; i < quantity; i++) {
         const newdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
         documentNumbers.push(newdocno);
         d.nextNumber++;
       }
       const updatedata = { nextNumber: d.nextNumber } as DocumentNoFormat;
-      const options = process.env.BlockGenerateDocNumberWithSession ? {} : { session: appUser.getDBSession(), };
+      const options = process.env.BlockGenerateDocNumberWithSession ? {} : { session: appUser.getDBSession() };
       const updateresult = await this.docformat.findByIdAndUpdate(recordId, updatedata, options);
-      appUser.addTransactionStep('update','documentnoformat',[recordId],[result[0]])
+      appUser.addTransactionStep('update', 'documentnoformat', [recordId], [result[0]]);
       return documentNumbers;
     } else {
       throw new BadRequestException(`No active document number found for ${doctype}. Please update in Settings > Document Numbering Format`);
     }
   }
 
-  applyIsolationFilter (appUser:UserContext, filter:any, docType:string){
-    const docMeta = this.getDocumentMeta(docType)
-    if(docMeta.isolationType===IsolationType.tenant) {
-      filter['tenantId'] = appUser.tenantId
+  applyIsolationFilter(appUser: UserContext, filter: AnyObject, docType: string) {
+    const docMeta = this.getDocumentMeta(docType);
+    if ((docMeta.isolationType as IsolationType) === IsolationType.tenant) {
+      filter['tenantId'] = appUser.tenantId;
     }
-    if(docMeta.isolationType===IsolationType.org) {
-      filter['tenantId'] = appUser.tenantId
-      filter['orgId'] = appUser.orgId
+    if ((docMeta.isolationType as IsolationType) === IsolationType.org) {
+      filter['tenantId'] = appUser.tenantId;
+      filter['orgId'] = appUser.orgId;
     }
-    if(docMeta.isolationType===IsolationType.branch) {
-      filter['tenantId'] = appUser.tenantId
-      filter['orgId'] = appUser.orgId
-      filter['branchId'] = appUser.branchId
+    if ((docMeta.isolationType as IsolationType) === IsolationType.branch) {
+      filter['tenantId'] = appUser.tenantId;
+      filter['orgId'] = appUser.orgId;
+      filter['branchId'] = appUser.branchId;
     }
-      
-    return filter
-  }
-
 
-  async documentNumberChecker(appUser:UserContext,docType:string,docFormat:DocumentNoFormat){
+    return filter;
+  }
 
-    const docMeta = this.getDocumentMeta(docType)
-    const collectionName = docMeta.docName.toLowerCase()
+  async documentNumberChecker(appUser: UserContext, docType: string, docFormat: DocumentNoFormat) {
+    const docMeta = this.getDocumentMeta(docType);
+    const collectionName = docMeta.docName.toLowerCase();
     const collection = this.docformat.db.collection(collectionName);
-    const codeField = docMeta.uniqueKey 
-    let newdocno = ''
+    const codeField = docMeta.uniqueKey;
+    let newdocno = '';
     let attempt = 0;
     let accept = false;
     // console.log("run documentNumberChecker")
-    for (attempt = 0; attempt < 10; attempt++) {      
-      newdocno = SimpleAppDocumentNoFormatService.previewDocNo(docFormat);        
-      const tmpFilter = { [codeField]: newdocno}
-      const filter = this.applyIsolationFilter(appUser, tmpFilter,docType)
+    for (attempt = 0; attempt < 10; attempt++) {
+      newdocno = SimpleAppDocumentNoFormatService.previewDocNo(docFormat);
+      const tmpFilter = { [codeField]: newdocno };
+      const filter = this.applyIsolationFilter(appUser, tmpFilter, docType);
       // console.log("filter",filter)
       const existDoc = await collection.findOne(filter);
-      docFormat.nextNumber += 1
+      docFormat.nextNumber += 1;
       if (existDoc) {
         continue;
       }
-      accept=true;
+      accept = true;
       // console.log('accepted at attempt=',attempt)
-      break;      
+      break;
     }
     // console.log('finally attempt',attempt+1)
-    return Promise.resolve({accept:accept,offset:attempt+1, newDocNo:newdocno})
+    return Promise.resolve({ accept: accept, offset: attempt + 1, newDocNo: newdocno });
   }
 }

package/templates/nest/src/simple-app/_core/features/profile/profile.controller.ts.eta

@@ -33,7 +33,7 @@ export class ProfileController {
   @ApiResponse({ status: 401, type: Object, description: 'Undefine profile' })
   async getProfile(@AppUser() appUser: UserContext) {
     this.logger.debug(`access getProfile API by ${appUser.getUid()},(${appUser.getId()})`);
-    const result = await this.profileservice.getProfile(appUser);
+    const result = (await this.profileservice.getProfile(appUser)) as UserContextInfo;
     // this.logger.debug('getProfile result is:');
     // this.logger.debug(result);
     if (result) {

package/templates/nest/src/simple-app/_core/features/profile/profile.schema.ts.eta

@@ -96,7 +96,7 @@ export class UserContextInfo {
   branchInfo: Branch;
 
   @ApiProperty({ type: () => Object, description: 'Store all the rest of useful fields regarding user or branch' })
-  moreProps?: Record<string, any>;
+  moreProps?: Record<string, unknown>;
 
   @ApiProperty({ type: () => TenantHealth, required: false })
   tenantHealth?: TenantHealth;
@@ -139,7 +139,7 @@ export class ProfileUserBranch {
   @ApiProperty({ type: String })
   xOrg: string;
   @ApiProperty({ type: Object, required: false })
-  organization?: any;
+  organization?: Record<string, unknown>;
 }
 
 export class TenantPermission {

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

@@ -1,6 +1,7 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { ApiProperty } from '@nestjs/swagger';
 import { JSONSchema7 } from 'json-schema';
+import { PipelineStage } from 'mongoose';
 import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
 
 export class ModifiedCollection {
@@ -18,12 +19,14 @@ export class DocNumberFormatResult {
 }
 
 export class SearchBody {
-  filter?: object;
+  filter?: PipelineStage.Match['$match'];
 
-  fields?: any[];
+  fields?: PipelineStage.Project['$project'];
+
+  sorts?: PipelineStage.Sort['$sort'];
+
+  lookup?: PipelineStage.Lookup['$lookup'];
 
-  sorts?: any[];
-  lookup?: object;
   pagination?: {
     pageSize?: number;
     pageNo?: number;
@@ -39,22 +42,6 @@ export enum IsolationType {
 export class MoreProjectionType {
   [key: string]: string;
 }
-export class ApiEvent {
-  _id: string;
-  created: string;
-  updated?: string;
-  duration: number;
-  createdBy: string;
-  path: string;
-  ip: string;
-  method: string;
-  headers: any;
-  data?: any;
-  statusCode: number;
-  status: string;
-  errMsg?: string;
-  errData?: any;
-}
 
 export class DeleteResultType<T> {
   data: T;
@@ -70,6 +57,7 @@ export class DocumentStatus {
   readOnly: boolean;
   actions: string[]; //api name ['confirm','revert','close','void' and etc]
 }
+
 export enum RESTMethods {
   'post' = 'post',
   'get' = 'get',
@@ -126,14 +114,21 @@ export class ForeignKey {
   @Field()
   @ApiProperty({ type: () => String })
   _id?: string;
+
   @Field()
   @ApiProperty({ type: () => String })
   code?: string;
+
   @Field()
   @ApiProperty({ type: () => String })
   label?: string;
-  [key: string]: any;
+
+  // ! DO NOT use an index signature on your own schemas. ForeignKey is intentionally strict — only
+  // ! `_id`, `code`, and `label` are allowed. For fields with extra dynamic properties, extend this
+  // ! class or use the appropriate XxxAutoComplete type instead.
+  // [key: string]: any;
 }
+
 export class MyForeignKey {
   [collectionname: string]: string[];
 }
@@ -141,6 +136,9 @@ export class MyForeignKey {
 export class NoParam {}
 
 export class DynamicParam {
+  // ! `any` is intentional here. DynamicParam represents a fully open key-value map where both
+  // ! the keys and value types are unknown at compile time. Do not use this class for typed fields.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [key: string]: any;
 }
 
@@ -163,7 +161,6 @@ export class SchemaFields {
   updatedBy?: string;
   __v?: number;
   documentStatus?: string;
-  [key: string]: any; //SimpleAppJSONSchema7 | SimpleAppJSONSchema7[] | undefined;
 }
 
 export class SimpleAppJSONSchema7 implements JSONSchema7 {
@@ -177,7 +174,18 @@ export class BranchPermission extends Permission {
   branch: ForeignKey;
 }
 
-export type StepData = { action: string; collection: string; id: string[]; data: any[] };
+export type StepData = {
+  action: string;
+
+  collection: string;
+
+  id: string[];
+
+  // ! `any[]` is intentional here. Each step in a SAGA transaction can carry data from any
+  // ! MongoDB collection, so the shape is not known until runtime.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  data: any[];
+};
 
 export type DocumentDictEntry = {
   docName: string;

package/templates/nest/src/simple-app/_core/framework/simple-app.interceptor.ts.eta

@@ -4,13 +4,13 @@
  * last change 2023-03-17
  * Author: Ks Tan
  */
+import { ApiEvent } from '@core-features/log/schemas';
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { InjectConnection, InjectModel } from '@nestjs/mongoose';
+import type { Response as ExpressResponse } from 'express';
 import { Connection, Model } from 'mongoose';
-import { Observable } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 import { UserContext } from '../features/user-context/user.context';
-import { ApiEvent } from './schemas';
 import { SimpleAppDbRevertService } from './simple-app-db-revert.service';
 @Injectable()
 export class SimpleAppInterceptor implements NestInterceptor {
@@ -20,40 +20,32 @@ export class SimpleAppInterceptor implements NestInterceptor {
     private simpleAppDbRevertService: SimpleAppDbRevertService,
   ) {}
 
-  async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<any>> {
+  async intercept(context: ExecutionContext, next: CallHandler) {
     //not http request then exclude such as graphql
     if (context.getType() != 'http') {
       // obtain usersession here
-      return next.handle().pipe(
-        tap(async () => {
-          //console.log("none http, do nothing at interceptor")
-        }),
-      );
+      return next.handle().pipe(tap(() => {}));
     }
-    const req = context.switchToHttp().getRequest();
-    const resp = context.switchToHttp().getResponse();
+    const req = context.switchToHttp().getRequest<Request>();
+    const resp = context.switchToHttp().getResponse<ExpressResponse>();
     //console.log("want to get user session:", Object.keys(req))
 
     if (req.url == '/health') {
-      return next.handle().pipe(
-        tap(async () => {
-          //console.log("none http, do nothing at interceptor")
-        }),
-      );
+      return next.handle().pipe(tap(() => {}));
     }
 
-    const usersession: UserContext = req['sessionuser'];
+    const usersession = req['sessionuser'] as UserContext;
     //console.log("after read user session:",usersession)
     const method = req['method'];
     const headers = { ...req['headers'] };
-    const ip = req['ip'];
+    const ip = req['ip'] as string;
     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;
+      session['runCount'] = (session['runCount'] as number) + 1;
     }
     usersession.setDBSession(session);
     // const session: ClientSession = usersession.getDBSession();
@@ -83,8 +75,10 @@ export class SimpleAppInterceptor implements NestInterceptor {
     return next.handle().pipe(
       map((data) => {
         if (data && typeof data === 'object' && 'pagination' in data && 'items' in data) {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           return data;
         }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return data;
       }),
       catchError(async (err, caught) => {
@@ -97,20 +91,29 @@ export class SimpleAppInterceptor implements NestInterceptor {
         }
 
         const responseBody = {
+          // eslint-disable-next-line
           message: err.message,
           timestamp: new Date().toISOString(),
           path: url,
-          error: err.options,
+          // eslint-disable-next-line
+          error: err.options as object,
         };
 
+        // eslint-disable-next-line
         eventObj.statusCode = err.status;
+        // eslint-disable-next-line
         eventObj.errMsg = responseBody.message;
         eventObj.data = req.body;
         eventObj.status = 'NG';
         eventObj.errData = responseBody.error;
-        resp.status(err?.status ?? 500);
+
+        resp.status(
+          // eslint-disable-next-line
+          err?.status ?? 500,
+        );
         return responseBody;
       }),
+      // eslint-disable-next-line
       tap(async () => {
         // console.log("============interceptor tap",method,url)
         const endtime = new Date();

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

@@ -72,6 +72,7 @@ export default NuxtAuthHandler({
                 token.accessToken = account.access_token;
                 token.refreshToken = account.refresh_token;
                 token.expiresAt = account.expires_at;
+                token.idToken = account.id_token;
                 return token;
               }
             

package/templates/nuxt/server/api/auth/logout.ts.eta

@@ -4,14 +4,27 @@
  * last change 2024-02-23
  * Author: Ks Tan
  */
+import { getToken } from '#auth';
+
 export default defineEventHandler(async (event) => {
-    const path = `${
-        process.env.OAUTH2_CONFIGURL
-    }/protocol/openid-connect/logout?redirect_uri=${encodeURIComponent(
-        process.env.AUTH_ORIGIN ?? ""
-    )}`;
+    const token = await getToken({ event });
+    const idToken = token?.idToken as string | undefined;
+
+    // NOTE: AUTH_ORIGIN is encoded but intentionally without trailing slash —
+    // the logout composable appends the encoded path (e.g. %2Flogin%3F...) directly
+    // so Keycloak decodes the full absolute URL: https://origin/login?callbackUrl=...
+    // id_token_hint is required in Keycloak 18+ to skip the logout confirmation page.
+    // post_logout_redirect_uri MUST be last — the logout composable appends the
+    // encoded path directly to this string (e.g. %2Flogin%3FcallbackUrl%3D...)
+    // so it becomes part of the redirect URI value, not a new param.
+    let path = `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/logout`
+        + `?client_id=${encodeURIComponent(process.env.OAUTH2_CLIENTID ?? '')}`;
 
-    return {
-        path: path
+    if (idToken) {
+        path += `&id_token_hint=${encodeURIComponent(idToken)}`;
     }
+
+    path += `&post_logout_redirect_uri=${encodeURIComponent(process.env.AUTH_ORIGIN ?? '')}`;
+
+    return { path };
 });

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

@@ -4,165 +4,173 @@
  * last change 2024-02-23
  * Author: Ks Tan
  */
-
-import { getServerSession } from "#auth";
-import axios from "axios";
+ 
+import axios from 'axios';
 import fs from "node:fs";
-import { pathJoin } from "~/server/utils/path";
+import { getServerSession } from '#auth'
+import type { Session } from 'next-auth';
+import { pathJoin } from '~/server/utils/path';
+
+export default defineEventHandler(async (event:any) => {
+    type additionalprops = {accessToken?:string} 
+    let session:any=null
+    // console.log("profile api-------------------------")
+    
+    try {
+        session = await getServerSession(event)
+        
+    } catch (error) {
+        return sendRedirect(event, '/login', 401)
+    }
+    if(!session) {
+        return sendRedirect(event, "/login", 302);
+     }
+    return new Promise<any>(async (resolve, reject) => {
+        
+        const seperateSymbol = '.';
+        const documentLink = event.context.params?._ ?? ''
+        const accessToken = session?.accessToken;
+        let forwardData: any = {};
+
+        const req = event.node.req;
+
+        if (!accessToken || typeof accessToken !== "string") {
+            return sendRedirect(event, "/login", 302);
+        }
 
-export default defineEventHandler(async (event: any) => {
-  type additionalprops = { accessToken?: string };
-  let session: any = null;
-  // console.log("profile api-------------------------")
+        if(req.method == 'POST' || req.method == 'PUT'  || req.method == 'PATCH') {
 
-  try {
-    session = await getServerSession(event);
-  } catch (error) {
-    return sendRedirect(event, "/login", 302);
-  }
-  if (!session) {
-    return sendRedirect(event, "/login", 302);
-  }
-  return new Promise<any>(async (resolve, reject) => {
-    const seperateSymbol = ".";
-    const documentLink = event.context.params?._ ?? "";
-    const accessToken = session?.accessToken;
-    let forwardData: any = {};
+            forwardData = await readBody(event);
+        } else {
+            forwardData = getQuery(event);
+        }
 
-    const req = event.node.req;
+        // if(typeof forwardData === "object" && "_branch" in forwardData) {
+        //     xOrg = xOrg + forwardData._branch;
+        //     delete forwardData._branch;
+        // }
+
+        const frontEndRes = event.node.res;
+
+        const url =  process.env.SIMPLEAPP_BACKEND_URL + `/profile/${documentLink}`;
+        // console.warn('backend server-----',req.method,url,forwardData)
+
+        
+        const axiosConfig: any = {
+            method: req.method,
+            url: url,
+            headers: {
+                Authorization: `Bearer ${accessToken}`,
+            },
+            data: forwardData,
+            params: forwardData,
+        }
 
-    if (!accessToken || typeof accessToken !== "string") {
-      return sendRedirect(event, "/login", 302);
-    }
+        if(documentLink=='avatar' ){
+            axiosConfig.url = pathJoin([useRuntimeConfig().public.imageUrl, documentLink]);
+            delete axiosConfig.params
+        }
+        // console.log("axiosConfig",axiosConfig)
+        // if(key === 'system') {
+        //     axiosConfig.headers["X-Global"] = true;
+        //     delete axiosConfig.headers["X-Org"];
+        // }
+
+        // if(otherLink.includes('avatar')) {
+        //     axiosConfig.responseType = 'arraybuffer';
+        //     // axiosConfig.headers['Acceptable'] = 'text/html,image/avif,image/webp,image/apng';
+        // }
+
+        axios(axiosConfig).then((res) => {
+            // console.log("RRes",res)
+            if (res.headers['content-type'] === 'image/png') {
+                // Set the response headers for the image
+                frontEndRes.setHeader('Content-Type', 'image/png');
+                frontEndRes.setHeader('Content-Disposition', 'inline');
+
+                // Send the image data as the response body
+                frontEndRes.end(Buffer.from(res.data, 'binary'));
+            }else if(documentLink.includes('images/')){
+                // console.log(documentLink," Resdata of base64 photo",res.data.length)
+                let imageData
+                frontEndRes.setHeader('Content-Type', 'image/png');
+                
+                // console.log("load image for",documentLink)
+                if( res.data.length){
+                    // console.log("obtain base64 from server length:",res.data.length)
+                    imageData = base64ToBuffer(res.data);
+                    
+                }else{
+                    // console.log("server no image, use default image")
+                    const folder = 'public/images/'
+                    let filename = ''
+                    if(documentLink.includes('student')) filename='student.png';
+                    else if(documentLink.includes('teacher')) filename='teacher.png';                    
+                    else if(documentLink.includes('organization')) filename='organization.png';
+                    else  filename='unknown.png';
+                    const fullpath = folder+filename;
+                    // console.log("photo path",fullpath)
+                    if(fs.existsSync(fullpath)){
+                        imageData = fs.readFileSync(fullpath)
+                    }else{
+                        console.log(fullpath,'does not exists')
+                    }                    
+                }
+                 frontEndRes.end(Buffer.from(imageData, 'binary'));                                
+                
+            } else {
+                // For non-image responses, set the Content-Type header and send the response body
+                // setHeader(event, 'Content-type', <string>res.headers['Content-Type']);
 
-    if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH") {
-      forwardData = await readBody(event);
-    } else {
-      forwardData = getQuery(event);
-    }
+                frontEndRes.statusCode = res.status;
+                if(res.statusText) {
+                    frontEndRes.statusMessage = res.statusText;
+                }
 
-    // if(typeof forwardData === "object" && "_branch" in forwardData) {
-    //     xOrg = xOrg + forwardData._branch;
-    //     delete forwardData._branch;
-    // }
-
-    const frontEndRes = event.node.res;
-
-    const url = process.env.SIMPLEAPP_BACKEND_URL + `/profile/${documentLink}`;
-    // console.warn('backend server-----',req.method,url,forwardData)
-
-    const axiosConfig: any = {
-      method: req.method,
-      url: url,
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-      data: forwardData,
-      params: forwardData,
-    };
-
-    if (documentLink == "avatar") {
-      axiosConfig.url = pathJoin([
-        useRuntimeConfig().public.imageUrl,
-        documentLink,
-      ]);
-      delete axiosConfig.params;
-    }
-    // console.log("axiosConfig",axiosConfig)
-    // if(key === 'system') {
-    //     axiosConfig.headers["X-Global"] = true;
-    //     delete axiosConfig.headers["X-Org"];
-    // }
-
-    // if(otherLink.includes('avatar')) {
-    //     axiosConfig.responseType = 'arraybuffer';
-    //     // axiosConfig.headers['Acceptable'] = 'text/html,image/avif,image/webp,image/apng';
-    // }
-
-    axios(axiosConfig)
-      .then((res) => {
-        // console.log("RRes",res)
-        if (res.headers["content-type"] === "image/png") {
-          // Set the response headers for the image
-          frontEndRes.setHeader("Content-Type", "image/png");
-          frontEndRes.setHeader("Content-Disposition", "inline");
-
-          // Send the image data as the response body
-          frontEndRes.end(Buffer.from(res.data, "binary"));
-        } else if (documentLink.includes("images/")) {
-          // console.log(documentLink," Resdata of base64 photo",res.data.length)
-          let imageData;
-          frontEndRes.setHeader("Content-Type", "image/png");
-
-          // console.log("load image for",documentLink)
-          if (res.data.length) {
-            // console.log("obtain base64 from server length:",res.data.length)
-            imageData = base64ToBuffer(res.data);
-          } else {
-            // console.log("server no image, use default image")
-            const folder = "public/images/";
-            let filename = "";
-            if (documentLink.includes("student")) filename = "student.png";
-            else if (documentLink.includes("teacher")) filename = "teacher.png";
-            else if (documentLink.includes("organization"))
-              filename = "organization.png";
-            else filename = "unknown.png";
-            const fullpath = folder + filename;
-            // console.log("photo path",fullpath)
-            if (fs.existsSync(fullpath)) {
-              imageData = fs.readFileSync(fullpath);
-            } else {
-              console.log(fullpath, "does not exists");
+                resolve(res.data);
             }
-          }
-          frontEndRes.end(Buffer.from(imageData, "binary"));
-        } else {
-          // For non-image responses, set the Content-Type header and send the response body
-          // setHeader(event, 'Content-type', <string>res.headers['Content-Type']);
-
-          frontEndRes.statusCode = res.status;
-          if (res.statusText) {
-            frontEndRes.statusMessage = res.statusText;
-          }
 
-          resolve(res.data);
-        }
-      })
-      .catch((error) => {
-        if (!error?.response) {
-          console.log("backend server no response ", error.code);
-          reject({
-            statusMessage: "backendServerDownMessage",
-            statusCode: 503,
-          });
-        } else {
-          if (error.response?.status && error.response.status == 401) {
-            return sendRedirect(event, "/login", 302);
-          }
-          reject({
-            statusMessage: error.response.statusText,
-            statusCode: error.response.status,
-            data: error.response.data,
-          }); // resolve({ status: 'ok' })
-          // throw createError({ statusMessage: 'Bad Requests', statusCode: 404 })
-        }
-      });
-
-    // resolve({
-    //     status: 'ok'
-    // })
-  });
-});
-
-function base64ToBuffer(base64String: string) {
-  // Split the base64 string into parts
-  const parts = base64String.split(",");
-  const contentType = parts[0].split(":")[1];
-  const base64Data = parts[1];
-
-  // Decode the base64 data
-  const binaryString = atob(base64Data);
-  const buffer = new Buffer.from(binaryString, "binary");
-
-  return buffer;
-}
+        }).catch((error) => {
+            if(!error?.response){
+                console.log("backend server no response ",error.code)              
+                reject({ 
+                    statusMessage:"backendServerDownMessage",
+                    statusCode: 503,                    
+                });            
+            }else{
+
+                if (error.response?.status && error.response.status == 401) {
+                    // rejecting would bubble a 401 into the client and often renders the Nuxt error page.
+                    // Instead, end the request with a redirect so the browser can enter the login flow.
+                    return sendRedirect(event, "/login", 401);
+                }
+                reject({ 
+                    statusMessage: error.response.statusText, 
+                    statusCode: error.response.status ,
+                    data: error.response.data
+                });            // resolve({ status: 'ok' })
+                // throw createError({ statusMessage: 'Bad Requests', statusCode: 404 })
+            }
+        })
+
+        // resolve({
+        //     status: 'ok'
+        // })
+    })
+    
+})
+
+
+
+function base64ToBuffer(base64String:string) {
+    // Split the base64 string into parts
+    const parts = base64String.split(',');
+    const contentType = parts[0].split(':')[1];
+    const base64Data = parts[1];
+  
+    // Decode the base64 data
+    const binaryString = atob(base64Data);
+    const buffer = new Buffer.from(binaryString, 'binary');
+  
+    return buffer
+  }