Merge pull request #33 from gregPerlinLi/dev

Update Project Version, Fix Certificate Validity, and Enhance OIDC Support

Author: gregPerlinLi

frontend/auto-imports.d.ts

@@ -297,6 +297,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

frontend/package.json

@@ -11,7 +11,7 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "@vueuse/core": "^13.0.0",
+    "@vueuse/core": "^13.1.0",
     "nanoid": "^5.1.5",
     "primeicons": "^7.0.0",
     "primevue": "^4.3.3",
@@ -21,7 +21,7 @@
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@primeuix/themes": "^1.0.1",
+    "@primeuix/themes": "^1.0.2",
     "@primevue/auto-import-resolver": "^4.3.3",
     "@tailwindcss/vite": "^4.1.3",
     "@vitejs/plugin-vue": "^5.2.3",

frontend/pnpm-lock.yaml

@@ -1,5 +1,19 @@
+import type { PaginationVO, UserProfileDTO } from "@/api/types";
 import { callRestfulApi } from "@/api";
 
+export const getAllCaBindedUsrs = (
+  uuid: string,
+  page: number,
+  limit: number,
+  keyword?: string
+) =>
+  callRestfulApi<PaginationVO<UserProfileDTO>>({
+    method: "GET",
+    baseUrl: "/api/v1/admin/cert/ca/{uuid}/bind",
+    pathNames: { uuid },
+    searchParams: { page, limit, keyword }
+  });
+
 export const bindCaToUsrs = (caUuid: string, usernames: string[]) =>
   callRestfulApi({
     method: "POST",

frontend/src/api/admin/cert/index.ts frontend/src/api/admin/cert/binding.tsfrontend/src/api/admin/cert/index.ts renamed to frontend/src/api/admin/cert/binding.ts

@@ -16,3 +16,10 @@ export const countCaRequestedCerts = (uuid: string, caOrSsl: boolean) =>
     pathNames: { uuid },
     searchParams: { caOrSsl }
   });
+
+export const countAllUsrs = (role: 1 | 2 | 3 | 0 = 0) =>
+  callRestfulApi<number>({
+    method: "GET",
+    baseUrl: "/api/v1/superadmin/user/count",
+    searchParams: { role }
+  });

frontend/src/api/admin/stats.ts

@@ -7,5 +7,5 @@ export const getOidcProvider = () =>
   });
 
 export const oidcLogin = async () => {
-  await fetch("/api/v1/auth/oauth/login");
+  window.open("/api/v1/auth/oauth/login", "_self", "noopener=true");
 };

frontend/src/api/authentication/oauth.ts

@@ -2,6 +2,9 @@ import type { ResultVO } from "@/api/types";
 import { useUserStore } from "@/stores/user";
 import router from "@/router";
 
+let noTimeout = false;
+export const setNoTimeout = (b: boolean) => (noTimeout = b);
+
 export const createURLSearchParams = (
   params: Record<string, any>
 ): URLSearchParams => {
@@ -35,7 +38,7 @@ export const callRestfulApi = async <U = null>(
         ? { "Content-Type": "application/json" }
         : undefined,
     body: opts.payload !== undefined ? JSON.stringify(opts.payload) : undefined,
-    signal: AbortSignal.timeout(10000)
+    signal: noTimeout ? undefined : AbortSignal.timeout(10000)
   } satisfies RequestInit;
 
   const resp = await fetch(uri, req);

frontend/src/api/index.ts

@@ -14,10 +14,3 @@ export const countAllSslCerts = () =>
     method: "GET",
     baseUrl: "/api/v1/superadmin/cert/ssl/count"
   });
-
-export const countAllUsrs = (role: 1 | 2 | 3 | 0 = 0) =>
-  callRestfulApi<number>({
-    method: "GET",
-    baseUrl: "/api/v1/superadmin/user/count",
-    searchParams: { role }
-  });

frontend/src/api/superadmin/stats.ts

@@ -1,6 +1,8 @@
 import type { UpdateProfileRequestPayload } from "@/api/user/user";
 import type { ToastServiceMethods } from "primevue";
+import { setNoTimeout } from "@/api";
 import { login, logout } from "@/api/authentication";
+import { getOidcProvider } from "@/api/authentication/oauth";
 import { getProfile, updateProfile } from "@/api/user/user";
 
 // Type
@@ -10,6 +12,7 @@ export type Role = "User" | "Admin" | "Superadmin";
 export const useUserStore = createGlobalState(() => {
   // States
   const initialized = ref(false);
+  const oidcProvider = ref<string | null>(null);
   const signedIn = ref(false);
   const username = ref<string | null>(null);
   const displayName = ref<string | null>(null);
@@ -43,8 +46,21 @@ export const useUserStore = createGlobalState(() => {
       return;
     }
 
+    setNoTimeout(true);
+    try {
+      oidcProvider.value = await getOidcProvider();
+    } catch (err: unknown) {
+      toast?.add({
+        severity: "error",
+        summary: "Failed to Get OIDC Provider",
+        detail: (err as Error).message,
+        life: 5000
+      });
+    }
+
     const err = await syncFromRemote();
     initialized.value = true;
+    setNoTimeout(false);
     if (err !== null) {
       toast?.add({
         severity: "error",
@@ -170,6 +186,7 @@ export const useUserStore = createGlobalState(() => {
   // Returns
   return {
     initialized,
+    oidcProvider,
     signedIn,
     username,
     displayName,