fix: pass correct current user id

Author: reneshen0328

src/elements/content-sharing/__tests__/useContacts.test.js

@@ -34,6 +34,7 @@ function FakeComponent({
     const [getContacts, setGetContacts] = React.useState(null);
 
     const updatedGetContactsFn = useContacts(api, MOCK_ITEM_ID, {
+        currentUserId: '123',
         handleSuccess,
         handleError,
         transformGroups,

src/elements/content-sharing/hooks/__tests__/useContactService.test.ts

@@ -26,17 +26,12 @@ describe('elements/content-sharing/hooks/useContactService', () => {
         jest.clearAllMocks();
     });
 
-    test('should return null contactService when currentUserID is null or undefined', () => {
-        [null, undefined].forEach(currentUserID => {
-            const { result } = renderHook(() => useContactService(mockApi, mockItemID, currentUserID));
-            expect(result.current.contactService).toBeNull();
-        });
-    });
-
     test('should return contactService with getContacts function', () => {
         const { result } = renderHook(() => useContactService(mockApi, mockItemID, mockCurrentUserID));
 
         expect(useContacts).toHaveBeenCalledWith(mockApi, mockItemID, {
+            currentUserId: mockCurrentUserID,
+            isContentSharingV2Enabled: true,
             transformUsers: expect.any(Function),
             transformGroups: expect.any(Function),
         });

src/elements/content-sharing/hooks/useContactService.ts

@@ -1,21 +1,13 @@
-import * as React from 'react';
-
 import { convertGroupContactsResponse, convertUserContactsResponse } from '../utils';
 import useContacts from './useContacts';
 
-export const useContactService = (api, itemID, currentUserId) => {
-    const getContacts = useContacts(api, itemID, {
+export const useContactService = (api, itemId, currentUserId) => {
+    const getContacts = useContacts(api, itemId, {
+        currentUserId,
+        isContentSharingV2Enabled: true,
         transformUsers: data => convertUserContactsResponse(data, currentUserId),
         transformGroups: data => convertGroupContactsResponse(data),
     });
 
-    const contactService = React.useMemo(() => {
-        if (!currentUserId) {
-            return null;
-        }
-
-        return { getContacts };
-    }, [currentUserId, getContacts]);
-
-    return { contactService };
+    return { contactService: { getContacts } };
 };

src/elements/content-sharing/hooks/useContacts.js

@@ -17,10 +17,19 @@ import type { ContentSharingHooksOptions, GetContactsFnType } from '../types';
  */
 function useContacts(api: API, itemID: string, options: ContentSharingHooksOptions): GetContactsFnType | null {
     const [getContacts, setGetContacts] = React.useState<null | GetContactsFnType>(null);
-    const { handleSuccess = noop, handleError = noop, transformGroups, transformUsers } = options;
+    const {
+        currentUserId,
+        handleSuccess = noop,
+        handleError = noop,
+        isContentSharingV2Enabled,
+        transformGroups,
+        transformUsers,
+    } = options;
 
     React.useEffect(() => {
-        if (getContacts) return;
+        if (getContacts || (isContentSharingV2Enabled && !currentUserId)) {
+            return;
+        }
 
         const resolveAPICall = (
             resolve: (result: Array<Object>) => void,
@@ -60,7 +69,17 @@ function useContacts(api: API, itemID: string, options: ContentSharingHooksOptio
             return Promise.all([getUsers, getGroups]).then(contactArrays => [...contactArrays[0], ...contactArrays[1]]);
         };
         setGetContacts(updatedGetContactsFn);
-    }, [api, getContacts, handleError, handleSuccess, itemID, transformGroups, transformUsers]);
+    }, [
+        api,
+        currentUserId,
+        getContacts,
+        handleError,
+        handleSuccess,
+        isContentSharingV2Enabled,
+        itemID,
+        transformGroups,
+        transformUsers,
+    ]);
 
     return getContacts;
 }

src/elements/content-sharing/types.js

@@ -92,6 +92,7 @@ export type ContentSharingItemAPIResponse = {
 };
 
 export type ContentSharingHooksOptions = {
+    currentUserId?: string,
     handleError?: Function,
     handleRemoveSharedLinkError?: Function,
     handleRemoveSharedLinkSuccess?: Function,