@azure/communication-react 1.16.0-beta.1 → 1.16.1

package/dist/dist-esm/react-composites/src/composites/CallWithChatComposite/adapter/AzureCommunicationCallWithChatAdapter.js

@@ -10,15 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { callWithChatAdapterStateFromBackingStates, mergeCallAdapterStateIntoCallWithChatAdapterState, mergeChatAdapterStateIntoCallWithChatAdapterState } from '../state/CallWithChatAdapterState';
-import { _createLazyAzureCommunicationChatAdapterInner, createAzureCommunicationChatAdapterFromClient } from '../../ChatComposite/adapter/AzureCommunicationChatAdapter';
+import { _createAzureCommunicationChatAdapterInner, _createLazyAzureCommunicationChatAdapterInner, createAzureCommunicationChatAdapterFromClient } from '../../ChatComposite/adapter/AzureCommunicationChatAdapter';
 import { EventEmitter } from 'events';
-/* @conditional-compile-remove(PSTN-calls) */
-import { isCommunicationUserIdentifier } from '@azure/communication-common';
 import { getChatThreadFromTeamsLink } from './parseTeamsUrl';
 import { _createAzureCommunicationCallAdapterInner } from '../../CallComposite/adapter/AzureCommunicationCallAdapter';
 import { createAzureCommunicationCallAdapterFromClient } from '../../CallComposite/adapter/AzureCommunicationCallAdapter';
 import { useEffect, useRef, useState } from 'react';
