@eeplatform/nuxt-layer-common 1.2.2 → 1.2.4

package/composables/useSchool.ts

@@ -28,12 +28,12 @@ export default function useSchool() {
     page = 1,
     status = "active",
     search = "",
-    region = "",
-    division = "",
+    org = "",
+    app = "admin",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/schools", {
       method: "GET",
-      query: { page, status, search, region, division },
+      query: { page, status, search, org, app },
     });
   }
 

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.2",
+  "version": "1.2.4",
   "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;
+      }
+    });
+  });
+});