@eeplatform/nuxt-layer-common 1.2.3 → 1.2.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.2.5
+
+### Patch Changes
+
+- 3bf853d: Add util function
+
+## 1.2.4
+
+### Patch Changes
+
+- 9036391: Revise API plugin
+
 ## 1.2.3
 
 ### Patch Changes

package/composables/useLocalAuth.ts

@@ -8,14 +8,6 @@ export default function useLocalAuth() {
       return;
     }
 
-    // Get access token from cookies
-    const accessToken = useCookie("accessToken", cookieConfig).value;
-
-    if (!accessToken) {
-      // Redirect to login page if no access token
-      navigateTo({ name: "index" });
-    }
-
     const user = useCookie("user", cookieConfig).value;
 
     const { data: getCurrentUserReq, error: getCurrentUserErr } =
@@ -44,6 +36,11 @@ export default function useLocalAuth() {
     });
   }
 
+  function setSession({ sid = "", user = "" } = {}) {
+    useCookie("sid", cookieConfig).value = sid;
+    useCookie("user", cookieConfig).value = user;
+  }
+
   function setToken({
     refreshToken = "",
     accessToken = "",
@@ -64,18 +61,9 @@ export default function useLocalAuth() {
   }
 
   async function logout() {
-    const refreshToken = useCookie("refreshToken", cookieConfig).value;
-    if (refreshToken) {
-      try {
-        await useNuxtApp().$api(`/api/auth/logout/${refreshToken}`, {
-          method: "DELETE",
-        });
-
-        clearCookies();
-      } catch (error) {
-        console.error("Logout failed:", error);
-      }
-    }
+    return useNuxtApp().$api("/api/auth/logout", {
+      method: "DELETE",
+    });
   }
 
   function getCurrentUser() {
@@ -142,6 +130,7 @@ export default function useLocalAuth() {
   return {
     authenticate,
     login,
+    setSession,
     logout,
     clearCookies,
     getCurrentUser,

package/composables/useLocalSetup.ts

@@ -1,44 +1,10 @@
-export function useLocalSetup(type: string, org?: string) {
-  const userId = computed(() => useCookie("user").value ?? "");
-
-  const { getByUserType } = useMember();
-
-  const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
-    "get-member-by-id",
-    () => getByUserType(userId.value, type, org),
-    { watch: [userId] }
-  );
-
-  watchEffect(() => {
-    if (userMemberError.value) {
-      navigateTo({
-        name: "index",
-      });
-    }
-  });
-
-  const { getRoleById } = useRole();
-
-  const roleId = computed(() => userMemberData.value?.role ?? "");
-
+export function useLocalSetup() {
   const userAppRole = useState<Record<string, any> | null>(
     "userAppRole",
     () => null
   );
 
-  const { data: getRoleByIdReq } = useLazyAsyncData(
-    "get-role-by-id",
-    () => getRoleById(roleId.value),
-    { watch: [roleId], immediate: false }
-  );
-
-  watchEffect(() => {
-    if (getRoleByIdReq.value) {
-      userAppRole.value = getRoleByIdReq.value;
-    }
-  });
-
-  const id = computed(() => userMemberData.value?.org ?? "id");
+  const id = useState<string | null>("memberShipOrgId", () => null);
 
   return {
     userAppRole,

package/composables/useUtils.ts

@@ -265,6 +265,12 @@ export default function useUtils() {
     return params;
   }
 
+  function toOrdinal(n: number): string {
+    const s = ["th", "st", "nd", "rd"];
+    const v = n % 100;
+    return n + (s[(v - 20) % 10] || s[v] || s[0]);
+  }
+
   return {
     requiredRule,
     emailRule,
@@ -290,5 +296,6 @@ export default function useUtils() {
     getRouteParam,
     replaceMatch,
     setRouteParams,
+    toOrdinal,
   };
 }

package/middleware/01.auth.ts

@@ -4,10 +4,9 @@ export default defineNuxtRouteMiddleware(async () => {
 
   const { cookieConfig } = useRuntimeConfig().public;
 
-  // Get access token from cookies
-  const accessToken = useCookie("accessToken", cookieConfig).value;
+  const sid = useCookie("sid", cookieConfig).value;
 
-  if (!accessToken) {
+  if (!sid) {
     // Redirect to login page if no access token
     return navigateTo({ name: "index" });
   }

package/nuxt.config.ts

@@ -15,6 +15,7 @@ export default defineNuxtConfig({
         secure: true,
         maxAge: 30 * 24 * 60 * 60,
       },
+      APP: (process.env.APP as string) ?? "App",
       APP_NAME: (process.env.APP_NAME as string) ?? "App",
       APP_NAME_ROUTE: (process.env.APP_NAME_ROUTE as string) ?? "index",
       S3_BUCKET_ENDPOINT: (process.env.S3_BUCKET_ENDPOINT as string) ?? "",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@eeplatform/nuxt-layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"

package/plugins/API.ts

@@ -1,6 +1,3 @@
-import { useFetch } from "nuxt/app";
-type useFetchType = typeof useFetch;
-
 export default defineNuxtPlugin(() => {
   const { cookieConfig, BASE_URL } = useRuntimeConfig().public;
 
@@ -10,49 +7,15 @@ export default defineNuxtPlugin(() => {
     retryStatusCodes: [401],
     retryDelay: 500,
     onRequest({ options }) {
-      const accessToken = useCookie("accessToken", cookieConfig).value;
-      options.headers.set("Authorization", `Bearer ${accessToken}`);
-    },
-
-    async onResponseError({ response }) {
-      if (response.status === 401) {
-        await $fetch("/api/auth/refresh", {
-          method: "POST",
-          body: JSON.stringify({
-            token: useCookie("refreshToken", cookieConfig).value,
-          }),
-
-          onResponse({ response }) {
-            if (response.status === 200) {
-              useCookie("accessToken", cookieConfig).value =
-                response._data.token;
-            }
-          },
-        });
-      }
+      const sid = useCookie("sid", cookieConfig).value ?? "";
+      options.headers.set("authorization", sid);
     },
   });
 
-  const useAPI: useFetchType = (path, options = {}) => {
-    options.lazy = true;
-    options.retry = 1;
-    options.retryStatusCodes = [401];
-    options.retryDelay = 500;
-    options.baseURL = (BASE_URL as string) ?? "/";
-
-    options.headers = {
-      ...options.headers,
-      Authorization: `Bearer ${useCookie("accessToken", cookieConfig).value}`,
-    };
-
-    return useFetch(path, options);
-  };
-
   // Expose to useNuxtApp().$api
   return {
     provide: {
       api,
-      useAPI,
     },
   };
 });

package/plugins/secure-member.client.ts

@@ -0,0 +1,51 @@
+export default defineNuxtPlugin(() => {
+  const router = useRouter();
+  const { getByUserType } = useMember();
+  const { getRoleById } = useRole();
+
+  const { userAppRole, id } = useLocalSetup();
+
+  router.afterEach((to) => {
+    const isSecured = to.meta?.secured;
+    if (!isSecured) return;
+
+    const APP = useRuntimeConfig().public.APP;
+    const org = (to.params.org as string) ?? "";
+
+    const userId = computed(() => useCookie("user").value ?? "");
+
+    const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
+      "get-member-by-id",
+      () => getByUserType(userId.value, APP, org),
+      { watch: [userId] }
+    );
+
+    watchEffect(() => {
+      if (userMemberError.value) {
+        navigateTo({
+          name: "index",
+        });
+      }
+    });
+
+    watchEffect(() => {
+      if (userMemberData.value) {
+        id.value = userMemberData.value.org ?? "";
+      }
+    });
+
+    const roleId = computed(() => userMemberData.value?.role ?? "");
+
+    const { data: getRoleByIdReq } = useLazyAsyncData(
+      "get-role-by-id",
+      () => getRoleById(roleId.value),
+      { watch: [roleId], immediate: false }
+    );
+
+    watchEffect(() => {
+      if (getRoleByIdReq.value) {
+        userAppRole.value = getRoleByIdReq.value;
+      }
+    });
+  });
+});