-import { _toCommunicationIdentifier } from "../../../../../acs-ui-common/src";
 /** Context of Call with Chat, which is a centralized context for all state updates */
 class CallWithChatContext {
     constructor(clientState, maxListeners = 50) {
@@ -54,47 +51,9 @@ class CallWithChatContext {
  * Created for easy use with the {@link CallWithChatComposite}.
  */
 export class AzureCommunicationCallWithChatAdapter {
-    constructor(callAdapter, chatAdapterPromise) {
-        /* @conditional-compile-remove(attachment-upload) */
-        this.registerActiveUploads = (files) => {
-            var _a, _b;
-            return (_b = (_a = this.chatAdapter) === null || _a === void 0 ? void 0 : _a.registerActiveUploads(files)) !== null && _b !== void 0 ? _b : [];
-        };
-        /* @conditional-compile-remove(attachment-upload) */
-        this.registerCompletedUploads = (metadata) => {
-            var _a, _b;
-            return (_b = (_a = this.chatAdapter) === null || _a === void 0 ? void 0 : _a.registerCompletedUploads(metadata)) !== null && _b !== void 0 ? _b : [];
-        };
-        /* @conditional-compile-remove(attachment-upload) */
-        this.clearUploads = () => {
-            this.chatAdapterPromise.then(adapter => {
-                adapter.clearUploads();
-            });
-        };
-        /* @conditional-compile-remove(attachment-upload) */
-        this.cancelUpload = (id) => {
-            this.chatAdapterPromise.then(adapter => {
-                adapter.cancelUpload(id);
-            });
-        };
-        /* @conditional-compile-remove(attachment-upload) */
-        this.updateUploadProgress = (id, progress) => {
-            this.chatAdapterPromise.then(adapter => {
-                adapter.updateUploadProgress(id, progress);
-            });
-        };
-        /* @conditional-compile-remove(attachment-upload) */
-        this.updateUploadStatusMessage = (id, errorMessage) => {
-            this.chatAdapterPromise.then(adapter => {
-                adapter.updateUploadStatusMessage(id, errorMessage);
-            });
-        };
-        /* @conditional-compile-remove(attachment-upload) */
-        this.updateUploadMetadata = (id, metadata) => {
-            this.chatAdapterPromise.then(adapter => {
-                adapter.updateUploadMetadata(id, metadata);
-            });
-        };
+    constructor(callAdapter, chatAdapter) {
+        this.emitter = new EventEmitter();
+        this.isAdapterDisposed = false;
         this.bindPublicMethods();
         this.callAdapter = callAdapter;
         this.context = new CallWithChatContext(callWithChatAdapterStateFromBackingStates(callAdapter));
@@ -102,19 +61,28 @@ export class AzureCommunicationCallWithChatAdapter {
             this.context.updateClientStateWithChatState(newChatAdapterState);
         };
         this.onChatStateChange = onChatStateChange;
-        this.chatAdapterPromise = chatAdapterPromise;
-        this.chatAdapterPromise.then(chatAdapter => {
-            chatAdapter.onStateChange(this.onChatStateChange);
-            /* @conditional-compile-remove(attachment-download) @conditional-compile-remove(attachment-upload) */
-            this.chatAdapter = chatAdapter;
-            this.context.updateClientStateWithChatState(chatAdapter.getState());
-        });
+        if (chatAdapter) {
+            this.updateChatAdapter(chatAdapter);
+        }
         const onCallStateChange = (newCallAdapterState) => {
             this.context.updateClientStateWithCallState(newCallAdapterState);
         };
         this.callAdapter.onStateChange(onCallStateChange);
         this.onCallStateChange = onCallStateChange;
     }
+    setChatAdapterPromise(chatAdapter) {
+        chatAdapter.then(adapter => {
+            if (!this.isAdapterDisposed) {
+                this.updateChatAdapter(adapter);
+            }
+        });
+    }
+    updateChatAdapter(chatAdapter) {
+        this.chatAdapter = chatAdapter;
+        this.chatAdapter.onStateChange(this.onChatStateChange);
+        this.context.updateClientStateWithChatState(chatAdapter.getState());
+        this.emitter.emit('chatInitialized', this.chatAdapter);
+    }
     bindPublicMethods() {
         this.joinCall.bind(this);
         this.leaveCall.bind(this);
@@ -145,8 +113,6 @@ export class AzureCommunicationCallWithChatAdapter {
         this.disposeScreenShareStreamView.bind(this);
         this.fetchInitialData.bind(this);
         this.sendMessage.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.sendMessageWithAttachments.bind(this);
         this.sendReadReceipt.bind(this);
         this.sendTypingIndicator.bind(this);
         this.loadPreviousChatMessages.bind(this);
@@ -154,31 +120,9 @@ export class AzureCommunicationCallWithChatAdapter {
         this.deleteMessage.bind(this);
         this.on.bind(this);
         this.off.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.registerActiveUploads = this.registerActiveUploads.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.registerCompletedUploads = this.registerCompletedUploads.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.clearUploads = this.clearUploads.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.cancelUpload = this.cancelUpload.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.updateUploadProgress = this.updateUploadProgress.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.updateUploadStatusMessage = this.updateUploadStatusMessage.bind(this);
-        /* @conditional-compile-remove(attachment-upload) */
-        this.updateUploadMetadata = this.updateUploadMetadata.bind(this);
         this.downloadResourceToCache = this.downloadResourceToCache.bind(this);
         this.removeResourceFromCache = this.removeResourceFromCache.bind(this);
-        /* @conditional-compile-remove(PSTN-calls) */
-        this.holdCall.bind(this);
-        /* @conditional-compile-remove(PSTN-calls) */
-        this.resumeCall.bind(this);
-        /* @conditional-compile-remove(PSTN-calls) */
-        this.addParticipant.bind(this);
         this.sendDtmfTone.bind(this);
-        /* @conditional-compile-remove(unsupported-browser) */
-        this.allowUnsupportedBrowserVersion.bind(this);
         this.startCaptions.bind(this);
         this.stopCaptions.bind(this);
         this.setSpokenLanguage.bind(this);
@@ -235,23 +179,18 @@ export class AzureCommunicationCallWithChatAdapter {
     }
     /** Dispose of the current CallWithChatAdapter. */
     dispose() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.chatAdapterPromise.then(adapter => {
-                adapter.offStateChange(this.onChatStateChange);
-            });
-            this.callAdapter.offStateChange(this.onCallStateChange);
-            yield this.chatAdapterPromise.then(adapter => {
-                adapter.dispose();
-            });
-            this.callAdapter.dispose();
-        });
+        this.isAdapterDisposed = true;
+        if (this.chatAdapter) {
+            this.chatAdapter.offStateChange(this.onChatStateChange);
+            this.chatAdapter.dispose();
+        }
+        this.callAdapter.offStateChange(this.onCallStateChange);
+        this.callAdapter.dispose();
     }
     /** Remove a participant from the Call only. */
     removeParticipant(userId) {
         return __awaiter(this, void 0, void 0, function* () {
             let participant = userId;
-            /* @conditional-compile-remove(PSTN-calls) */
-            participant = _toCommunicationIdentifier(userId);
             yield this.callAdapter.removeParticipant(participant);
         });
     }
@@ -382,7 +321,7 @@ export class AzureCommunicationCallWithChatAdapter {
     /** Fetch initial Call and Chat data such as chat messages. */
     fetchInitialData() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.chatAdapterPromise.then(adapter => {
+            return yield this.executeWithResolvedChatAdapter(adapter => {
                 return adapter.fetchInitialData();
             });
         });
@@ -390,29 +329,15 @@ export class AzureCommunicationCallWithChatAdapter {
     /** Send a chat message. */
     sendMessage(content) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.chatAdapterPromise.then(adapter => {
+            return yield this.executeWithResolvedChatAdapter(adapter => {
                 return adapter.sendMessage(content);
             });
         });
     }
-    /* @conditional-compile-remove(attachment-upload) */
-    /** Send a chat message with attachments. */
-    sendMessageWithAttachments(content, attachments) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.chatAdapterPromise.then(adapter => {
-                const fileSharingMetadata = {
-                    fileSharingMetadata: JSON.stringify(attachments)
-                };
-                return adapter.sendMessage(content, {
-                    metadata: fileSharingMetadata
-                });
-            });
-        });
-    }
     /** Send a chat read receipt. */
     sendReadReceipt(chatMessageId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.chatAdapterPromise.then(adapter => {
+            return yield this.executeWithResolvedChatAdapter(adapter => {
                 return adapter.sendReadReceipt(chatMessageId);
             });
         });
@@ -420,7 +345,7 @@ export class AzureCommunicationCallWithChatAdapter {
     /** Send an isTyping indicator. */
     sendTypingIndicator() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.chatAdapterPromise.then(adapter => {
+            return yield this.executeWithResolvedChatAdapter(adapter => {
                 return adapter.sendTypingIndicator();
             });
         });
@@ -428,7 +353,7 @@ export class AzureCommunicationCallWithChatAdapter {
     /** Load previous Chat messages. */
     loadPreviousChatMessages(messagesToLoad) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.chatAdapterPromise.then(adapter => {
+            return yield this.executeWithResolvedChatAdapter(adapter => {
                 return adapter.loadPreviousChatMessages(messagesToLoad);
             });
         });
@@ -436,63 +361,36 @@ export class AzureCommunicationCallWithChatAdapter {
     /** Update an existing message. */
     updateMessage(messageId, content, metadata, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.chatAdapterPromise.then(adapter => {
-                return adapter.updateMessage(messageId, content, metadata, /* @conditional-compile-remove(attachment-upload) */ options);
+            return this.executeWithResolvedChatAdapter(adapter => {
+                return adapter.updateMessage(messageId, content, metadata);
             });
         });
     }
     /** Delete an existing message. */
     deleteMessage(messageId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.chatAdapterPromise.then(adapter => {
+            return yield this.executeWithResolvedChatAdapter(adapter => {
                 return adapter.deleteMessage(messageId);
             });
         });
     }
     downloadResourceToCache(resourceDetails) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.chatAdapterPromise.then(adapter => {
+            this.executeWithResolvedChatAdapter(adapter => {
                 adapter.downloadResourceToCache(resourceDetails);
             });
         });
     }
     removeResourceFromCache(resourceDetails) {
-        this.chatAdapterPromise.then(adapter => {
+        this.executeWithResolvedChatAdapter(adapter => {
             adapter.removeResourceFromCache(resourceDetails);
         });
     }
-    /* @conditional-compile-remove(PSTN-calls) */
-    holdCall() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.callAdapter.holdCall();
-        });
-    }
-    /* @conditional-compile-remove(PSTN-calls) */
-    resumeCall() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.callAdapter.resumeCall();
-        });
-    }
-    /* @conditional-compile-remove(PSTN-calls) */
-    addParticipant(participant, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (isCommunicationUserIdentifier(participant)) {
-                return yield this.callAdapter.addParticipant(participant);
-            }
-            else {
-                return yield this.callAdapter.addParticipant(participant, options);
-            }
-        });
-    }
     sendDtmfTone(dtmfTone) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.callAdapter.sendDtmfTone(dtmfTone);
         });
     }
