@simitgroup/simpleapp-generator 1.6.4-g-alpha → 1.6.6-b-alpha

package/ReleaseNote.md

@@ -1,3 +1,10 @@
+[1.6.6b-alpha]
+1. add missing customkeycloak guard
+
+
+[1.6.6a-alpha]
+1. fix simpleapp generated frontend lib bugs
+
 [1.6.5g]
 1. change simpleapp document controller use document name instead of document type
 2. allow use header x-apikey(match env X_APIKEY), x-apisecret (match env X_APISECRET), to by pass access token. which will use robotuser in user context

package/package.json

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

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -34,7 +34,7 @@ export type {
 
     } from '../openapi'
 
-export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.typename%>,openapi.<%= it.doctype.toUpperCase()%>Api>{
+export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<openapi.<%= capitalizeFirstLetter(it.name)%>,openapi.<%= it.name.toUpperCase()%>Api>{
   public readonly schema= <%~ JSON.stringify(it.jsonschema) %> as SchemaType;
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityName='<%~ it.autocompletename %>'  
@@ -49,7 +49,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
     }
 
     //const apipath = `${useRuntimeConfig().public.API_URL}/${xorg}`    
-    //const apiobj = new <%= it.doctype.toUpperCase()%>Api(undefined,apipath,$axios)
+    //const apiobj = new <%= it.name.toUpperCase()%>Api(undefined,apipath,$axios)
     const apiobj = getDocumentApi('<%=it.name %>')
     super(apiobj,'<%= it.doctype %>','<%=it.name %>')
     this.event=$event

package/templates/nest/src/simpleapp/generate/apischemas/simpleapp.apischema.ts.eta

@@ -15,6 +15,11 @@ export class ApiKeyValuePair {
   })
   field1: any;
 }
+export class SortItem {
+
+}
+
+
 export class ApiSearchBody {
   @ApiProperty({
     type: Object,
@@ -31,12 +36,21 @@ export class ApiSearchBody {
   })
   fields?: string[];
   @ApiProperty({
-    type: () => [[String]],
-    required: false,
-    examples: ['[[ "field1", "asc" ]]'],
-    default: [['field1', 'asc']],
+        type: 'array',
+        required: false,
+        items:{
+                type: 'array',
+                items:{
+                  type:'string'
+                }
+        },      
+        examples: ['[[ "field1", "asc" ]]'],
+        default: [['field1', 'asc']],     
   })
+  
   sorts?: string[][];
+
+
   @ApiProperty({ type: () => Object, required: false })
   lookup: Object;
 }

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

@@ -0,0 +1,51 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * 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-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
+      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/processors/simpleapp.processor.ts.eta

@@ -628,7 +628,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       // }
       // this.logger.debug('warn2');
       if (this.hooks.beforeUpdate)
-        await this.hooks.beforeUpdate(appuser, id,  existingdata,data);
+        await this.hooks.beforeUpdate(appuser, id, existingdata, data);
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
@@ -691,7 +691,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     data.__v = existingdata.__v + 1;
 
     if (this.hooks.beforeUpdate)
-      await this.hooks.beforeUpdate(appuser, id,existingdata, data);
+      await this.hooks.beforeUpdate(appuser, id, existingdata, data);
 
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
@@ -1058,7 +1058,8 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     collections.forEach((tokey: string) => {
       const toarr = tokey.split('.');
       const to = toarr[0];
-      const foreignField = toarr[1] ?? '_id';
+      toarr.splice(0,1)
+      const foreignField = toarr.join('.') ?? '_id';
       pipelines.push({
         $lookup: {
           from: to,
@@ -1083,7 +1084,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       });
       pipelines.push({ $sort: sortobj });
     }
-    // console.log('pipelinespipelinespipelines', pipelines);
+    this.logger.warn( pipelines,'pipelinespipelinespipelines',);
 
     return pipelines;
   }

package/templates/nuxt/composables/getOpenApi.generate.ts.eta

@@ -39,7 +39,7 @@ export const getDocumentApi = (documentName: string): any => {
   const config = getAxiosConfig()
   const docsOpenapi: any = {
        <% for(let i=0;i<it.modules.length; i++){ %>
-                '<%=it.modules[i].docname.toLowerCase()%>': new o.<%=it.modules[i].doctype.toUpperCase()%>Api(config),                
+                '<%=it.modules[i].docname.toLowerCase()%>': new o.<%=it.modules[i].docname.toUpperCase()%>Api(config),                
               <%}%>                             
     };
 

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -24,7 +24,7 @@ type crudType = {
   runDelete: Function;
   runSearch: Function;
   runDefault:Function;
-  runFullTextSearch:Function;
+  runFullTextSearch?:Function;
 };
 export class SimpleAppClient<
   TData extends { _id?: string,created?:string },