@7365admin1/layer-common 1.11.41 → 1.11.43

package/composables/useFile.ts

@@ -10,7 +10,7 @@ export default function useFile() {
     const formData = new FormData();
     formData.append("file", file);
 
-    return $fetch<Record<string, any>>("/api/files", {
+    return useNuxtApp().$api<Record<string, any>>("/api/files", {
       method: "POST",
       body: formData,
     });

package/composables/useLocalAuth.ts

@@ -141,6 +141,17 @@ export default function useLocalAuth() {
     });
   }
 
+  function verifyInvite(inviteId: string) {
+  if (!inviteId) throw new Error("inviteId is required");
+
+  return useNuxtApp().$api<Record<string, any>>(
+    `/api/auth/verify/invite/${inviteId}`,
+    {
+      method: "GET",
+    }
+  );
+}
+
   async function updateVerificationStatus(id: string, status: string) {
     return useNuxtApp().$api<Record<string, any>>(`/api/auth/verification/status`, {
       method: "PATCH",
@@ -166,6 +177,7 @@ export default function useLocalAuth() {
     resetPassword,
     currentUser,
     verify,
+    verifyInvite,
     updateVerificationStatus,
     signUp,
   };

package/composables/useMember.ts

@@ -25,6 +25,13 @@ export default function useMember() {
     return useNuxtApp().$api<TMember>(`/api/members/user/${user}`);
   }
 
+  function getAllByUserId(user: string) {
+    return useNuxtApp().$api<TMember>(`/api/members/users/${user}`);
+  }
+  function getByMemberId(user: string) {
+    return useNuxtApp().$api<TMember>(`/api//user/${user}`);
+  }
+
   function getByUserIdType(user: string, type: string) {
     return useNuxtApp().$api<TMember>(`/api/members/user/${user}/app/${type}`);
   }
@@ -94,19 +101,36 @@ export default function useMember() {
     );
   }
 
-function createMemberDirect(payload: {
-  userId: string;
-  orgId: string;
-  roleId: string;
-  app: string;
-  siteId?: string;
-  siteName?:string;
-}) {
-  return useNuxtApp().$api<TMember>('/api/members/direct', {
-    method: 'POST',
-    body: payload,
-  })
-}
+  function createMemberDirect(payload: {
+    userId: string;
+    orgId: string;
+    roleId: string;
+    app: string;
+    siteId?: string;
+    siteName?: string;
+  }) {
+    return useNuxtApp().$api<TMember>('/api/members/direct', {
+      method: 'POST',
+      body: payload,
+    })
+  }
+  function updateMemberSite(
+    id: string,
+    siteId: string,
+    siteName: string,
+  ) {
+    return useNuxtApp().$api(
+      `/api/members/site`,
+      {
+        method: "PUT",
+        body: {
+          id,
+          siteId,
+          siteName,
+        },
+      }
+    )
+  }
 
   return {
     members,
@@ -120,8 +144,11 @@ function createMemberDirect(payload: {
     createUserByVerification,
     createMemberInvite,
     getByUserIdType,
+    getByMemberId,
     updateMemberStatus,
     updateMemberRole,
-    createMemberDirect
+    createMemberDirect,
+    updateMemberSite,
+    getAllByUserId
   };
 }

package/composables/useOrg.ts

@@ -1,3 +1,7 @@
+import { computed, watch } from "vue";
+import { useNuxtApp, useRoute, useState } from "#app";
+import useLocalAuth from "./useLocalAuth";
+
 export default function useOrg() {
   function getOrgs({
     page = 1,
@@ -103,6 +107,32 @@ export default function useOrg() {
     });
   }
 
+  /** Super Admin client list, etc.: filter by `organizations.status` (v1 API ignores status). */
+  function getAllV2({
+    page = 1,
+    search = "",
+    limit = 20,
+    nature = "",
+    status = "active",
+  }: {
+    page?: number;
+    search?: string;
+    limit?: number;
+    nature?: string;
+    status?: "active" | "suspended" | "deleted";
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/organizations/v2", {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+        nature,
+        status,
+      },
+    });
+  }
+
   function add(
     value: Partial<Pick<TOrg, "name" | "email" | "nature" | "contact">>
   ) {
@@ -113,7 +143,7 @@ export default function useOrg() {
   }
 
   function addOnboardingOrg(
-    value: Partial<Pick<TOrg, "name" | "email" | "nature" | "contact">>
+    value: Partial<Pick<TOrg, "name" | "type" | "email" | "nature" | "contact">>
   ) {
     return useNuxtApp()
       .$api<Record<string, any>>("/api/organizations", {
@@ -126,6 +156,22 @@ export default function useOrg() {
         ) as TOrg;
       });
   }
+  function updateOrg(
+    id: string,
+    value: Partial<Pick<TOrg, "name" | "type" | "email" | "nature" | "contact">>
+  ) {
+    return useNuxtApp()
+      .$api<Record<string, any>>(`/api/organizations/${id}`, {
+        method: "PUT",
+        body: value,
+      })
+      .then((response: Record<string, any>) => {
+        return (
+          response?.data ?? response?.organization ?? response
+        ) as TOrg;
+      });
+  }
+
 
   return {
     org,
@@ -139,7 +185,9 @@ export default function useOrg() {
     currentOrg,
     getById,
     getAll,
+    getAllV2,
     add,
     addOnboardingOrg,
+    updateOrg,
   };
 }

package/composables/useUser.ts

@@ -14,17 +14,48 @@ export default function useUser() {
     });
   }
 
-  function inviteUserClient({
-    email = '',
-    app = '',
-    role = '',
-    name = '',
-    org = '',
-    site = '',
-    siteName = ''
+function inviteUserClient({
+  email = '',
+  app = [],
+  role = '',
+  name = '',
+  org = '',
+  site = '',
+  siteName = ''
+}: {
+  email?: string
+  app?: string[]
+  role?: string
+  name?: string
+  org?: string
+  site?: string
+  siteName?: string
+} = {}) {
+  return useNuxtApp().$api<Record<string, any>>('/api/auth/invite/user', {
+    method: 'POST',
+    body: {
+      email,
+      app,
+      role,
+      name,
+      org,
+      ...(site && { siteId: site }),
+      ...(siteName && { siteName })
+    }
+  })
+}
+
+  function inviteMemberClient({
+    email = "",
+    app = "",
+    role = "",
+    name = "",
+    org = "",
+    site = "",
+    siteName = "",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>('/api/auth/invite/user', {
-      method: 'POST',
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/invite/member", {
+      method: "POST",
       body: {
         email,
         app,
@@ -32,9 +63,9 @@ export default function useUser() {
         name,
         org,
         ...(site && { siteId: site }),
-        ...(siteName && { siteName })
-      }
-    })
+        ...(siteName && { siteName }),
+      },
+    });
   }
 
 
@@ -152,6 +183,7 @@ export default function useUser() {
     getById,
     createUserByVerification,
     getUserByEmail,
-    inviteUserClient
+    inviteUserClient,
+    inviteMemberClient
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.41",
+  "version": "1.11.43",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/nuxt-app.d.ts

@@ -0,0 +1,7 @@
+import type { $Fetch } from "ofetch";
+
+declare module "#app" {
+  interface NuxtApp {
+    $api: $Fetch;
+  }
+}