npm - @simitgroup/simpleapp-generator - Versions diffs - 1.0.24 → 1.0.27 - Mend

@simitgroup/simpleapp-generator 1.0.24 → 1.0.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/dist/framework.js +22 -12
package/dist/framework.js.map +1 -1
package/package.json +1 -1
package/src/framework.ts +23 -14
package/templates/basic/model.eta +2 -1
package/templates/nest/TenantMiddleware.eta +28 -19
package/templates/nest/User.eta +106 -71
package/templates/nest/app.module.eta +36 -2
package/templates/nest/nest.env.eta +15 -1
package/templates/nest/nest.main.eta +13 -4
package/templates/nest/oauth2-redirect.eta +79 -0
package/templates/nuxt/components.crudsimple.vue.eta +1 -2
package/templates/nuxt/composables.getautocomplete.ts.eta +12 -7
package/templates/nuxt/composables.getmenus.ts.eta +21 -10
package/templates/nuxt/env.eta +11 -1
package/templates/nuxt/nuxt.config.ts.eta +9 -8
package/templates/nuxt/pages.[xorg].index.vue.eta +19 -0
package/templates/nuxt/pages.index.vue.eta +9 -1
package/templates/nuxt/pages.login.vue.eta +20 -0
package/templates/nuxt/plugins.simpleapp.ts.eta +2 -3
package/templates/nuxt/server.api.auth.logout.ts.eta +12 -0
package/templates/nuxt/server.api.auth[...].ts.eta +233 -0
package/templates/nuxt/server.api.ts.eta +19 -14

package/dist/framework.js CHANGED Viewed