-    /* @conditional-compile-remove(unsupported-browser) */
-    allowUnsupportedBrowserVersion() {
-        return this.callAdapter.allowUnsupportedBrowserVersion();
-    }
     startCaptions(options) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.callAdapter.startCaptions(options);
@@ -599,37 +497,37 @@ export class AzureCommunicationCallWithChatAdapter {
                 this.callAdapter.on('isSpokenLanguageChanged', listener);
                 break;
             case 'messageReceived':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('messageReceived', listener);
                 });
                 break;
             case 'messageEdited':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('messageEdited', listener);
                 });
                 break;
             case 'messageDeleted':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('messageDeleted', listener);
                 });
                 break;
             case 'messageSent':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('messageSent', listener);
                 });
                 break;
             case 'messageRead':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('messageRead', listener);
                 });
                 break;
             case 'chatParticipantsAdded':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('participantsAdded', listener);
                 });
                 break;
             case 'chatParticipantsRemoved':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('participantsRemoved', listener);
                 });
                 break;
@@ -637,10 +535,13 @@ export class AzureCommunicationCallWithChatAdapter {
                 this.callAdapter.on('error', listener);
                 break;
             case 'chatError':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.on('error', listener);
                 });
                 break;
+            case 'chatInitialized':
+                this.emitter.on(event, listener);
+                break;
             default:
                 throw `Unknown AzureCommunicationCallWithChatAdapter Event: ${event}`;
         }
