@eeplatform/nuxt-layer-common 1.7.47 → 1.7.49

package/composables/usePermission.ts

@@ -47,8 +47,105 @@ export default function usePermission() {
     return false;
   }
 
+  const perm = ref<TPerm>({
+    app: "",
+    key: "",
+    name: "",
+    group: "",
+    description: "",
+  });
+
+  function addPerm(value: TPerm) {
+    return useNuxtApp().$api("/api/permissions", {
+      method: "POST",
+      body: value,
+    });
+  }
+
+  function updatePermById(
+    id: string,
+    value: Pick<TPerm, "key" | "name" | "group" | "description">
+  ) {
+    return useNuxtApp().$api(`/api/permissions/id/${id}`, {
+      method: "PATCH",
+      body: value,
+    });
+  }
+
+  function getAllPerm({
+    page = 1,
+    limit = 10,
+    search = "",
+    app = "",
+    status = "active",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/permissions", {
+      method: "GET",
+      query: { page, limit, search, app, status },
+    });
+  }
+
+  function deletePermById(id: string) {
+    return useNuxtApp().$api(`/api/permissions/id/${id}`, {
+      method: "DELETE",
+    });
+  }
+
+  const permGroup = ref<TPermGroup>({
+    app: "",
+    key: "",
+    label: "",
+    order: 0,
+  });
+
+  function addPermGroup(value: Pick<TPermGroup, "app" | "key" | "label">) {
+    return useNuxtApp().$api("/api/permissions/groups", {
+      method: "POST",
+      body: value,
+    });
+  }
+
+  function updatePermGroupById(
+    id: string,
+    value: Pick<TPermGroup, "key" | "label">
+  ) {
+    return useNuxtApp().$api(`/api/permissions/groups/id/${id}`, {
+      method: "PATCH",
+      body: value,
+    });
+  }
+
+  function getAllPermGroup({
+    page = 1,
+    limit = 10,
+    search = "",
+    app = "",
+    status = "active",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/permissions/groups", {
+      method: "GET",
+      query: { page, limit, search, app, status },
+    });
+  }
+
+  function deletePermGroupById(id: string) {
+    return useNuxtApp().$api(`/api/permissions/groups/id/${id}`, {
+      method: "DELETE",
+    });
+  }
+
   return {
     listPermissions,
     hasPermission,
+    perm,
+    addPerm,
+    updatePermById,
+    getAllPerm,
+    deletePermById,
+    permGroup,
+    addPermGroup,
+    updatePermGroupById,
+    getAllPermGroup,
+    deletePermGroupById,
   };
 }

package/composables/useRole.ts

@@ -1,44 +1,36 @@
 export default function useRole() {
-  function createRole(
-    { name, permissions, type } = {} as {
-      name: string;
-      permissions: Array<string>;
-      type: string;
-    }
+  function add(
+    value: Pick<TRole, "name" | "permissions" | "app" | "org" | "createdBy">
   ) {
     return useNuxtApp().$api("/api/roles", {
       method: "POST",
-      body: { name, permissions, type },
+      body: value,
     });
   }
 
-  function getRoles({
+  function getAll({
     search = "",
     page = 1,
     limit = 20,
-    type = "",
-    id = "",
+    app = "",
+    org = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/roles", {
       method: "GET",
-      query: { search, page, limit, type, id },
+      query: { search, page, limit, app, org },
     });
   }
 
-  function getRoleById(id: string) {
-    return useNuxtApp().$api<TRole>(`/api/roles/id/${id}`, {
+  function getById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/roles/id/${id}`, {
       method: "GET",
     });
   }
 
-  function updateRoleById(
-    _id: string,
-    name?: string,
-    permissions?: Array<string>
-  ) {
-    return useNuxtApp().$api(`/api/roles/id/${_id}`, {
+  function updateById(id: string, value: Pick<TRole, "name" | "permissions">) {
+    return useNuxtApp().$api(`/api/roles/id/${id}`, {
       method: "PATCH",
-      body: { name, permissions },
+      body: value,
     });
   }
 
@@ -56,33 +48,28 @@ export default function useRole() {
     });
   }
 
-  function deleteRole(_id: string) {
+  function deleteById(_id: string) {
     return useNuxtApp().$api<Record<string, any>>(`/api/roles/${_id}`, {
       method: "DELETE",
     });
   }
 
-  const role = useState("userRole", (): TRole => {
-    return {
-      _id: "",
-      name: "",
-      id: "",
-      permissions: [],
-      createdAt: "",
-      updatedAt: "",
-      deletedAt: "",
-      default: false,
-    };
+  const role = ref<TRole>({
+    name: "",
+    org: "",
+    permissions: [],
+    app: "",
+    description: "",
   });
 
   return {
     role,
-    createRole,
-    getRoles,
-    getRoleById,
-    updateRoleById,
+    add,
+    getAll,
+    getById,
+    updateById,
     updateRoleFieldById,
-    deleteRole,
+    deleteById,
     updatePermissionById,
   };
 }

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.47",
+  "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/local.d.ts

@@ -19,8 +19,12 @@ declare type TNavigationItem = {
 };
 
 declare type TApp = {
-  title: string;
-  icon: string;
-  link: string;
-  landingPage?: string;
+  _id?: string;
+  code: string;
+  name: string;
+  description: string;
+  status?: string;
+  createdAt?: string | Date;
+  updatedAt?: string | Date;
+  deletedAt?: string | Date;
 };

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

package/types/permission.d.ts

@@ -12,3 +12,27 @@ declare type TPermissions = {
     [action: string]: TPermission;
   };
 };
+
+declare type TPerm = {
+  _id?: string;
+  app: string;
+  name: string;
+  key: string;
+  group: string;
+  description: string;
+  status?: string;
+  createdAt?: string | Date;
+  updatedAt?: string | Date;
+  deletedAt?: string | Date;
+};
+
+declare type TPermGroup = {
+  _id?: string;
+  app: string;
+  key: string;
+  label: string;
+  order: number;
+  createdAt?: string | Date;
+  updatedAt?: string | Date;
+  deletedAt?: string | Date;
+};

package/types/role.d.ts

@@ -2,8 +2,9 @@ declare type TRole = {
   _id?: string;
   name?: string;
   permissions?: Array<string>;
-  type?: string;
-  id?: string;
+  app: string;
+  org?: string;
+  description?: string;
   status?: string;
   default?: boolean;
   createdBy?: string;