STCOR-905: based on 'users-keycloak' interface use bl-users or users-keycloak for _self endpoint in useUserTenantPermissions

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Conditionally use `/users-keycloak/_self` endpoint when `users-keycloak` interface is present. Refs STCOR-835.
 * Wait longer before declaring a rotation request to be stale. Refs STCOR-895.
 * Send the stored central tenant name in the header on logout. Refs STCOR-900.
+* Use the `users-keycloak/_self` endpoint conditionally when the `users-keycloak` interface is present; otherwise, use `bl-users/_self` within `useUserSelfTenantPermissions`. Refs STCOR-905.
 
 ## [10.2.0](https://github.com/folio-org/stripes-core/tree/v10.2.0) (2024-10-11)
 [Full Changelog](https://github.com/folio-org/stripes-core/compare/v10.1.1...v10.2.0)

index.js

@@ -40,7 +40,7 @@ export { useChunkedCQLFetch } from './src/queries';
 export { getUserTenantsPermissions } from './src/queries';
 
 /* Hooks */
-export { useUserTenantPermissions } from './src/hooks';
+export { useUserSelfTenantPermissions } from './src/hooks';
 
 /* misc */
 export { supportedLocales } from './src/loginServices';

src/hooks/index.js

@@ -1 +1 @@
-export { default as useUserTenantPermissions } from './useUserTenantPermissions'; // eslint-disable-line import/prefer-default-export
+export { default as useUserSelfTenantPermissions } from './useUserSelfTenantPermissions';

src/hooks/useUserSelfTenantPermissions.js

@@ -19,23 +19,22 @@ const useUserSelfTenantPermissions = (
   });
   const [namespace] = useNamespace({ key: 'user-self-permissions' });
 
-  const user = stripes.user.user;
+  const permPath = stripes.hasInterface('users-keycloak') ? 'users-keycloak' : 'bl-users';
 
   const {
     isFetching,
     isFetched,
     isLoading,
     data,
   } = useQuery(
-    [namespace, user?.id, tenantId],
+    [namespace, tenantId],
     ({ signal }) => {
       return api.get(
-        'users-keycloak/_self',
+        `${permPath}/_self?expandPermissions=true`,
         { signal },
       ).json();
     },
     {
-      enabled: Boolean(user?.id && tenantId) && stripes.hasInterface('users-keycloak'),
       keepPreviousData: true,
       ...options,
     },

src/hooks/useUserSelfTenantPermissions.test.js

@@ -14,11 +14,6 @@ jest.mock('../components', () => ({
 }));
 jest.mock('../StripesContext', () => ({
   useStripes: () => ({
-    user: {
-      user: {
-        id: 'userId'
-      }
-    },
     hasInterface: () => true
   }),
 }));
@@ -58,14 +53,13 @@ describe('useUserSelfTenantPermissions', () => {
 
   it('should fetch user permissions for specified tenant', async () => {
     const options = {
-      userId: 'userId',
       tenantId: 'tenantId',
     };
     const { result } = renderHook(() => useUserSelfTenantPermissions(options), { wrapper });
 
     await waitFor(() => !result.current.isLoading);
 
     expect(setHeaderMock).toHaveBeenCalledWith('X-Okapi-Tenant', options.tenantId);
-    expect(getMock).toHaveBeenCalledWith('users-keycloak/_self', expect.objectContaining({}));
+    expect(getMock).toHaveBeenCalledWith('users-keycloak/_self?expandPermissions=true', expect.objectContaining({}));
   });
 });