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

package/templates/nuxt/plugins/10.simpleapp-event.ts.eta

@@ -4,113 +4,123 @@
  * last change 2025-10-25
  * Author: Ks Tan
  */
-import DialogService from 'primevue/dialogservice';
 import { defineNuxtPlugin } from "#app";
-import axios, { Axios, AxiosResponse } from 'axios'
-import {Notification,EventType} from '~/types'
+import axios from "axios";
+import { EventType } from "~/types";
 // import PrimeVue from "primevue/config";
-import mitt from 'mitt'
+import mitt from "mitt";
 import { useConfirm } from "primevue/useconfirm";
-import { useDialog } from 'primevue/usedialog';
+import { useDialog } from "primevue/usedialog";
 
 // import ToastService from 'primevue/toastservice';
 // import ConfirmationService from 'primevue/confirmationservice';
 // import Tooltip from 'primevue/tooltip';
-const emitter = mitt<EventType>()
-export default defineNuxtPlugin( async(nuxtApp) => {
-    //hide __NUXT__ at client side.
-    onNuxtReady(()=>{
-      window.__NUXT__ = undefined;
-    })
-    // useNuxtApp().vueApp.use(DialogService)
-    //const { csrf } = useCsrf()    
-    //axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
-    const myaxios = axios.create({timeout:10000})
-    myaxios.interceptors.response.use(
-      (response) => {        
-        return  response
-      }, 
-      (error) => {
-        // console.log("error catch",error)
+const emitter = mitt<EventType>();
+export default defineNuxtPlugin(async (nuxtApp) => {
+  //hide __NUXT__ at client side.
+  onNuxtReady(() => {
+    window.__NUXT__ = undefined;
+  });
+  // useNuxtApp().vueApp.use(DialogService)
+  //const { csrf } = useCsrf()
+  //axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
+  const myaxios = axios.create({ timeout: 10000 });
+  myaxios.interceptors.response.use(
+    (response) => {
+      return response;
+    },
+    (error) => {
+      // console.log("error catch",error)
 
-        if(error?.code && error.code == 'ERR_BAD_REQUEST'){
-          if (error.response && (error.response.status == 401 || error.response.status == 302)) {
-            return Promise.reject(error);
-          } else if(error.response && error.response.status==403){
-            console.warn("error status 403, redirect to external link /" )
-            navigateTo('/',{external:true})
-          }else{
-            console.error("axios ERR_BAD_REQUEST",error)
-            let errorMsg=''
-            let errorCode=0
-            let moreMsg = ''
-            if(error.response?.data?.data?.message){
-              errorCode = error.response.data.data.status
-              moreMsg = error.response.data.data.message
-              errorMsg = error.response.data.data.name
-            }else if(error.response?.data){
-              errorCode = error.response.data.statusCode
-              moreMsg = error.response.data.statusMessage
-              errorMsg = error.response.data.message
-            }else{
-              errorCode = error.status
-              moreMsg = error.message
-              errorMsg = error.name
-            }
+      if (error?.code && error.code == "ERR_BAD_REQUEST") {
+        if (error.response && (error.response.status == 401 || error.response.status == 302)) {
+          return Promise.reject(error);
+        } else if (error.response && error.response.status == 403) {
+          console.warn("error status 403, redirect to external link /");
+          navigateTo("/", { external: true });
+        } else if (error.response && error.response.status === 402) {
+          const route = useRoute();
+          // if (route.fullPath.endsWith("/billing")) {
+          //   return Promise.resolve({});
+          // } else {
+          throw createError({
+            statusCode: error.response.status,
+            statusMessage: "System Expired",
+            message: error.response.statusText,
+          });
+          // }
+          console.log(route);
+        } else {
+          console.error("axios ERR_BAD_REQUEST", error);
+          let errorMsg = "";
+          let errorCode = 0;
+          let moreMsg = "";
+          if (error.response?.data?.data?.message) {
+            errorCode = error.response.data.data.status;
+            moreMsg = error.response.data.data.message;
+            errorMsg = error.response.data.data.name;
+          } else if (error.response?.data) {
+            errorCode = error.response.data.statusCode;
+            moreMsg = error.response.data.statusMessage;
+            errorMsg = error.response.data.message;
+          } else {
+            errorCode = error.status;
+            moreMsg = error.message;
+            errorMsg = error.name;
+          }
 
-            const errorData = {
-              statusCode:errorCode,
-              statusMessage:errorMsg,
-              message: moreMsg ,
-              fatal:true
-            }
+          const errorData = {
+            statusCode: errorCode,
+            statusMessage: errorMsg,
+            message: moreMsg,
+            fatal: true,
+          };
 
-            // console.log(error.response)
-            throw createError(errorData)  
-          }          
-        }        
-        else if(error.code){          
-          throw createError({
-            statusCode:error.code,
-            statusMessage:error.message,
-            fatal:true
-          })           
+          // console.log(error.response)
+          throw createError(errorData);
         }
-        else if(error.response && (error.response.status==302 || error.response.status==401)){        
-          console.error("axios 302 session expired, start login flow")
-        }else if(error.response && error.response.status){
-          let errmsg = error.response.message
-          let errorcode =error.response.status
-          if(error.response?.data && error.response?.data?.message){
-            errmsg = error.response.data.message
-            errorcode = error.response.data.statusCode
-          }
-          
-          throw createError({
-            statusCode:errorcode,
-            statusMessage:errmsg,
-            fatal:true
-          })  
-            // return Promise.reject(error)
-        }else{
-          console.error("unknown error")
-          throw createError({statusCode:500,statusMessage:"Internal server error"}) 
+      } else if (error.code) {
+        throw createError({
+          statusCode: error.code,
+          statusMessage: error.message,
+          fatal: true,
+        });
+      } else if (error.response && (error.response.status == 302 || error.response.status == 401)) {
+        console.error("axios 302 session expired, start login flow");
+      } else if (error.response && error.response.status) {
+        let errmsg = error.response.message;
+        let errorcode = error.response.status;
+        if (error.response?.data && error.response?.data?.message) {
+          errmsg = error.response.data.message;
+          errorcode = error.response.data.statusCode;
         }
-        //   if (error.response) {
+
+        throw createError({
+          statusCode: errorcode,
+          statusMessage: errmsg,
+          fatal: true,
+        });
+        // return Promise.reject(error)
+      } else {
+        console.error("unknown error");
+        throw createError({ statusCode: 500, statusMessage: "Internal server error" });
+      }
+      //   if (error.response) {
       //     console.error("Backend error response:", error.response.data);
       // } else {
       //     console.error("Network error:", error);
       // }
       return Promise.reject(error);
-      });      
-    return {
-        provide: {
-          event: emitter.emit, // Will emit an event
-          listen: emitter.on, // Will register a listener for an event
-          axios: myaxios,
-          confirm: useConfirm(),
-          dialog: useDialog
-        } 
-    }
-    //other components that you need
+    },
+  );
+  return {
+    provide: {
+      event: emitter.emit, // Will emit an event
+      listen: emitter.on, // Will register a listener for an event
+      axios: myaxios,
+      confirm: useConfirm(),
+      dialog: useDialog,
+    },
+  };
+  //other components that you need
 });

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -5,12 +5,19 @@
  * Author: Ks Tan
  */
 import { defineNuxtPlugin } from "#app";
-import { PROFILEApi,ProfileUserBranch,UserContextInfo , Branch, Tenant,Organization} from "../simpleapp/generate/openapi";
-import { UserProfile } from "~/types";
-import axios, { Axios, AxiosError, AxiosResponse } from "axios";
+import axios, { AxiosResponse } from "axios";
 import _ from "lodash";
-import { group } from "console";
 import { HIGH_PRIVILEGE_ROLES } from "~/data/constant";
+import {
+  Branch,
+  Organization,
+  PROFILEApi,
+  ProfileUserBranch,
+  ProfileUserInvites,
+  Tenant,
+  TenantHealth,
+  UserContextInfo,
+} from "../simpleapp/generate/openapi";
 
 export default defineNuxtPlugin(async (nuxtApp) => {
   const useUserStore = defineStore("userstore", {
@@ -41,10 +48,19 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       groups: ref<string[]>([]),
       currentGroup: ref(""),
       branches: ref<ProfileUserBranch[]>([]),
-      invites: ref([]),
+      invites: ref<ProfileUserInvites[]>([]),
       time: ref(""),
-      xOrg: ref(''),
+      xOrg: ref(""),
       moreProps: ref(),
+      tenantHealth: ref<TenantHealth>({
+        status: "ACTIVE",
+        message: "",
+        isLicenseAddOnAllowed: false,
+        isLicenseCancellable: false,
+        isLicenseDowngradable: false,
+        isLicenseRenewable: false,
+        isLicenseUpgradable: false,
+      }),
       // package: ref(),
       // appintegration: ref({
       //   einvoice: false,
@@ -53,9 +69,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     }),
 
     actions: {
-      async loadRemoteUserFromXorg(xorg:string) {
+      async loadRemoteUserFromXorg(xorg: string) {
         const { $axios, $miniAppStore, $customFieldStore } = useNuxtApp();
-        
+
         let apiurl = "";
         if (!xorg) {
           apiurl = `${useRuntimeConfig().public.appUrl}/api`;
@@ -68,12 +84,12 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         }
         return await new PROFILEApi(undefined, apiurl, $axios)
           .getProfile()
-          .then((tmp: AxiosResponse) => {            
+          .then((tmp: AxiosResponse) => {
             if (!tmp) {
               return;
             }
-            const res = tmp.data
-            this.xOrg= xorg
+            const res = tmp.data;
+            this.xOrg = xorg;
             this._id = res._id;
             this.uName = res.uName;
             this.sessionId = res.sessionId;
@@ -100,22 +116,21 @@ export default defineNuxtPlugin(async (nuxtApp) => {
             this.groups = res.groups;
             this.roles = res.roles;
             this.time = res.time;
-            
+            this.tenantHealth = res.tenantHealth ?? { status: "ACTIVE" };
+
             this.invites = res.invites;
             this.moreProps = res.moreProps;
-            
+
             if (res.branches && Array.isArray(res.branches)) {
-              const currentBranch = res.branches.find(
-                (b: any) => b.branchId === res.branchId
-              );
-              
+              const currentBranch = res.branches.find((b: any) => b.branchId === res.branchId);
+
               if (currentBranch) {
                 this.branchCode = currentBranch.branchCode;
                 this.branchName = currentBranch.branchName;
                 this.branchRecordId = currentBranch.branch?._id || currentBranch.branchRecordId;
                 this.orgCode = currentBranch.orgCode;
                 this.orgName = currentBranch.orgName;
-                
+
                 if (currentBranch.branch) {
                   this.branchInfo = {
                     ...this.branchInfo,
@@ -147,11 +162,10 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       async loadRemoteUserInfo() {
         const route = useRoute();
         let xorg = this.getCurrentXorg();
-        await this.loadRemoteUserFromXorg(xorg)
-        
+        await this.loadRemoteUserFromXorg(xorg);
       },
       getCurrentXorg() {
-        return this.xOrg
+        return this.xOrg;
       },
       async pingSession(): Promise<string> {
         let xorg = this.getCurrentXorg();
@@ -172,12 +186,8 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           }
         }
         const { $axios } = useNuxtApp();
-        try {          
-          const pingresult = await new PROFILEApi(
-            undefined,
-            apiurl,
-            axios
-          ).getSession();
+        try {
+          const pingresult = await new PROFILEApi(undefined, apiurl, axios).getSession();
           if (pingresult.status < 300) return Promise.resolve("ok");
           else return Promise.reject("relogin");
         } catch (e) {
@@ -188,11 +198,10 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         const apiurl = `${useRuntimeConfig().public.appUrl}/api`;
         const { $axios } = useNuxtApp();
         // console.log("decideInvitation",id,decision)
-        const result = await new PROFILEApi(
-          undefined,
-          apiurl,
-          $axios,
-        ).decideInvitation(id, decision);
+        const result = await new PROFILEApi(undefined, apiurl, $axios).decideInvitation(
+          id,
+          decision,
+        );
 
         if (result) {
           // console.log(result)
@@ -202,13 +211,11 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         //().then((res:AxiosResponse)=>{ }
       },
       hasHighPrivilege() {
-        return HIGH_PRIVILEGE_ROLES.some((permission) =>
-          this.roles.includes(permission),
-        );
+        return HIGH_PRIVILEGE_ROLES.some((permission) => this.roles.includes(permission));
       },
       canPerform(resourcename: string, action: string): boolean {
         const normalizedResource = resourcename.toLowerCase();
-        
+
         if (
           this.roles.includes("superadmin") ||
           this.roles.includes("tenantowner") ||
@@ -216,7 +223,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         ) {
           return true;
         }
-        
+
         const specialCases: Record<string, string[]> = {
           // paymentverify: ["admin", "manager"],
           // reminder: ["admin", "manager"],
@@ -227,33 +234,33 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           studentdescription: ["admin", "manager", "executive"],
           miniappinstallation: ["admin", "manager"],
         };
-        
+
         if (specialCases[normalizedResource]) {
           const requiredGroups = specialCases[normalizedResource];
           if (requiredGroups.some((group) => this.roles.includes(group))) {
             return true;
           }
         }
-        
+
         try {
           const routes = useRouter().getRoutes();
           const route = routes.find((r) => {
             const menuPath = r.meta?.menuPath as string | undefined;
             return menuPath && menuPath.endsWith(`/${normalizedResource}`);
           });
-          
+
           if (route?.meta?.requiredGroups) {
             const requiredGroups = route.meta.requiredGroups as string[];
             const userGroups = this.groups || [];
-            
+
             if (requiredGroups.some((group) => userGroups.includes(group))) {
               return true;
             }
           }
         } catch (e) {
-          console.error(e)
+          console.error(e);
         }
-        
+
         const checkstr = `${normalizedResource}:${action}`;
         const checkstrOriginal = `${resourcename}:${action}`;
         return this.roles.includes(checkstr) || this.roles.includes(checkstrOriginal);
@@ -268,7 +275,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           this.roles.includes("superuser")
         ) {
           return true;
-        } 
+        }
         for (let i = 0; i < this.roles.length; i++) {
           const role: string = this.roles[i];
           if (role.includes(resourcename)) {
@@ -288,7 +295,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         navigateTo(tourl, { external: true });
       },
       getUserInfo() {
-        const userinfo: UserContextInfo & {currentGroup:string} = {
+        const userinfo: UserContextInfo & { currentGroup: string } = {
           _id: this._id,
           sessionId: this.sessionId,
           tenantId: this.tenantId,
@@ -309,16 +316,17 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           offsetMinute: this.offsetMinute,
           tenantInfo: this.tenantInfo,
           orgInfo: this.orgInfo,
-          branchInfo:this.branchInfo,
+          branchInfo: this.branchInfo,
 
           fullName: this.fullName,
           branches: this.branches ?? [],
           invites: this.invites ?? [],
           roles: this.roles,
           groups: this.groups,
-          currentGroup: this.currentGroup,          
+          currentGroup: this.currentGroup,
           moreProps: this.moreProps,
-          xOrg: this.getCurrentXorg()
+          xOrg: this.getCurrentXorg(),
+          tenantHealth: this.tenantHealth,
           // package: this.package,
           // appintegration: this.appintegration,
         };
@@ -329,11 +337,21 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       },
       isBillingUser() {
         const roles = this.roles;
-        return roles.includes("tenantowner") || roles.includes("billing") || roles.includes("superadmin") || roles.includes("devbilling") || roles.includes("devsupport");
+        return (
+          roles.includes("tenantowner") ||
+          roles.includes("billing") ||
+          roles.includes("superadmin") ||
+          roles.includes("devbilling") ||
+          roles.includes("devsupport")
+        );
       },
       isInternalUser() {
         const roles = this.roles;
-        return roles.includes("superadmin") || roles.includes("devbilling") || roles.includes("devsupport");
+        return (
+          roles.includes("superadmin") ||
+          roles.includes("devbilling") ||
+          roles.includes("devsupport")
+        );
       },
       isDevSupport() {
         return this.roles.includes("devsupport");
@@ -370,7 +388,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           },
         };
       }
-    } 
+    }
     // else
     //
   }

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