@7365admin1/core 3.46.1-staging.113 → 3.46.1-staging.114

package/.changeset/default-staff-role-lookup.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/core": patch
+---
+
+Resolve the seeded platform staff role by type as well as name, so the default staff account cannot be bound to an ordinary organisation role that happens to share the name.

package/dist/index.d.ts

@@ -282,7 +282,7 @@ declare function useRoleRepo(): {
     addRole: (value: TRole, session?: ClientSession) => Promise<ObjectId>;
     getRoleByUserId: (value: string | ObjectId) => Promise<TRole | null>;
     getRoleById: (_id: string | ObjectId) => Promise<TRole | null>;
-    getRoleByName: (name: string) => Promise<TRole | null>;
+    getRoleByName: (name: string, type?: string) => Promise<TRole | null>;
     getRoles: ({ search, page, limit, sort, type, org, }: {
         search?: string | undefined;
         page?: number | undefined;

package/dist/index.js

@@ -15957,18 +15957,19 @@ function useRoleRepo() {
       throw new import_node_server_utils33.InternalServerError("Failed to retrieve role by ID.");
     }
   }
-  async function getRoleByName(name) {
+  async function getRoleByName(name, type) {
     if (!name) {
       throw new import_node_server_utils33.BadRequestError("Role name is required.");
     }
+    const query2 = type ? { name, type } : { name };
     try {
-      const cacheKey = (0, import_node_server_utils33.makeCacheKey)(namespace_collection, { name });
+      const cacheKey = (0, import_node_server_utils33.makeCacheKey)(namespace_collection, query2);
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         import_node_server_utils33.logger.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
-      const data = await collection.findOne({ name });
+      const data = await collection.findOne(query2);
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils33.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -16364,7 +16365,7 @@ function useUserService() {
     let role = "";
     const adminRole = "Super Admin";
     try {
-      const result = await getRoleByName(adminRole);
+      const result = await getRoleByName(adminRole, "admin");
       if (result && result._id) {
         role = result._id?.toString();
       }