@@ -691,37 +592,37 @@ export class AzureCommunicationCallWithChatAdapter {
                 this.callAdapter.off('isSpokenLanguageChanged', listener);
                 break;
             case 'messageReceived':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('messageReceived', listener);
                 });
                 break;
             case 'messageEdited':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('messageEdited', listener);
                 });
                 break;
             case 'messageDeleted':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('messageDeleted', listener);
                 });
                 break;
             case 'messageSent':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('messageSent', listener);
                 });
                 break;
             case 'messageRead':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('messageRead', listener);
                 });
                 break;
             case 'chatParticipantsAdded':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('participantsAdded', listener);
                 });
                 break;
             case 'chatParticipantsRemoved':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('participantsRemoved', listener);
                 });
                 break;
@@ -729,65 +630,167 @@ export class AzureCommunicationCallWithChatAdapter {
                 this.callAdapter.off('error', listener);
                 break;
             case 'chatError':
-                this.chatAdapterPromise.then(adapter => {
+                this.executeWithResolvedChatAdapter(adapter => {
                     adapter.off('error', listener);
                 });
                 break;
+            case 'chatInitialized':
+                this.emitter.off(event, listener);
+                break;
             default:
                 throw `Unknown AzureCommunicationCallWithChatAdapter Event: ${event}`;
         }
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    executeWithResolvedChatAdapter(callback) {
+        if (!this.chatAdapter) {
+            console.error('Chat is not initialized');
+        }
+        else {
+            return callback(this.chatAdapter);
+        }
+    }
 }
 /**
  * Arguments for use in {@link createAzureCommunicationCallWithChatAdapter} to join a Group Call with an associated Chat thread.
- * @public
+ * @private
  */
 export class CallAndChatProvider {
     constructor(locator) {
         this.locator = locator;
     }
-    getChatThread() {
+    isCallInfoRequired() {
+        return false;
+    }
+    getChatThreadPromise() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.locator.chatThreadId;
+            return this.getChatThread();
         });
     }
+    getChatThread() {
+        return this.locator.chatThreadId;
+    }
 }
 /**
  * Arguments for use in {@link createAzureCommunicationCallWithChatAdapter} to join a Teams meeting with an associated Chat thread.
  *
- * @public
+ * @private
  */
 export class TeamsMeetingLinkProvider {
-    constructor(locator) {
+    constructor(locator, /** @conditional-compile-remove(meeting-id) */ callAdapterPromise) {
         this.locator = locator;
+        /** @conditional-compile-remove(meeting-id) */
+        this.callAdapterPromise = callAdapterPromise;
+    }
+    isCallInfoRequired() {
+        return true;
     }
     getChatThread() {
-        return __awaiter(this, void 0, void 0, function* () {
+        /** @conditional-compile-remove(meeting-id) */
+        throw new Error('Chat thread ID should be retrieved from call.callInfo using method getChatThreadPromise');
+        return getChatThreadFromTeamsLink(this.locator.meetingLink);
+    }
+    getChatThreadPromise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            /** @conditional-compile-remove(meeting-id) */
+            {
+                // Wait for the call to be connected and get the chat thread ID from `call.callInfo`.
+                const chatThreadPromise = new Promise(resolve => {
+                    this.callAdapterPromise.then(callAdapter => {
+                        // Ensure function is idempotent by removing any existing subscription.
+                        this.callAdapterSubscription && callAdapter.offStateChange(this.callAdapterSubscription);
+                        this.callAdapterSubscription = (state) => {
+                            var _a, _b, _c;
+                            if (((_a = state.call) === null || _a === void 0 ? void 0 : _a.state) === 'Connected' && ((_b = state.call.info) === null || _b === void 0 ? void 0 : _b.threadId)) {
+                                this.callAdapterSubscription && callAdapter.offStateChange(this.callAdapterSubscription);
+                                this.callAdapterSubscription = undefined;
+                                resolve((_c = state.call.info) === null || _c === void 0 ? void 0 : _c.threadId);
+                            }
+                        };
+                        callAdapter.onStateChange(this.callAdapterSubscription);
+                    });
+                });
+                return chatThreadPromise;
+            }
             return getChatThreadFromTeamsLink(this.locator.meetingLink);
         });
     }
 }