@@ -41,6 +41,14 @@ let config = {
     "frontendFolder": "./myfrontend",
     "frontendPort": "8080",
     "openapi3Yaml": "../openapi.yaml",
+    "keycloaksetting": {
+        "OAUTH2_BASEURL": "https://keycloak-server-url/",
+        "OAUTH2_REALM": "realm-name",
+        "OAUTH2_CONFIGURL": "https://keycloak-server-url/realms/realm-name",
+        "OAUTH2_CLIENTID": "client-id",
+        "OAUTH2_CLIENTSECRET": "client-secret-value",
+        "AUTH_SECRET_KEY": "my-secret",
+    }
 };
 const setConfiguration = (paraconfig) => {
     config = paraconfig;
@@ -81,18 +89,18 @@ const prepareNest = (callback) => {
     const targetfolder = config.backendFolder;
     log.info(`creating backend project ${targetfolder}`);
     if (!fs_1.default.existsSync(`${targetfolder}/.env`)) {
-        (0, child_process_1.exec)(`cd ${targetfolder};pnpm install --save axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats @nestjs/config`, async (error, stdout, stderr) => {
+        (0, child_process_1.exec)(`cd ${targetfolder};pnpm install --save nest-keycloak-connect keycloak-connect @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats @nestjs/config`, async (error, stdout, stderr) => {
             // log.info(`dependency installed`)
             if (!error) {
+                fs_1.default.mkdirSync(`${targetfolder}/public_html`, { recursive: true });
                 const eta = new eta_1.Eta({ views: constants.templatedir });
-                const variables = {
-                    backendPort: config.backendPort,
-                    mongoConnectStr: config.mongoConnectStr
-                };
+                const variables = config;
                 const txtEnv = eta.render('./nest/nest.env.eta', variables);
                 const txtMain = eta.render('./nest/nest.main.eta', variables);
+                const txtRedirectHtml = eta.render('./nest/oauth2-redirect.eta', variables);
                 fs_1.default.writeFileSync(`${targetfolder}/.env`, txtEnv);
                 fs_1.default.writeFileSync(`${targetfolder}/src/main.ts`, txtMain);
+                fs_1.default.writeFileSync(`${targetfolder}/public_html/oauth2-redirect.html`, txtRedirectHtml);
                 const tsconfigpath = process.cwd() + '/' + `${targetfolder}/tsconfig.json`;
                 const tsconfig = require(tsconfigpath);
                 tsconfig.compilerOptions.esModuleInterop = true;
@@ -118,22 +126,20 @@ const prepareNuxt = (callback) => {
     const targetfolder = config.frontendFolder;
     if (!fs_1.default.existsSync(`${targetfolder}/.env`)) {
         //asume no environment. prepare now
-        (0, child_process_1.exec)(`cd ${targetfolder};pnpm install;pnpm install -D @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier `, (error, stdout, stderr) => {
+        (0, child_process_1.exec)(`cd ${targetfolder};pnpm install;pnpm install -D @sidebase/nuxt-auth @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier `, (error, stdout, stderr) => {
             //;pnpm install
             console.log(error, stdout, stderr);
-            (0, child_process_1.exec)(`cd ${targetfolder};pnpm install --save  @darkwolf/base64url @nuxt/ui ajv dotenv @fullcalendar/core @fullcalendar/vue3 quill uuid ajv-formats primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr) => {
+            (0, child_process_1.exec)(`cd ${targetfolder};pnpm install --save next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv dotenv @fullcalendar/core @fullcalendar/vue3 quill uuid ajv-formats primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr) => {
                 console.log(error, stdout, stderr);
                 fs_1.default.mkdirSync(`${targetfolder}/assets/css/`, { recursive: true });
                 fs_1.default.mkdirSync(`${targetfolder}/layouts`, { recursive: true });
                 fs_1.default.mkdirSync(`${targetfolder}/components`, { recursive: true });
                 fs_1.default.mkdirSync(`${targetfolder}/server/api/[xorg]`, { recursive: true });
-                fs_1.default.mkdirSync(`${targetfolder}/pages`, { recursive: true });
+                fs_1.default.mkdirSync(`${targetfolder}/server/api/auth`, { recursive: true });
+                fs_1.default.mkdirSync(`${targetfolder}/pages/[xorg]`, { recursive: true });
                 fs_1.default.mkdirSync(`${targetfolder}/plugins`, { recursive: true });
                 const eta = new eta_1.Eta({ views: `${constants.templatedir}/nuxt` });
-                const variables = {
-                    backendPort: config.backendPort,
-                    frontendPort: config.frontendPort
-                };
+                const variables = config;
                 const writes = {
                     './app.vue.eta': 'app.vue',
                     './components.eventmonitor.vue.eta': 'components/EventMonitor.vue',
@@ -142,8 +148,12 @@ const prepareNuxt = (callback) => {
                     './components.debugdocdata.vue.eta': 'components/DebugDocumentData.vue',
                     './layouts.default.vue.eta': 'layouts/default.vue',
                     './server.api.ts.eta': 'server/api/[xorg]/[...].ts',
+                    './server.api.auth.logout.ts.eta': 'server/api/auth/logout.ts',
+                    './server.api.auth[...].ts.eta': 'server/api/auth/[...].ts',
                     './nuxt.config.ts.eta': 'nuxt.config.ts',
                     './pages.index.vue.eta': 'pages/index.vue',
+                    './pages.[xorg].index.vue.eta': 'pages/[xorg]/index.vue',
+                    './pages.login.vue.eta': 'pages/login.vue',
                     './plugins.simpleapp.ts.eta': 'plugins/simpleapp.ts',
                     './tailwind.config.ts.eta': 'tailwind.config.ts',
                     './tailwind.css.eta': 'assets/css/tailwind.css',

package/dist/framework.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"framework.js","sourceRoot":"","sources":["../src/framework.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,iDAAwC;AACxC,iCAAwC;AACxC,sDAAuC;AACvC,6BAA0B;AAC1B,MAAM,GAAG,GAAoB,IAAI,cAAM,EAAE,CAAC;AAE1C,IAAI,MAAM,GAAG;IACT,mBAAmB,EAAC,eAAe;IACnC,eAAe,EAAC,aAAa;IAC7B,aAAa,EAAC,MAAM;IACpB,iBAAiB,EAAC,kEAAkE;IACpF,gBAAgB,EAAC,cAAc;IAC/B,cAAc,EAAC,MAAM;IACrB,cAAc,EAAC,iBAAiB;~~CACnC~~,CAAA;AAEM,MAAM,gBAAgB,GAAC,CAAC,UAAU,EAAC,EAAE;IACxC,MAAM,GAAC,UAAU,CAAA;AACrB,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B;AACD,2BAA2B;AACpB,MAAM,aAAa,GAAE,CAAC,QAAiB,EAAE,EAAE;IAC9C,MAAM,aAAa,GAAC,MAAM,CAAC,aAAa,CAAA;IACxC,IAAG,CAAC,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAC;QAC7B,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,KAAK,EAAC,CAAC,SAAS,EAAC,IAAI,EAAC,MAAM,EAAE,aAAa,EAAE,qCAAqC,EAAE,MAAM,CAAC,EAC/F,EAAG,KAAK,EAAE,SAAS,GAAE,CAAC,CAAA;QACtC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAC,CAAC,QAAQ,EAAC,EAAE;YACzB,MAAM,MAAM,GAAG,IAAA,qBAAK,EAAC,MAAM,EAAC,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAC,EAAG,KAAK,EAAE,SAAS,EAAC,CAAC,CAAA;YACtF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAC,CAAC,QAAQ,EAAC,EAAE;gBAC1B,QAAQ,EAAE,CAAA;YACd,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;KACL;SAAI;QACD,QAAQ,EAAE,CAAA;KACb;AACL,CAAC,CAAA;AAdY,QAAA,aAAa,iBAczB;AACD,2BAA2B;AACpB,MAAM,aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE;IAC/C,MAAM,cAAc,GAAC,MAAM,CAAC,cAAc,CAAA;IAC1C,IAAG,CAAC,YAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAC;QAC9B,MAAM,MAAM,GAAG,IAAA,qBAAK,EAAC,KAAK,EAAC,CAAC,aAAa,EAAC,MAAM,EAAC,cAAc,CAAC,EAAC,EAAG,KAAK,EAAE,SAAS,GAAE,CAAC,CAAA;QACvF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAC,CAAC,QAAQ,EAAC,EAAE;YAC1B,QAAQ,EAAE,CAAA;QACd,CAAC,CAAC,CAAA;KACL;SAAI;QACD,QAAQ,EAAE,CAAA;KACb;AACL,CAAC,CAAA;AAVY,QAAA,aAAa,iBAUzB;AAEM,MAAM,WAAW,GAAG,CAAC,QAAiB,EAAC,EAAE;IAC5C,MAAM,YAAY,GAAE,MAAM,CAAC,aAAa,CAAA;IACxC,GAAG,CAAC,IAAI,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAA;IACpD,IAAG,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,YAAY,OAAO,CAAC,EAAC;QAGtC,IAAA,oBAAI,EAAC,MAAM,YAAY,~~iKAAiK~~,EAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE;~~YACpN~~,mCAAmC;YACnC,IAAG,CAAC,KAAK,EAAC;~~gBAEN~~,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,EAAC,KAAK,EAAE,SAAS,CAAC,WAAW,EAAC,CAAC,CAAC;gBACpD,MAAM,SAAS,GAAC~~;oBACZ~~,~~WAAW~~,~~EAAC~~,MAAM,~~CAAC~~,~~WAAW;oBAC9B~~,~~eAAe~~,~~EAAC~~,MAAM,CAAC,~~eAAe;iBACzC~~,~~CAAA~~;~~gBACD~~,MAAM,~~MAAM~~,GAAG,GAAG,CAAC,MAAM,CAAC,~~qBAAqB~~,EAAE,SAAS,CAAC,CAAC;~~gBAC5D~~,MAAM,~~OAAO~~,GAAG,GAAG,CAAC,MAAM,CAAC,~~sBAAsB~~,EAAE,SAAS,CAAC,CAAC;~~gBAE9D~~,YAAE,CAAC,aAAa,CAAC,GAAG,YAAY,OAAO,EAAE,MAAM,CAAC,CAAC;gBACjD,YAAE,CAAC,aAAa,CAAC,GAAG,YAAY,cAAc,EAAE,OAAO,CAAC,CAAC;gBACzD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,GAAC,GAAG,GAAC,GAAG,YAAY,gBAAgB,CAAA;gBACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;gBACtC,QAAQ,CAAC,eAAe,CAAC,eAAe,GAAC,IAAI,CAAA;gBAC7C,QAAQ,CAAC,eAAe,CAAC,iBAAiB,GAAC,IAAI,CAAA;gBAC/C,YAAE,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEzD,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;gBAClC,QAAQ,EAAE,CAAA;aAEb;iBAAK;gBACN,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACjB,MAAM,KAAK,CAAA;aACV;QACL,CAAC,CAAC,CAAA;KACL;SAAI;QACD,GAAG,CAAC,IAAI,CAAC,GAAG,YAAY,2CAA2C,CAAC,CAAA;QACpE,QAAQ,EAAE,CAAA;KACb;AACL,CAAC,CAAA;~~AAtCY~~,QAAA,WAAW,~~eAsCvB~~;AACD,8CAA8C;AACvC,MAAM,WAAW,GAAG,CAAC,QAAiB,EAAC,EAAE;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAA;IAC1C,IAAG,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,YAAY,OAAO,CAAC,EAAC;QACtC,mCAAmC;QACnC,IAAA,oBAAI,EAAC,MAAM,YAAY,~~0HAA0H~~,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE;~~YACxK~~,mBAAmB;YACnB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;YAC9B,IAAA,oBAAI,EAAC,MAAM,YAAY,~~qOAAqO~~,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE;~~gBACvR~~,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;gBAElC,YAAE,CAAC,SAAS,CAAC,GAAG,YAAY,cAAc,EAAC,EAAC,SAAS,EAAC,IAAI,EAAC,CAAC,CAAA;gBAC5D,YAAE,CAAC,SAAS,CAAC,GAAG,YAAY,UAAU,EAAC,EAAC,SAAS,EAAC,IAAI,EAAC,CAAC,CAAA;gBACxD,YAAE,CAAC,SAAS,CAAC,GAAG,YAAY,aAAa,EAAC,EAAC,SAAS,EAAC,IAAI,EAAC,CAAC,CAAA;gBAC3D,YAAE,CAAC,SAAS,CAAC,GAAG,YAAY,oBAAoB,EAAC,EAAC,SAAS,EAAC,IAAI,EAAC,CAAC,CAAA;gBAClE,YAAE,CAAC,SAAS,CAAC,GAAG,YAAY,~~QAAQ~~,EAAC,EAAC,SAAS,EAAC,IAAI,EAAC,CAAC,CAAA;~~gBACtD~~,YAAE,CAAC,SAAS,CAAC,GAAG,YAAY,UAAU,EAAC,EAAC,SAAS,EAAC,IAAI,EAAC,CAAC,CAAA;gBACxD,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,EAAC,KAAK,EAAE,GAAG,SAAS,CAAC,WAAW,OAAO,EAAC,CAAC,CAAC;gBAC9D,MAAM,SAAS,GAAC~~;oBACZ~~,~~WAAW,EAAC,~~MAAM,~~CAAC,WAAW;oBAC9B,YAAY,EAAC,MAAM,CAAC,YAAY;iBACnC,~~CAAA;~~gBACD~~,MAAM,MAAM,GAAG;oBACX,eAAe,EAAC,SAAS;oBACzB,mCAAmC,EAAC,6BAA6B;oBACjE,4BAA4B,EAAC,sBAAsB;oBACnD,iCAAiC,EAAC,2BAA2B;oBAC7D,mCAAmC,EAAC,kCAAkC;oBACtE,2BAA2B,EAAC,qBAAqB;oBACjD,qBAAqB,EAAC,4BAA4B;oBAClD,sBAAsB,EAAC,gBAAgB;oBACvC,uBAAuB,EAAC,iBAAiB;oBACzC,4BAA4B,EAAC,sBAAsB;oBACnD,0BAA0B,EAAC,oBAAoB;oBAC/C,oBAAoB,EAAC,yBAAyB;oBAC9C,WAAW,EAAC,MAAM;iBACrB,CAAA;gBAED,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;gBACpD,KAAI,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,SAAS,CAAC,MAAM,EAAC,CAAC,EAAE,EAAC;oBAChC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;oBAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;oBACjC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBAC5C,MAAM,IAAI,GAAE,GAAG,YAAY,IAAI,QAAQ,EAAE,CAAA;oBACzC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAC,IAAI,CAAC,CAAA;oBACzB,YAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;iBAC/B;gBAED,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;gBAClC,QAAQ,EAAE,CAAA;YACV,CAAC,CAAC,CAAA;QAEN,CAAC,CAAC,CAAA;KACT;SAAI;QACD,0BAA0B;QAC1B,QAAQ,EAAE,CAAA;KACb;AACL,CAAC,CAAA;~~AAxDY~~,QAAA,WAAW,~~eAwDvB~~;AAEM,MAAM,UAAU,GAAG,GAAE,EAAE;IAC1B,IAAA,oBAAI,EAAC,MAAM,MAAM,CAAC,cAAc,8DAA8D,CAAC,CAAA;AAEnG,CAAC,CAAA;AAHY,QAAA,UAAU,cAGtB;AACM,MAAM,UAAU,GAAG,GAAE,EAAE;IAC1B,IAAA,oBAAI,EAAC,MAAM,MAAM,CAAC,aAAa,iBAAiB,CAAC,CAAA;AACrD,CAAC,CAAA;AAFY,QAAA,UAAU,cAEtB;AAEM,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACrC,IAAA,oBAAI,EAAC,qCAAqC,MAAM,CAAC,YAAY,OAAO,MAAM,CAAC,cAAc,6DAA6D,CAAC,CAAA;AAC3J,CAAC,CAAA;AAFY,QAAA,oBAAoB,wBAEhC"}
1	+ {"version":3,"file":"framework.js","sourceRoot":"","sources":["../src/framework.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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

package/src/framework.ts CHANGED Viewed

@@ -13,6 +13,14 @@ let config = {
     "frontendFolder":"./myfrontend",
     "frontendPort":"8080",
     "openapi3Yaml":"../openapi.yaml",
+    "keycloaksetting":{
+        "OAUTH2_BASEURL":"https://keycloak-server-url/",
+        "OAUTH2_REALM":"realm-name",
+        "OAUTH2_CONFIGURL":"https://keycloak-server-url/realms/realm-name",
+        "OAUTH2_CLIENTID":"client-id",
+        "OAUTH2_CLIENTSECRET":"client-secret-value",
+        "AUTH_SECRET_KEY":"my-secret",
+    }
 }
 export const setConfiguration=(paraconfig)=>{
@@ -53,20 +61,19 @@ export const prepareNest = (callback:Function)=>{
     if(!fs.existsSync(`${targetfolder}/.env`)){
-        exec(`cd ${targetfolder};pnpm install --save axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats @nestjs/config`,async (error, stdout, stderr)=>{
+        exec(`cd ${targetfolder};pnpm install --save nest-keycloak-connect keycloak-connect @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats @nestjs/config`,async (error, stdout, stderr)=>{
             // log.info(`dependency installed`)
             if(!error){
+                fs.mkdirSync(`${targetfolder}/public_html`,{recursive:true})
                 const eta = new Eta({views: constants.templatedir});
-                const variables={
-                    backendPort:config.backendPort,
-                    mongoConnectStr:config.mongoConnectStr
-                }
+                const variables=config
                 const txtEnv = eta.render('./nest/nest.env.eta', variables);
                 const txtMain = eta.render('./nest/nest.main.eta', variables);
+                const txtRedirectHtml = eta.render('./nest/oauth2-redirect.eta', variables);
                 fs.writeFileSync(`${targetfolder}/.env`, txtEnv);
                 fs.writeFileSync(`${targetfolder}/src/main.ts`, txtMain);
+                fs.writeFileSync(`${targetfolder}/public_html/oauth2-redirect.html`, txtRedirectHtml);
                 const tsconfigpath = process.cwd()+'/'+`${targetfolder}/tsconfig.json`
                 const tsconfig = require(tsconfigpath)
                 tsconfig.compilerOptions.esModuleInterop=true
@@ -91,23 +98,21 @@ export const prepareNuxt = (callback:Function)=>{
     const targetfolder = config.frontendFolder
     if(!fs.existsSync(`${targetfolder}/.env`)){
         //asume no environment. prepare now
-        exec(`cd ${targetfolder};pnpm install;pnpm install -D @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier `, (error, stdout, stderr)=>{
+        exec(`cd ${targetfolder};pnpm install;pnpm install -D @sidebase/nuxt-auth @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier `, (error, stdout, stderr)=>{
             //;pnpm install
             console.log(error, stdout, stderr)
-                exec(`cd ${targetfolder};pnpm install --save  @darkwolf/base64url @nuxt/ui ajv dotenv @fullcalendar/core @fullcalendar/vue3 quill uuid ajv-formats primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{
+                exec(`cd ${targetfolder};pnpm install --save next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv dotenv @fullcalendar/core @fullcalendar/vue3 quill uuid ajv-formats primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{
                 console.log(error, stdout, stderr)
                 fs.mkdirSync(`${targetfolder}/assets/css/`,{recursive:true})
                 fs.mkdirSync(`${targetfolder}/layouts`,{recursive:true})
                 fs.mkdirSync(`${targetfolder}/components`,{recursive:true})
                 fs.mkdirSync(`${targetfolder}/server/api/[xorg]`,{recursive:true})
-                fs.mkdirSync(`${targetfolder}/pages`,{recursive:true})
+                fs.mkdirSync(`${targetfolder}/server/api/auth`,{recursive:true})
+                fs.mkdirSync(`${targetfolder}/pages/[xorg]`,{recursive:true})
                 fs.mkdirSync(`${targetfolder}/plugins`,{recursive:true})
                 const eta = new Eta({views: `${constants.templatedir}/nuxt`});
-                const variables={
-                    backendPort:config.backendPort,
-                    frontendPort:config.frontendPort
-                }
+                const variables=config
                 const writes = {
                     './app.vue.eta':'app.vue',
                     './components.eventmonitor.vue.eta':'components/EventMonitor.vue',
@@ -116,11 +121,15 @@ export const prepareNuxt = (callback:Function)=>{
                     './components.debugdocdata.vue.eta':'components/DebugDocumentData.vue',
                     './layouts.default.vue.eta':'layouts/default.vue',
                     './server.api.ts.eta':'server/api/[xorg]/[...].ts',
+                    './server.api.auth.logout.ts.eta':'server/api/auth/logout.ts',
+                    './server.api.auth[...].ts.eta':'server/api/auth/[...].ts',
                     './nuxt.config.ts.eta':'nuxt.config.ts',
                     './pages.index.vue.eta':'pages/index.vue',
+                    './pages.[xorg].index.vue.eta':'pages/[xorg]/index.vue',
+                    './pages.login.vue.eta':'pages/login.vue',
                     './plugins.simpleapp.ts.eta':'plugins/simpleapp.ts',
                     './tailwind.config.ts.eta':'tailwind.config.ts',
-                    './tailwind.css.eta':'assets/css/tailwind.css',
+                    './tailwind.css.eta':'assets/css/tailwind.css',
                     './env.eta':'.env',
                 }

package/templates/basic/model.eta CHANGED Viewed

@@ -23,9 +23,10 @@ const schemasetting = {
     <% }else if( schema[key].type == 'array'){%>
       <%= key %>: [{type: <%= schema[key].item.type %>, required:false}]  //basic array
     <% }else{%>
-      <%= key %>: {type: <%= capitalizeFirstLetter(schema[key].type) %>, required:false},  //field
+      <%= key %>: {type: <%= capitalizeFirstLetter(schema[key].type) %>, required: <% if(key==it.autocompletecode || key==it.autocompletename){%>true<%}else{%>false<%}%>},  //field
     <% } %>
   <%}) %>
 };
 export const <%= it.doctype %>MongoSchema = new Schema(schemasetting,{collection: '<%= it.name %>'})
+.index({<%=it.autocompletecode%>:1,orgId:1},{unique:true});

package/templates/nest/TenantMiddleware.eta CHANGED Viewed

@@ -1,30 +1,39 @@
-import { Injectable, NestMiddleware,Scope } from '@nestjs/common';
+import { Injectable, NestMiddleware, Scope } from '@nestjs/common';
 import { Request, Response, NextFunction } from 'express';
-import {User} from './User'
+// import * as jwt from 'nestjs-jwt'
+import { User } from './User';
+// import {KeycloakConfigService} from "../keycloak/keycloak.service"
 @Injectable({
-    scope: Scope.REQUEST
+  scope: Scope.REQUEST,
 })
 export class TenantMiddleware implements NestMiddleware {
   use(req: Request, res: Response, next: NextFunction) {
-    req.headers['x-org']
-    if(req.headers['x-org']){
-        const u =  User.getInstance()
-        try{
-            u.setXorg(req.headers['x-org'].toString())
-            u.setUser('user1')
-            //console.log(u.getInfo())
-            // u.uid='user1'
-            next();
-        }catch{
-            return res.status(401).send("Invalid x-org or user info")
-        }
-    }else{
-        return res.status(401).send("undefine header string x-org")
+    if (req.baseUrl == '/oauth2-redirect.html') {
+      next();
+      return ;
+    }
+    if(!req.headers['authorization']){
+      return res.status(401).send('Undefine bearer token');
+    }
+    if (!req.headers['x-org']){
+      return res.status(401).send('undefine header string x-org');
+    }
+    const u = User.getInstance();
+    try {
+      u.setXorg(req.headers['x-org'].toString());
+      let tokenstr:string = req.headers['authorization']
+      tokenstr = tokenstr.replace("Bearer ",'')
+      u.setUserToken(tokenstr);
+      next();
+    } catch {
+      return res.status(401).send('Invalid x-org or user info');
     }
   }
 }

package/templates/nest/User.eta CHANGED Viewed

@@ -1,80 +1,115 @@
 import { Injectable, Scope } from '@nestjs/common';
-import Base64URL from '@darkwolf/base64url'
+import Base64URL from '@darkwolf/base64url';
+import  * as jwt from   'jsonwebtoken'
 @Injectable({
-    scope: Scope.REQUEST
+  scope: Scope.REQUEST,
 })
 export class User {
-    private static instance: User;
-    protected uid:string=''
-    protected uname:string=''
-    protected email:string=''
-    protected xOrg:string=''
-    protected tenantId:number=0
-    protected orgId:number=0
-    protected branchId:number=0
-    constructor() {}
-    public static getInstance(): User {
-        if (!User.instance) {
-            User.instance = new User();
-        }
-        return User.instance;
-    }
-    setUser = (uid:string)=>{
-        User.getInstance().uid=uid
-    }
-    getInfo=()=>{
-        return User.getInstance()
-    }
-    getBranchFilter=()=>{
-        return {
-            tenantId:User.getInstance().tenantId,
-            orgId: User.getInstance().orgId,
-            branchId:User.getInstance().branchId
-        }
-    }
-    getTenantFilter=()=>{
-        return {tenantId:User.getInstance().tenantId}
-    }
-    getOrgFilter=()=>{
-        return {tenantId:User.getInstance().tenantId,orgId: User.getInstance().orgId}
+  private static instance: User;
+  protected uid: string = '';
+  protected uname: string = '';
+  protected email: string = '';
+  protected fullname:string=''
+  protected xOrg: string = '';
+  protected tenantId: number = 0;
+  protected orgId: number = 0;
+  protected branchId: number = 0;
+  protected accessrights:any = {}
+  protected token:string = ''
+  protected refreshtoken:string = ''
+  constructor() {}
+  public static getInstance(): User {
+    if (!User.instance) {
+      User.instance = new User();
     }
+    return User.instance;
+  }
+  setUserToken = (tokenstr: string) => {
+    const tokeninfo = jwt.decode(tokenstr)
+    // realm_access: {
+      //   roles: [
+      //     'default-roles-simitdeveloper',
+      //     'offline_access',
+      //     'uma_authorization'
+      //   ]
+      // },
+      // resource_access: { account: { roles: [Array] } },
+      // scope: 'openid email profile',
+      // sid: '53192f53-d4af-413b-b8d7-1e186419fe53',
+      // email_verified: false,
+      // name: 'kstan kstan',
+      // preferred_username: 'kstan',
+      // given_name: 'kstan',
+      // family_name: 'kstan',
+      // email: 'kstan@simitgroup.com'
+    const u = User.getInstance()
+    u.token = tokenstr
+    u.uid = tokeninfo.sid;
+    u.email = tokeninfo.email
+    u.uname = tokeninfo.preferred_username
+    u.fullname = tokeninfo.name
+    u.accessrights = tokeninfo.resource_access
+  };
+  getInfo = () => {
+    return User.getInstance();
+  };
+  getBranchFilter = () => {
+    return {
+      tenantId: User.getInstance().tenantId,
+      orgId: User.getInstance().orgId,
+      branchId: User.getInstance().branchId,
+    };
+  };
+  getTenantFilter = () => {
+    return { tenantId: User.getInstance().tenantId };
+  };
+  getOrgFilter = () => {
+    return {
+      tenantId: User.getInstance().tenantId,
+      orgId: User.getInstance().orgId,
+    };
+  };
-    getCreateFilter=()=>{
-        const u = User.getInstance()
-        return {
-            tenantId:u.tenantId,
-            orgId: u.orgId,
-            branchId:u.branchId,
-            createdby: u.uid,
-            updatedby: u.uid,
-            created: new Date().getTime().toString(),
-            updated: new Date().getTime().toString()
-        }
-    }
-    getUpdateFilter=()=>{
-        const u = User.getInstance()
-        return {
-            updatedby: u.uid,
-            updated: new Date().getTime().toString()
-        }
-    }
-    setXorg = (xorg)=>{
-        try{
-            const decodedText:string = Base64URL.decodeText(xorg)
-            const arrXorg = decodedText.split('-')
-            if(arrXorg.length==3){
-                const u = User.getInstance()
-                u.tenantId = Number(arrXorg[0])
-                u.orgId = Number(arrXorg[1])
-                u.branchId = Number(arrXorg[2])
-            }else{
-                throw "invalid x-org"
-            }
-        }catch(err){
-            throw err
-        }
+  getCreateFilter = () => {
+    const u = User.getInstance();
+    return {
+      tenantId: u.tenantId,
+      orgId: u.orgId,
+      branchId: u.branchId,
+      createdby: u.uid,
+      updatedby: u.uid,
+      created: new Date().getTime().toString(),
+      updated: new Date().getTime().toString(),
+    };
+  };
+  getUpdateFilter = () => {
+    const u = User.getInstance();
+    return {
+      updatedby: u.uid,
+      updated: new Date().getTime().toString(),
+    };
+  };
+  setXorg = (xorg) => {
+    try {
+      const decodedText: string = Base64URL.decodeText(xorg);
+      const arrXorg = decodedText.split('-');
+      if (arrXorg.length == 3) {
+        const u = User.getInstance();
+        u.tenantId = Number(arrXorg[0]);
+        u.orgId = Number(arrXorg[1]);
+        u.branchId = Number(arrXorg[2]);
+      } else {
+        throw 'invalid x-org';
+      }
+    } catch (err) {
+      throw err;
     }
+  };
 }

package/templates/nest/app.module.eta CHANGED Viewed

@@ -1,6 +1,14 @@
 import { Module,MiddlewareConsumer,NestModule } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
+import { APP_GUARD } from '@nestjs/core';
+import {
+  AuthGuard, KeycloakConnectModule,
+  ResourceGuard,TokenValidation,
+  RoleGuard,PolicyEnforcementMode
+} from 'nest-keycloak-connect';
 import { ConfigModule } from '@nestjs/config';
+import { ServeStaticModule } from '@nestjs/serve-static';
+import { join } from 'path';
 import {TenantMiddleware} from './class/TenantMiddleware'
 <% for(let i=0;i<it.length; i++){ %>
 import {<%= it[i].docname %>Module} from './docs/<%= it[i].doctype %>/<%= it[i].doctype %>.module'
@@ -8,9 +16,35 @@ import {<%= it[i].docname %>Module} from './docs/<%= it[i].doctype %>/<%= it[i].
 @Module({
     //define environment variables: MONGODB_URL='mongodb://<user>:<pass>@<host>:<port>/<db>?authMechanism=DEFAULT'
-  imports: [ConfigModule.forRoot(),MongooseModule.forRoot(process.env.MONGODB_URL),<% for(let i=0;i<it.length; i++){ %><%= it[i].docname %>Module,<%}%>],
+  imports: [
+    ConfigModule.forRoot(),
+    MongooseModule.forRoot(process.env.MONGODB_URL),
+    ServeStaticModule.forRoot({
+      rootPath: join(__dirname, '..', 'public_html'),
+      exclude: ['/api/(.*)'],
+    }),
+    KeycloakConnectModule.register({
+      authServerUrl: process.env.OAUTH2_BASEURL,
+      realm: process.env.OAUTH2_REALM,
+      clientId: process.env.OAUTH2_CLIENTID,
+      secret: process.env.OAUTH2_CLIENTSECRET,
+      policyEnforcement: PolicyEnforcementMode.PERMISSIVE,
+      tokenValidation: TokenValidation.ONLINE,
+    }),
+    <% for(let i=0;i<it.length; i++){ %><%= it[i].docname %>Module,<%}%>],
   controllers: [],
-  providers: [],
+  providers: [ {
+    provide: APP_GUARD,
+    useClass: AuthGuard,
+  },
+  {
+    provide: APP_GUARD,
+    useClass: ResourceGuard,
+  },
+  {
+    provide: APP_GUARD,
+    useClass: RoleGuard,
+  },],
 })
 export class AppModule implements NestModule{
   configure(consumer: MiddlewareConsumer) {

package/templates/nest/nest.env.eta CHANGED Viewed

@@ -4,4 +4,18 @@ HTTP_PORT=<%=it.backendPort%>
 PROJECT_NAME=SimpleApp Demo1
 PROJECT_DESCRIPTION=Try CRUD
-PROJECT_Version=1.0.0
+PROJECT_Version=1.0.0
+OAUTH2_BASEURL=<%=it.keycloaksetting.OAUTH2_BASEURL%>
+OAUTH2_REALM=<%=it.keycloaksetting.OAUTH2_REALM%>
+OAUTH2_CONFIGURL=<%=it.keycloaksetting.OAUTH2_CONFIGURL%>
+OAUTH2_CLIENTID=<%=it.keycloaksetting.OAUTH2_CLIENTID%>
+OAUTH2_CLIENTSECRET=<%=it.keycloaksetting.OAUTH2_CLIENTSECRET%>
+AUTH_SECRET_KEY=<%=it.keycloaksetting.AUTH_SECRET_KEY%>
+AUTH_ORIGIN=http://localhost:8080

package/templates/nest/nest.main.eta CHANGED Viewed

@@ -9,14 +9,23 @@ async function bootstrap() {
     .setTitle(process.env.PROJECT_NAME)
     .setDescription(process.env.PROJECT_DESCRIPTION)
     .setVersion(process.env.PROJECT_VERSION)
-    .addApiKey({in:'header',name:'x-org',type:'apiKey',description:'base 64 url encode. example: MS0xLTE'},'x-org')
+    .addApiKey({
+        in: 'header',name: 'x-org',type: 'apiKey',description: 'base 64 url encode. example: MS0xLTE',
+      },'x-org',)
+    .addOAuth2({
+        name:'oauth2',in:'header',type:'oauth2',flows:{
+          implicit:{
+            authorizationUrl: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/auth`,
+            scopes:[],
+          }}},'oauth2')
     .addSecurityRequirements('x-org')
+    .addSecurityRequirements('oauth2')
     .build();
   const document = SwaggerModule.createDocument(app, config);
   SwaggerModule.setup('api', app, document, {
-    swaggerOptions: { showExtensions: true },
+    swaggerOptions: { showExtensions: true, persistAuthorization: true },
   });
-  await app.listen(process.env.HTTP_PORT ?? <%=it.backendPort%>); //listen which port
+  await app.listen(process.env.HTTP_PORT ?? 8000); //listen which port
 }
-bootstrap();
+bootstrap();

package/templates/nest/oauth2-redirect.eta ADDED Viewed

@@ -0,0 +1,79 @@
+<!doctype html>
+<html lang="en-US">
+<head>
+    <title>Swagger UI: OAuth2 Redirect</title>
+</head>
+<body>
+<script>
+    'use strict';
+    function run () {
+        var oauth2 = window.opener.swaggerUIRedirectOauth2;
+        var sentState = oauth2.state;
+        var redirectUrl = oauth2.redirectUrl;
+        var isValid, qp, arr;
+        if (/code|token|error/.test(window.location.hash)) {
+            qp = window.location.hash.substring(1).replace('?', '&');
+        } else {
+            qp = location.search.substring(1);
+        }
+        arr = qp.split("&");
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
+        qp = qp ? JSON.parse('{' + arr.join() + '}',
+                function (key, value) {
+                    return key === "" ? value : decodeURIComponent(value);
+                }
+        ) : {};
+        isValid = qp.state === sentState;
+        if ((
+          oauth2.auth.schema.get("flow") === "accessCode" ||
+          oauth2.auth.schema.get("flow") === "authorizationCode" ||
+          oauth2.auth.schema.get("flow") === "authorization_code"
+        ) && !oauth2.auth.code) {
+            if (!isValid) {
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "warning",
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
+                });
+            }
+            if (qp.code) {
+                delete oauth2.state;
+                oauth2.auth.code = qp.code;
+                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
+            } else {
+                let oauthErrorMsg;
+                if (qp.error) {
+                    oauthErrorMsg = "["+qp.error+"]: " +
+                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
+                        (qp.error_uri ? "More info: "+qp.error_uri : "");
+                }
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "error",
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
+                });
+            }
+        } else {
+            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
+        }
+        window.close();
+    }
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
+</script>
+</body>
+</html>

package/templates/nuxt/components.crudsimple.vue.eta CHANGED Viewed

@@ -47,7 +47,6 @@ const newData = () => {
 const triggerEdit = (event: any) => {
   let id = event.data._id.toString()
-  editRecord(event.data._id);
   router.push({ path: `${props.path}/${id}` })
 };
 const editRecord = (id:string) => {
@@ -95,7 +94,7 @@ refresh();
       <button class="bg-primary" @click="newData" v-tooltip="'Add new(ctrl+i)'" >New</button>
       <SimpleAppDatatable
             @row-dblclick="triggerEdit"
-            v-model="recordlist"
+            v-model="recordlist"
             :setting="{}"
             :columns="listColumns"
           >

package/templates/nuxt/composables.getautocomplete.ts.eta CHANGED Viewed

@@ -6,18 +6,23 @@
  */
 import * as o from "../simpleapp/openapi";
+import axios from 'axios'
 const getAutoComplete = (apiname: string): any => {
+  const { csrf } = useCsrf()
+  axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
+  const route = useRoute();
   const config: o.Configuration = {
-    basePath: useRuntimeConfig().public.APP_URL + "/api",
+    basePath: `${useRuntimeConfig().public.APP_URL}/api/${route.params.xorg}`,
     isJsonMime: () => true,
   };
   const docsOpenapi: any = {
-    <% for(let i=0;i<it.length; i++){ %>
-        <% let obj = it[i]%>
-        '<%=obj.docname.toLowerCase()%>' : new o.<%=obj.doctype.toUpperCase()%>Api(config),
-        <%}%>
-  };
+                    'category' : new o.CATApi(config),
+                        'leadtype' : new o.LEADTApi(config),
+                        'level' : new o.LVLApi(config),
+                        'product' : new o.PRDApi(config),
+                        'studentgroup' : new o.STGApi(config),
+          };
   if (!docsOpenapi[apiname]) {
     console.error(
       `api for '${apiname}' does not exists, most probably define wrong x-foreignkey`,

package/templates/nuxt/composables.getmenus.ts.eta CHANGED Viewed

@@ -4,13 +4,24 @@
  * last change 2023-09-10
  * author: Ks Tan
  */
-export const getMenus =(xorg:string)=>[
-  {label: 'Cruds',icon: 'pi pi-fw pi-pencil',items:[
-  <% for(let i=0;i<it.length; i++){ %>
-    <% let obj = it[i]%>
-    {label: '<%=obj.docname.toLowerCase()%>', to:`/${xorg}/<%=obj.docname.toLowerCase()%>`},
-  <%}%>
-]},
-  {label: 'Profile',icon: 'pi pi-fw pi-user'},
-]
+export const getMenus =()=>{
+  const route = useRoute();
+  const xorg = route.params.xorg
+  let data =[];
+  if(xorg){
+    data =[
+      {label: 'Home',icon: 'pi pi-fw pi-home', url:'/'},
+      {label: 'Cruds',icon: 'pi pi-fw pi-pencil',items:[
+               <% for(let i=0;i<it.length; i++){ %>
+                <% let obj = it[i]%>
+                {label: '<%=obj.docname.toLowerCase()%>', to:`/${xorg}/<%=obj.docname.toLowerCase()%>`},
+              <%}%>
+      ]},
+    ]
+  }else{
+    data= [{label: 'Home',icon: 'pi pi-fw pi-home', url:'/'},]
+  }
+  return data
+}

package/templates/nuxt/env.eta CHANGED Viewed

@@ -4,4 +4,14 @@ SIMPLEAPP_BACKEND_URL=http://localhost:<%=it.backendPort%>
 APP_URL=http://localhost:<%=it.frontendPort%>
-DEBUGDATA=1
+DEBUGDATA=1
+OAUTH2_CONFIGURL=<%=it.keycloaksetting.OAUTH2_CONFIGURL%>
+OAUTH2_CLIENTID=<%=it.keycloaksetting.OAUTH2_CLIENTID%>
+OAUTH2_CLIENTSECRET=<%=it.keycloaksetting.OAUTH2_CLIENTSECRET%>
+AUTH_SECRET_KEY=<%=it.keycloaksetting.AUTH_SECRET_KEY%>
+AUTH_ORIGIN=http://localhost:<%=it.frontendPort%>

package/templates/nuxt/nuxt.config.ts.eta CHANGED Viewed

@@ -19,19 +19,19 @@ tailwindcss: {
     // Options
   },
   modules: [
-//    '@sidebase/nuxt-auth',
-    "nuxt-security",
+    '@sidebase/nuxt-auth',
+    "nuxt-security",
     '@vueuse/nuxt',
     '@nuxt/ui'
-    //'@nuxtjs/tailwindcss',  //use @nuxt/ui own tailwind
-    // '@nuxtjs/color-mode'
   ],
-  ssr: true,
+  auth: {
+    globalAppMiddleware: true
+  },
   security: {
-    csrf: true,
+    //csrf: true,   // been force to off csrf cash it crash with nuxt-auth
   },
+  ssr: true,
   css: [
     "primevue/resources/themes/lara-light-blue/theme.css",
     'primeicons/primeicons.css'
@@ -41,5 +41,6 @@ tailwindcss: {
                 transpile: ["primevue"]
         },
 })

package/templates/nuxt/pages.[xorg].index.vue.eta ADDED Viewed

@@ -0,0 +1,19 @@
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * You may modify it for your need
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+ </script>
+<template>
+  <div>
+  <h1>index page</h1>
+  <ul>
+    <li><NuxtLink :external="true" to="/MS0xLTE" >MS0xLTE (1-1-1)</NuxtLink></li>
+    <li><NuxtLink :external="true" to="/Mi0yLTI" >Mi0yLTI (2-2-2)</NuxtLink></li>
+  </ul>
+  </div>
+</template>

package/templates/nuxt/pages.index.vue.eta CHANGED Viewed

@@ -7,5 +7,13 @@
  */
  </script>
 <template>
-  <div>index page</div>
+  <div>
+  <h1>index page</h1>
+  <ul>
+    <li><NuxtLink :external="true" to="/MS0xLTE" >MS0xLTE (1-1-1)</NuxtLink></li>
+    <li><NuxtLink :external="true" to="/Mi0yLTI" >Mi0yLTI (2-2-2)</NuxtLink></li>
+  </ul>
+  </div>
 </template>

package/templates/nuxt/pages.login.vue.eta ADDED Viewed

@@ -0,0 +1,20 @@
+<template>
+    <NuxtPage />
+</template>
+<script setup lang="ts">
+definePageMeta({
+    name: 'Login',
+    auth: false,
+})
+// const route = useRoute();
+const { signIn } = useAuth()
+onMounted(async () => {
+    let callbackUrl = '/';
+    // if(route.params.redirect) {
+    //     callbackUrl = <string>route.params.redirect;
+    // }
+    await signIn('keycloak', { callbackUrl: callbackUrl })
+})
+</script>

package/templates/nuxt/plugins.simpleapp.ts.eta CHANGED Viewed

@@ -40,9 +40,8 @@ const emitter = mitt()
 export default defineNuxtPlugin((nuxtApp) => {
-  const { csrf } = useCsrf()
-  axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
+    const { csrf } = useCsrf()
+    axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
     nuxtApp.vueApp.use(PrimeVue, { ripple: true });
     nuxtApp.vueApp
     .component("SimpleAppAutocomplete",SimpleAppAutocomplete)

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

@@ -0,0 +1,12 @@
+// give keycloak for
+export default defineEventHandler(async (event) => {
+    const path = `${
+        process.env.OAUTH2_CONFIGURL
+    }/protocol/openid-connect/logout?redirect_uri=${encodeURIComponent(
+        process.env.AUTH_ORIGIN ?? ""
+    )}`;
+    return {
+        path: path
+    }
+});

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

@@ -0,0 +1,233 @@
+import { NuxtAuthHandler } from "#auth";
+import KeycloakProvider from "next-auth/providers/keycloak";
+import type { JWT } from "next-auth/jwt";
+// import GithubProvider from "next-auth/providers/github";
+export default NuxtAuthHandler({
+    secret: process.env.AUTH_SECRET_KEY,
+    jwt: {
+        maxAge: 60 * 60 * 24 * 30,
+    },
+    providers: [
+        // GithubProvider.default({
+        //     clientId: process.env.GITHUB_ID ?? '',
+        //     clientSecret: process.env.GITHUB_SECRET ?? '',
+        // }),
+        // @ts-expect-error
+        KeycloakProvider.default({
+            clientId: process.env.OAUTH2_CLIENTID ?? "",
+            clientSecret: process.env.OAUTH2_CLIENTSECRET ?? "",
+            issuer: process.env.OAUTH2_CONFIGURL,
+            idToken: true,
+            scheme: "oauth2",
+            endpoints: {
+                authorization: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/auth`,
+                userInfo: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/userinfo`,
+                token: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/token`,
+                logout:
+                    `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/logout?redirect_uri=` +
+                    encodeURIComponent(String(process.env.APP_URL)),
+            },
+            // accessTokenUrl: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/token`,
+            // requestTokenUrl: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/token`,
+            // profileUrl: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/userinfo`,
+            token: {
+                property: "access_token",
+                type: "Bearer",
+                name: "Authorization",
+                maxAge: 60 * 60 * 24,
+            },
+            refreshToken: {
+                property: "refresh_token",
+                maxAge: 60 * 60 * 24 * 30,
+            },
+            responseType: "code",
+            grantType: "authorization_code",
+            scope: ["openid", "profile", "email"],
+            codeChallengeMethod: "S256",
+            redirect: {
+                logout: "/",
+                callback: "/",
+                home: "/",
+            },
+        }),
+    ],
+    pages: {
+        signIn: "/login",
+    },
+    callbacks: {
+        // async redirect({ url, baseUrl }) {
+        //     console.log(url, baseUrl)
+        //     return baseUrl
+        // },
+        async jwt({ token, account }) {
+            // Persist the OAuth access_token to the token right after signin
+            if (account) {
+                token.accessToken = account.access_token;
+            }
+            return token;
+        },
+        async session({ session, token, user }) {
+            // console.log("session", session);
+            // Send properties to the client, like an access_token from a provider.
+            session.accessToken = <string>token.accessToken;
+            return session;
+        },
+        /*async jwt({ token, account, user }) {
+            // Persist the OAuth access_token to the token right after signin
+            console.log("token", token);
+            console.log("account", account);
+            console.log("user", user);
+            // Initial sign in
+            if (account && user) {
+                // Add access_token, refresh_token and expirations to the token right after signin
+                token.accessToken = account.accessToken;
+                token.refreshToken = account.refreshToken;
+                token.accessTokenExpired =
+                    Date.now() + (account.expires_in - 15) * 1000;
+                token.refreshTokenExpired =
+                    Date.now() + (account.refresh_expires_in - 15) * 1000;
+                token.user = user;
+                return token;
+            }
+            // Return previous token if the access token has not expired yet
+            if (Date.now() < token.accessTokenExpired) return token;
+            // Access token has expired, try to update it
+            return refreshAccessToken(token);
+            // if (account) {
+            //     // Save the access token and refresh token in the JWT on the initial login
+            //     token.accessToken = account.access_token;
+            //     return {
+            //         access_token: account.access_token,
+            //         expires_at: Math.floor(
+            //             Date.now() / 1000 + account.expires_in
+            //         ),
+            //         refresh_token: account.refresh_token,
+            //     };
+            // } else if (Date.now() < token.expires_at * 1000) {
+            //     // If the access token has not expired yet, return it
+            //     return token;
+            // } else {
+            //     // If the access token has expired, try to refresh it
+            //     try {
+            //         // ${process.env.OAUTH2_CONFIGURL}/.well-known/openid-configuration
+            //         // We need the `token_endpoint`.
+            //         const response = await fetch(
+            //             `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/token`,
+            //             {
+            //                 headers: {
+            //                     "Content-Type":
+            //                         "application/x-www-form-urlencoded;charset=UTF-8",
+            //                 },
+            //                 body: new URLSearchParams({
+            //                     client_id: process.env.OAUTH2_CLIENTID ?? "",
+            //                     client_secret:
+            //                         process.env.OAUTH2_CLIENTSECRET ?? "",
+            //                     grant_type: "refresh_token",
+            //                     refresh_token: <string>token.refresh_token,
+            //                 }),
+            //                 method: "POST",
+            //             }
+            //         );
+            //         const tokens: any = await response.json();
+            //         if (!response.ok) throw tokens;
+            //         return {
+            //             ...token, // Keep the previous token properties
+            //             access_token: tokens.access_token,
+            //             expires_at: Math.floor(
+            //                 Date.now() / 1000 + tokens.expires_in
+            //             ),
+            //             // Fall back to old refresh token, but note that
+            //             // many providers may only allow using a refresh token once.
+            //             refresh_token:
+            //                 tokens.refresh_token ?? token.refresh_token,
+            //         };
+            //     } catch (error) {
+            //         console.error("Error refreshing access token", error);
+            //         // The error property will be used client-side to handle the refresh token error
+            //         return {
+            //             ...token,
+            //             error: "RefreshAccessTokenError" as const,
+            //         };
+            //     }
+            // }
+            return token;
+        },
+        async session({ session, token, user }) {
+            if (token) {
+                session.error = <string>token.error;
+                session.accessToken = <string>token.accessToken;
+            }
+            return session;
+        }, */
+    },
+});
+/* const refreshAccessToken = async (token: JWT) => {
+    try {
+        if (Date.now() > token.refreshTokenExpired) throw Error;
+        const details = {
+            client_id: process.env.OAUTH2_CLIENTID,
+            client_secret: process.env.OAUTH2_CLIENTSECRET,
+            grant_type: ["refresh_token"],
+            refresh_token: token.refreshToken,
+        };
+        const formBody: string[] = [];
+        Object.entries(details).forEach(([key, value]: [string, any]) => {
+            const encodedKey = encodeURIComponent(key);
+            const encodedValue = encodeURIComponent(value);
+            formBody.push(encodedKey + "=" + encodedValue);
+        });
+        const formData = formBody.join("&");
+        const url = `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/token`;
+        const response = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type":
+                    "application/x-www-form-urlencoded;charset=UTF-8",
+            },
+            body: formData,
+        });
+        const refreshedTokens = await response.json();
+        if (!response.ok) throw refreshedTokens;
+        return {
+            ...token,
+            accessToken: refreshedTokens.access_token,
+            accessTokenExpired:
+                Date.now() + (refreshedTokens.expires_in - 15) * 1000,
+            refreshToken: refreshedTokens.refresh_token ?? token.refreshToken,
+            refreshTokenExpired:
+                Date.now() + (refreshedTokens.refresh_expires_in - 15) * 1000,
+        };
+    } catch (error) {
+        console.log('receive', error)
+        return {
+            ...token,
+            error: "RefreshAccessTokenError",
+        };
+    }
+}; */
+// import NextAuth from "next-auth"
+// import KeycloakProvider from 'next-auth/providers/keycloak'
+// export const authOptions = {
+//   // Configure one or more authentication providers
+//   providers: [
+//     KeycloakProvider({
+//         clientId: process.env.OAUTH2_CLIENTID,
+//             clientSecret: process.env.OAUTH2_CLIENTSECRET,
+//             issuer: process.env.OAUTH2_CONFIGURL,
+//     }),
+//   ],
+// }
+// export default NextAuth(authOptions)

package/templates/nuxt/server.api.ts.eta CHANGED Viewed

@@ -7,22 +7,27 @@
 import axios from 'axios';
-// import { getServerSession } from '#auth'
-// import type { Session } from 'next-auth';
+import { getServerSession } from '#auth'
+import type { Session } from 'next-auth';
 export default defineEventHandler(async (event) => {
-    // let session: Session | null = null
-    // try {
-    //     session = await getServerSession(event)
-    // } catch (error) {
-    //     return sendRedirect(event, '/login', 401)
-    // }
+    type additionalprops = {accessToken?:string}
+    let session:any=null
+    try {
+        session = await getServerSession(event)
+    } catch (error) {
+        return sendRedirect(event, '/login', 401)
+    }
     return new Promise<any>(async (resolve, reject) => {
-        // if(!session || !session.accessToken) {
-            // reject({ statusMessage: 'Unauthorized', statusCode: 401 });
-            // throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
-        // }
+        if(!session) {
+        //if(!session || !session.accessToken) {
+            reject({ statusMessage: 'Unauthorized', statusCode: 401 });
+            throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
+        }
         // console.log("------hihi------")
         const seperateSymbol = '.';
         // const seperateSymbol = '&';
@@ -32,7 +37,7 @@ export default defineEventHandler(async (event) => {
         // console.error("event.context???",event.context)
-        // const accessToken = session?.accessToken;
+        const accessToken = session?.accessToken;
         // const allowPlatform = ['report-api', 'cloudapi'];
         // if(!key || !platform || !allowPlatform.includes(platform) || !accessToken) {
@@ -75,7 +80,7 @@ export default defineEventHandler(async (event) => {
             method: req.method,
             url: url,
             headers: {
-        //         Authorization: `Bearer ${accessToken}`,
+                Authorization: `Bearer ${accessToken}`,
                 'X-Org': xOrg,
             },
             data: forwardData,