Clean up

Author: compulim

packages/acs-chat-adapter/src/ACSChatAdapter.tsx

@@ -12,6 +12,7 @@ import ActivitiesComposer from './composers/ActivitiesComposer';
 import createDebug from './utils/debug';
 import EmitTypingComposer from './composers/EmitTypingComposer';
 import HonorReadReceiptsComposer from './composers/HonorReadReceiptsComposer';
+import ResolvableToken from './types/ResolvableToken';
 import resolveFunction from './utils/resolveFunction';
 import SendMessageComposer from './composers/SendMessageComposer';
 import styleConsole from './utils/styleConsole';
@@ -79,8 +80,6 @@ InternalACSChatAdapter.propTypes = {
   ).isRequired
 };
 
-type ResolvableToken = string | Promise<string> | (() => string) | (() => Promise<string>);
-
 const ACSChatAdapter: FC<{
   // TODO: We should type "children" prop.
   /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
@@ -129,11 +128,10 @@ const ACSChatAdapter: FC<{
   const credentialsProvided = !!(endpointURL && initialToken && threadId);
 
   return credentialsProvided ? (
-    <ACSClientsComposer endpointURL={endpointURL} threadId={threadId} token={initialToken}>
+    <ACSClientsComposer endpointURL={endpointURL} threadId={threadId} token={token}>
       <ACSChatMessagesComposer>
         <ACSParticipantsComposer>
           <ACSReadReceiptsComposer>
-            {/* <KeyOfChatMessageComposer> */}
             <SendMessageComposer>
               <ActivitiesComposer userProfiles={patchedUserProfiles}>
                 <HonorReadReceiptsComposer>
@@ -156,7 +154,6 @@ const ACSChatAdapter: FC<{
                 </HonorReadReceiptsComposer>
               </ActivitiesComposer>
             </SendMessageComposer>
-            {/* </KeyOfChatMessageComposer> */}
           </ACSReadReceiptsComposer>
         </ACSParticipantsComposer>
       </ACSChatMessagesComposer>

packages/acs-chat-adapter/src/composers/ACSClientsComposer.tsx

@@ -6,6 +6,8 @@ import React, { FC, useEffect, useMemo, useState } from 'react';
 
 import { default as ACSDeclarativesContext } from '../contexts/ACSClientsContext';
 import createDebug from '../utils/debug';
+import ResolvableToken from '../types/ResolvableToken';
+import resolveFunction from '../utils/resolveFunction';
 import styleConsole from '../utils/styleConsole';
 
 // TODO: This is from acs-ui-sdk, we need it.
@@ -28,7 +30,7 @@ let debug;
 
 // TODO: Type "children".
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const ACSDeclarativesComposer: FC<{ children: any; endpointURL: string; threadId: string; token: string }> = ({
+const ACSClientsComposer: FC<{ children: any; endpointURL: string; threadId: string; token: ResolvableToken }> = ({
   children,
   endpointURL,
   threadId,
@@ -40,12 +42,12 @@ const ACSDeclarativesComposer: FC<{ children: any; endpointURL: string; threadId
   const credentials = useMemo<{ dispose(): void; getToken(): Promise<{ expiresOnTimestamp: number; token: string }> }>(
     () => ({
       dispose: () => undefined,
-      getToken: () =>
-        Promise.resolve({
-          // TODO: Should we extract the expiry from the token?
-          expiresOnTimestamp: Infinity,
-          token
-        })
+      getToken: async () => {
+        const actualToken = await resolveFunction(token);
+
+        // TODO: Should we extract the expiry from the token?
+        return { expiresOnTimestamp: Infinity, token: actualToken };
+      }
     }),
     [token]
   );
@@ -119,15 +121,15 @@ const ACSDeclarativesComposer: FC<{ children: any; endpointURL: string; threadId
   return <ACSDeclarativesContext.Provider value={context}>{children}</ACSDeclarativesContext.Provider>;
 };
 
-ACSDeclarativesComposer.defaultProps = {
+ACSClientsComposer.defaultProps = {
   children: undefined
 };
 
-ACSDeclarativesComposer.propTypes = {
+ACSClientsComposer.propTypes = {
   children: PropTypes.any,
   endpointURL: PropTypes.string.isRequired,
   threadId: PropTypes.string.isRequired,
-  token: PropTypes.string.isRequired
+  token: PropTypes.oneOfType([PropTypes.func, PropTypes.string]).isRequired
 };
 
-export default ACSDeclarativesComposer;
+export default ACSClientsComposer;

packages/acs-chat-adapter/src/types/ResolvableToken.ts

@@ -0,0 +1,3 @@
+type ResolvableToken = string | Promise<string> | (() => string) | (() => Promise<string>);
+
+export default ResolvableToken;