@eeplatform/nuxt-layer-common 1.7.48 → 1.7.49

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.7.49
+
+### Patch Changes
+
+- 1afd4ee: Refactor members composable and middleware
+
 ## 1.7.48
 
 ### Patch Changes

package/composables/useMember.ts

@@ -1,25 +1,19 @@
 export default function useMember() {
-  const members = useState<Array<TMember>>("members", () => []);
-  const page = useState("page", () => 1);
-  const pages = useState("pages", () => 0);
-  const pageRange = useState("pageRange", () => "-- - -- of --");
-
-  const member = useState<TMember>("member", () => ({
-    _id: "",
+  const member = ref<TMember>({
     org: "",
     orgName: "",
-    roleName: "",
     name: "",
     user: "",
     role: "",
-    type: "",
-    customerOrgId: "",
-    customerSiteId: "",
-    status: "",
-    createdAt: "",
-    updatedAt: "",
-    deletedAt: "",
-  }));
+  });
+
+  const invitation = ref<TMemberInvitation>({
+    _id: "",
+    email: "",
+    app: "",
+    org: "",
+    role: "",
+  });
 
   function getByUserId(user: string) {
     return useNuxtApp().$api<TMember>(`/api/members/user/${user}`);
@@ -32,18 +26,41 @@ export default function useMember() {
     });
   }
 
+  function getByApp({ app = "", user = "", org = "" } = {}) {
+    return useNuxtApp().$api<TMember>(`/api/members/app/${app}/user/${user}`, {
+      method: "GET",
+      query: { org },
+    });
+  }
+
+  function getAllByAppUser({
+    app = "",
+    user = "",
+    limit = 10,
+    page = 1,
+    search = "",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/members/orgs/app/${app}/user/${user}`,
+      {
+        method: "GET",
+        query: { page, limit, search },
+      }
+    );
+  }
+
   async function getAll({
     page = 1,
     search = "",
     limit = 10,
     user = "",
     org = "",
-    type = "",
+    app = "",
     status = "active",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/members", {
+    return useNuxtApp().$api<Record<string, any>>(`/api/members/app/${app}`, {
       method: "GET",
-      query: { page, limit, search, user, org, type, status },
+      query: { page, limit, search, user, org, status },
     });
   }
   function createUserByVerification(
@@ -76,32 +93,45 @@ export default function useMember() {
     );
   }
 
-  function updateMemberRole(
-    id: string,
-    role: string,
-    type: string,
-    org: string
-  ) {
+  function updateRoleById(id: string, role: string) {
     return useNuxtApp().$api<Record<string, any>>(
-      `/api/members/id/${id}/role/${role}/type/${type}/org/${org}`,
+      `/api/members/role/id/${id}`,
       {
-        method: "PUT",
+        method: "PATCH",
+        body: { role },
       }
     );
   }
+
+  function updateStatusById(id: string, status: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/members/status/id/${id}`,
+      {
+        method: "PATCH",
+        body: { status },
+      }
+    );
+  }
+
+  function deleteById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/members/id/${id}`, {
+      method: "DELETE",
+    });
+  }
+
   return {
-    members,
     member,
-    page,
-    pages,
-    pageRange,
-
+    invitation,
     getAll,
     getByUserId,
     createUserByVerification,
     createMemberInvite,
     getByUserType,
+    getByApp,
     updateMemberStatus,
-    updateMemberRole,
+    updateRoleById,
+    updateStatusById,
+    deleteById,
+    getAllByAppUser,
   };
 }

package/middleware/02.member.ts

@@ -1,14 +1,18 @@
-export default defineNuxtRouteMiddleware(async () => {
+export default defineNuxtRouteMiddleware(async (to) => {
   // Ensure middleware runs only on the client side
   if (import.meta.server) return;
 
   const { cookieConfig } = useRuntimeConfig().public;
+  const APP = useRuntimeConfig().public.APP;
+  const org = (to.params.org as string) ?? "";
 
-  const user = useCookie("user", cookieConfig).value ?? "";
+  console.log(APP);
 
-  const { getByUserId } = useMember();
+  const { loggedInUser } = useLocalAuth();
+
+  const { getByApp } = useMember();
   try {
-    const memberData = await getByUserId(user);
+    const memberData = await getByApp({ app: APP, user: loggedInUser(), org });
     if (memberData.role) {
       useCookie("role", cookieConfig).value = memberData.role;
     }

package/middleware/03.role.ts

@@ -4,7 +4,7 @@ export default defineNuxtRouteMiddleware(async () => {
 
   const { cookieConfig } = useRuntimeConfig().public;
 
-  const { getRoleById } = useRole();
+  const { getById } = useRole();
   const role = useCookie("role", cookieConfig).value ?? "";
   if (!role) {
     navigateTo({ name: "require-role" });
@@ -12,9 +12,11 @@ export default defineNuxtRouteMiddleware(async () => {
   }
 
   const { userAppRole } = useLocalSetup();
+  const { permissions } = useLocalAuth();
 
   try {
-    const roleData = await getRoleById(role);
+    const roleData = await getById(role);
+    permissions.value.push(...roleData.permissions);
     userAppRole.value = roleData;
   } catch (error) {
     navigateTo({ name: "require-role" });

package/package.json

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

package/plugins/secure-member.client.ts

@@ -1,7 +1,7 @@
 export default defineNuxtPlugin(() => {
   const router = useRouter();
   const { getByUserType } = useMember();
-  const { getRoleById } = useRole();
+  const { getById } = useRole();
 
   const { userAppRole, id } = useLocalSetup();
 
@@ -38,7 +38,7 @@ export default defineNuxtPlugin(() => {
 
     const { data: getRoleByIdReq } = useLazyAsyncData(
       "get-role-by-id",
-      () => getRoleById(roleId.value),
+      () => getById(roleId.value),
       { watch: [roleId], immediate: false }
     );
 

package/types/member.d.ts

@@ -5,8 +5,17 @@ declare type TMember = {
   name: string;
   user: string;
   role: string;
+  roleName?: string;
   status?: string;
   createdAt?: string;
   updatedAt?: string;
   deletedAt?: string;
 };
+
+declare type TMemberInvitation = {
+  _id?: string;
+  email: string;
+  app: string;
+  org: string;
+  role: string;
+};