+/** @conditional-compile-remove(meeting-id) */
+/**
+ * Arguments for use in {@link createAzureCommunicationCallWithChatAdapter} to join a Teams meeting using meeting id.
+ *
+ * @private
+ */
+export class TeamsMeetingIdProvider {
+    constructor(locator, callAdapter) {
+        this.locator = locator;
+        this.callAdapter = callAdapter;
+    }
+    isCallInfoRequired() {
+        return true;
+    }
+    getChatThread() {
+        throw new Error('Chat thread ID is not available for Teams meeting ID');
+    }
+    /**
+     * Wait call to be connected to get thread ID.
+     * @returns the chat thread ID for the given meeting ID.
+     */
+    getChatThreadPromise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise(resolve => {
+                const stateChangeListener = (state) => {
+                    var _a, _b, _c;
+                    if (((_a = state.call) === null || _a === void 0 ? void 0 : _a.state) === 'Connected' && ((_b = state.call.info) === null || _b === void 0 ? void 0 : _b.threadId)) {
+                        this.callAdapter.then(adapter => {
+                            adapter.offStateChange(stateChangeListener);
+                        });
+                        resolve((_c = state.call.info) === null || _c === void 0 ? void 0 : _c.threadId);
+                    }
+                };
+                this.callAdapter.then(adapter => {
+                    var _a, _b, _c;
+                    const callState = (_a = adapter.getState().call) === null || _a === void 0 ? void 0 : _a.state;
+                    const threadId = (_c = (_b = adapter.getState().call) === null || _b === void 0 ? void 0 : _b.info) === null || _c === void 0 ? void 0 : _c.threadId;
+                    if (callState === 'Connected' && threadId) {
+                        resolve(threadId);
+                    }
+                    else {
+                        adapter.onStateChange(stateChangeListener);
+                    }
+                });
+            });
+        });
+    }
+}
 /**
  * Create a CallWithChatAdapter backed by Azure Communication services
  * to plug into the {@link CallWithChatComposite}.
  *
  * @public
  */
-export const createAzureCommunicationCallWithChatAdapter = (_a) => __awaiter(void 0, [_a], void 0, function* ({ userId, displayName, credential, endpoint, locator, 
-/* @conditional-compile-remove(PSTN-calls) */ alternateCallerId, callAdapterOptions }) {
+export const createAzureCommunicationCallWithChatAdapter = (_a) => __awaiter(void 0, [_a], void 0, function* ({ userId, displayName, credential, endpoint, locator, callAdapterOptions }) {
     const callAdapterLocator = isTeamsMeetingLocator(locator) ? locator : locator.callLocator;
     const callAdapter = _createAzureCommunicationCallAdapterInner({
         userId,
         displayName,
         credential,
         locator: callAdapterLocator,
-        /* @conditional-compile-remove(PSTN-calls) */ alternateCallerId,
         options: callAdapterOptions,
         telemetryImplementationHint: 'CallWithChat'
     });
     const chatThreadAdapter = _createChatThreadAdapterInner(locator, callAdapter);
-    const chatAdapter = _createLazyAzureCommunicationChatAdapterInner(endpoint, userId, displayName, credential, chatThreadAdapter.getChatThread(), 'CallWithChat');
-    return new AzureCommunicationCallWithChatAdapter(yield callAdapter, chatAdapter);
+    if (chatThreadAdapter.isCallInfoRequired()) {
+        const callWithChatAdapter = new AzureCommunicationCallWithChatAdapter(yield callAdapter);
+        const chatAdapterPromise = _createLazyAzureCommunicationChatAdapterInner(endpoint, userId, displayName, credential, chatThreadAdapter.getChatThreadPromise(), 'CallWithChat');
+        callWithChatAdapter.setChatAdapterPromise(chatAdapterPromise);
+        return callWithChatAdapter;
+    }
+    else {
+        const chatAdapter = _createAzureCommunicationChatAdapterInner(endpoint, userId, displayName, credential, chatThreadAdapter.getChatThread(), 'CallWithChat');
+        return new AzureCommunicationCallWithChatAdapter(yield callAdapter, yield chatAdapter);
+    }
 });
 /**
  * A custom React hook to simplify the creation of {@link CallWithChatAdapter}.
@@ -804,8 +807,7 @@ export const createAzureCommunicationCallWithChatAdapter = (_a) => __awaiter(voi
  * @public
  */
 export const useAzureCommunicationCallWithChatAdapter = (args, afterCreate, beforeDispose) => {
-    const { credential, displayName, endpoint, locator, userId, 
-    /* @conditional-compile-remove(PSTN-calls) */ alternateCallerId, callAdapterOptions } = args;
+    const { credential, displayName, endpoint, locator, userId, callAdapterOptions } = args;
     // State update needed to rerender the parent component when a new adapter is created.
     const [adapter, setAdapter] = useState(undefined);
     // Ref needed for cleanup to access the old adapter created asynchronously.
@@ -847,7 +849,6 @@ export const useAzureCommunicationCallWithChatAdapter = (args, afterCreate, befo
                 endpoint,
                 locator,
                 userId,
-                /* @conditional-compile-remove(PSTN-calls) */ alternateCallerId,
                 callAdapterOptions
             });
             if (afterCreateRef.current) {
@@ -858,7 +859,7 @@ export const useAzureCommunicationCallWithChatAdapter = (args, afterCreate, befo
         }))();
     }, 
     // Explicitly list all arguments so that caller doesn't have to memoize the `args` object.
-    [adapterRef, afterCreateRef, /* @conditional-compile-remove(PSTN-calls) */ alternateCallerId, beforeDisposeRef, credential, displayName, endpoint, locator, userId, callAdapterOptions]);
+    [adapterRef, afterCreateRef, beforeDisposeRef, credential, displayName, endpoint, locator, userId, callAdapterOptions]);
     // Dispose any existing adapter when the component unmounts.
     useEffect(() => {
         return () => {
@@ -886,8 +887,8 @@ export const useAzureCommunicationCallWithChatAdapter = (args, afterCreate, befo
  */
 export const createAzureCommunicationCallWithChatAdapterFromClients = (_b) => __awaiter(void 0, [_b], void 0, function* ({ callClient, callAgent, callLocator, chatClient, chatThreadClient, callAdapterOptions }) {
     const callAdapter = yield createAzureCommunicationCallAdapterFromClient(callClient, callAgent, callLocator, callAdapterOptions);
-    const chatAdapterPromise = createAzureCommunicationChatAdapterFromClient(chatClient, chatThreadClient);
-    return new AzureCommunicationCallWithChatAdapter(callAdapter, chatAdapterPromise);
+    const chatAdapter = yield createAzureCommunicationChatAdapterFromClient(chatClient, chatThreadClient);
+    return new AzureCommunicationCallWithChatAdapter(callAdapter, chatAdapter);
 });
 /**
  * Create a {@link CallWithChatAdapter} from the underlying adapters.
@@ -896,13 +897,17 @@ export const createAzureCommunicationCallWithChatAdapterFromClients = (_b) => __
  *
  * @internal
  */
-export const _createAzureCommunicationCallWithChatAdapterFromAdapters = (callAdapter, chatAdapter) => new AzureCommunicationCallWithChatAdapter(callAdapter, new Promise(resolve => resolve(chatAdapter)));
+export const _createAzureCommunicationCallWithChatAdapterFromAdapters = (callAdapter, chatAdapter) => new AzureCommunicationCallWithChatAdapter(callAdapter, chatAdapter);
 const isTeamsMeetingLocator = (locator) => {
     return 'meetingLink' in locator || 'meetingId' in locator;
 };
 const _createChatThreadAdapterInner = (locator, adapter) => {
     if ('meetingLink' in locator) {
-        return new TeamsMeetingLinkProvider(locator);
+        return new TeamsMeetingLinkProvider(locator, /** @conditional-compile-remove(meeting-id) */ adapter);
+    }
+    /** @conditional-compile-remove(meeting-id) */
+    if ('meetingId' in locator) {
+        return new TeamsMeetingIdProvider(locator, adapter);
     }
     return new CallAndChatProvider(locator);
 };