Update storybook

common/config/babel/features.js

@@ -77,6 +77,8 @@ module.exports = {
     'spotlight',
     // Feature for tracking beta start call identifier
     'start-call-beta',
+    // Join meeting with meetingId and passcode
+    'meeting-id',
     // Image overlay theme
     'image-overlay-theme',
      // Close captions feature for ACS calls
@@ -106,6 +108,8 @@ module.exports = {
     'rich-text-editor',
     // Feature for spotlight
     'spotlight',
+    // Join meeting with meetingId and passcode
+    'meeting-id',
     // Close captions feature for ACS calls
     "acs-close-captions",
   ],

packages/calling-stateful-client/src/CallAgentDeclarative.test.ts

@@ -215,6 +215,26 @@ describe('declarative call agent', () => {
     expect(Object.keys(context.getState().calls).length).toBe(1);
   });
 
+  test('should update state with new call when join to meeting is invoked', () => {
+    const mockCallAgent = new MockCallAgent();
+    const context = new CallContext({ kind: 'communicationUser', communicationUserId: '' });
+    const internalContext = new InternalCallContext();
+    expect(Object.keys(context.getState().calls).length).toBe(0);
+    const declarativeCallAgent = callAgentDeclaratify(mockCallAgent, context, internalContext);
+    declarativeCallAgent.join({ meetingId: '123', passcode: 'qwe' });
+    expect(Object.keys(context.getState().calls).length).toBe(1);
+  });
+
+  test('should update state with new call when join to meeting and without passcode is invoked', () => {
+    const mockCallAgent = new MockCallAgent();
+    const context = new CallContext({ kind: 'communicationUser', communicationUserId: '' });
+    const internalContext = new InternalCallContext();
+    expect(Object.keys(context.getState().calls).length).toBe(0);
+    const declarativeCallAgent = callAgentDeclaratify(mockCallAgent, context, internalContext);
+    declarativeCallAgent.join({ meetingId: '123' });
+    expect(Object.keys(context.getState().calls).length).toBe(1);
+  });
+
   test('should move call to callEnded when call is removed and add endTime', async () => {
     const mockCallAgent = new MockCallAgent();
     const context = new CallContext({ kind: 'communicationUser', communicationUserId: '' });

packages/calling-stateful-client/src/CallClientState.ts

@@ -17,6 +17,8 @@ import {
   ScalingMode,
   VideoDeviceInfo
 } from '@azure/communication-calling';
+/* @conditional-compile-remove(meeting-id) */
+import { CallInfo, TeamsCallInfo } from '@azure/communication-calling';
 /* @conditional-compile-remove(capabilities) */
 import { CapabilitiesChangeInfo, ParticipantCapabilities } from '@azure/communication-calling';
 /* @conditional-compile-remove(close-captions) */
@@ -632,6 +634,11 @@ export interface CallState {
    * Proxy of {@link @azure/communication-calling#SpotlightCallFeature}.
    */
   spotlight?: SpotlightCallFeatureState;
+  /* @conditional-compile-remove(meeting-id) */
+  /**
+   * Proxy of {@link @azure/communication-calling#Call.info}.
+   */
+  info?: CallInfo | TeamsCallInfo;
 }
 
 /* @conditional-compile-remove(call-transfer) */

packages/calling-stateful-client/src/CallContext.ts

@@ -187,6 +187,8 @@ export class CallContext {
         existingCall.captionsFeature.currentSpokenLanguage = call.captionsFeature.currentSpokenLanguage;
         /* @conditional-compile-remove(close-captions) */
         existingCall.captionsFeature.currentCaptionLanguage = call.captionsFeature.currentCaptionLanguage;
+        /* @conditional-compile-remove(meeting-id) */
+        existingCall.info = call.info;
       } else {
         draft.calls[latestCallId] = call;
       }

packages/calling-stateful-client/src/Converter.ts

@@ -25,8 +25,10 @@ import {
 /* @conditional-compile-remove(close-captions) */
 import { CaptionsInfo } from './CallClientState';
 
-/* @conditional-compile-remove(teams-identity-support) */
+/* @conditional-compile-remove(teams-identity-support) */ /* @conditional-compile-remove(meeting-id) */
 import { _isACSCall } from './TypeGuards';
+/* @conditional-compile-remove(meeting-id) */
+import { _isTeamsCall } from './TypeGuards';
 import { CallCommon, IncomingCallCommon } from './BetaToStableTypes';
 
 import { Features } from '@azure/communication-calling';
@@ -161,7 +163,9 @@ export function convertSdkCallToDeclarativeCall(call: CallCommon): CallState {
     },
     /* @conditional-compile-remove(hide-attendee-name) */
     // TODO: Replace this once the SDK supports hide attendee name
-    hideAttendeeNames: false
+    hideAttendeeNames: false,
+    /* @conditional-compile-remove(meeting-id) */
+    info: _isACSCall(call) ? call.info : _isTeamsCall(call) ? call.info : undefined
   };
 }
 

packages/communication-react/review/beta/communication-react.api.md

@@ -19,6 +19,7 @@ import { CallClientOptions } from '@azure/communication-calling';
 import { CallDirection } from '@azure/communication-calling';
 import { CallEndReason } from '@azure/communication-calling';
 import { CallerInfo } from '@azure/communication-calling';
+import { CallInfo } from '@azure/communication-calling';
 import { CallKind } from '@azure/communication-calling';
 import { CallState as CallState_2 } from '@azure/communication-calling';
 import { CallSurvey } from '@azure/communication-calling';
@@ -91,6 +92,8 @@ import { StartCallOptions } from '@azure/communication-calling';
 import { StartCaptionsOptions } from '@azure/communication-calling';
 import { TeamsCall } from '@azure/communication-calling';
 import { TeamsCallAgent } from '@azure/communication-calling';
+import { TeamsCallInfo } from '@azure/communication-calling';
+import { TeamsMeetingIdLocator } from '@azure/communication-calling';
 import { TeamsMeetingLinkLocator } from '@azure/communication-calling';
 import { Theme } from '@fluentui/react';
 import { TransferEventArgs } from '@azure/communication-calling';
@@ -192,7 +195,7 @@ export type AzureCommunicationCallWithChatAdapterArgs = {
     userId: CommunicationUserIdentifier;
     displayName: string;
     credential: CommunicationTokenCredential;
-    locator: CallAndChatLocator | TeamsMeetingLinkLocator;
+    locator: CallAndChatLocator | TeamsMeetingLinkLocator | /** @conditional-compile-remove(meeting-id) */ TeamsMeetingIdLocator;
     alternateCallerId?: string;
     callAdapterOptions?: AzureCommunicationCallAdapterOptions;
 };
@@ -413,7 +416,7 @@ export interface CallAdapterDeviceManagement {
 }
 
 // @public
-export type CallAdapterLocator = TeamsMeetingLinkLocator | GroupCallLocator | RoomCallLocator | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator;
+export type CallAdapterLocator = TeamsMeetingLinkLocator | GroupCallLocator | RoomCallLocator | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator | /* @conditional-compile-remove(meeting-id) */ TeamsMeetingIdLocator;
 
 // @public
 export type CallAdapterState = CallAdapterUiState & CallAdapterClientState;
@@ -726,6 +729,7 @@ export interface CallCompositeStrings {
     failedToJoinTeamsMeetingReasonAccessDeniedMoreDetails?: string;
     failedToJoinTeamsMeetingReasonAccessDeniedTitle: string;
     holdScreenLabel: string;
+    invalidMeetingIdentifier: string;
     inviteToRoomRemovedDetails?: string;
     inviteToRoomRemovedTitle: string;
     learnMore: string;
@@ -959,6 +963,7 @@ export interface CallState {
     endTime: Date | undefined;
     hideAttendeeNames?: boolean;
     id: string;
+    info?: CallInfo | TeamsCallInfo;
     isMuted: boolean;
     isScreenSharingOn: boolean;
     kind: CallKind;
@@ -4264,7 +4269,7 @@ export interface TeamsCallAdapter extends CommonCallAdapter {
 export type TeamsCallAdapterArgs = {
     userId: MicrosoftTeamsUserIdentifier;
     credential: CommunicationTokenCredential;
-    locator: TeamsMeetingLinkLocator | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator;
+    locator: TeamsMeetingLinkLocator | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator | /* @conditional-compile-remove(meeting-id) */ TeamsMeetingIdLocator;
     options?: TeamsAdapterOptions;
 };
 

packages/react-composites/src/composites/CallComposite/Strings.tsx

@@ -829,4 +829,9 @@ export interface CallCompositeStrings {
    * Tooltip for button to exit spotlight
    */
   exitSpotlightButtonTooltip: string;
+  /* @conditional-compile-remove(meeting-id) */
+  /**
+   * Error message when the meeting identifier or passcode is invalid
+   */
+  invalidMeetingIdentifier: string;
 }

packages/react-composites/src/composites/CallComposite/adapter/AzureCommunicationCallAdapter.ts

@@ -39,6 +39,8 @@ import {
 } from '@azure/communication-calling';
 /* @conditional-compile-remove(spotlight) */
 import { SpotlightedParticipant } from '@azure/communication-calling';
+/* @conditional-compile-remove(meeting-id) */
+import { TeamsMeetingIdLocator } from '@azure/communication-calling';
 /* @conditional-compile-remove(reaction) */
 import { Reaction } from '@azure/communication-calling';
 /* @conditional-compile-remove(close-captions) */
@@ -405,7 +407,9 @@ export class AzureCommunicationCallAdapter<AgentType extends CallAgent | BetaTea
         ? (locatorOrTargetCalless as CallAdapterLocator)
         : undefined;
     this.deviceManager = deviceManager;
-    const isTeamsMeeting = this.locator ? 'meetingLink' in this.locator : false;
+    const isTeamsMeeting = this.locator
+      ? 'meetingLink' in this.locator || /* @conditional-compile-remove(meeting-id) */ 'meetingId' in this.locator
+      : false;
 
     const isRoomsCall = this.locator ? 'roomId' in this.locator : false;
 
@@ -653,21 +657,38 @@ export class AzureCommunicationCallAdapter<AgentType extends CallAgent | BetaTea
 
   private _joinCall(audioOptions: AudioOptions, videoOptions: VideoOptions): CallTypeOf<AgentType> {
     const isTeamsMeeting = this.locator ? 'meetingLink' in this.locator : false;
+    /* @conditional-compile-remove(meeting-id) */
+    const isTeamsMeetingId = this.locator ? 'meetingId' in this.locator : false;
     const isRoomsCall = this.locator ? 'roomId' in this.locator : false;
 
     /* @conditional-compile-remove(teams-identity-support) */
     if (_isTeamsCallAgent(this.callAgent)) {
-      if (!isTeamsMeeting) {
-        throw new Error('Locator not supported by TeamsCallAgent');
+      if (isTeamsMeeting) {
+        return this.callAgent.join(this.locator as TeamsMeetingLinkLocator, {
+          audioOptions,
+          videoOptions
+        }) as CallTypeOf<AgentType>;
+      }
+      /* @conditional-compile-remove(meeting-id) */
+      if (isTeamsMeetingId) {
+        return this.callAgent.join(this.locator as TeamsMeetingIdLocator, {
+          audioOptions,
+          videoOptions
+        }) as CallTypeOf<AgentType>;
       }
+      throw new Error('Locator not supported by TeamsCallAgent');
+    }
 
+    if (isTeamsMeeting) {
       return this.callAgent.join(this.locator as TeamsMeetingLinkLocator, {
         audioOptions,
         videoOptions
       }) as CallTypeOf<AgentType>;
     }
-    if (isTeamsMeeting) {
-      return this.callAgent.join(this.locator as TeamsMeetingLinkLocator, {
+
+    /* @conditional-compile-remove(meeting-id) */
+    if (isTeamsMeetingId) {
+      return this.callAgent.join(this.locator as TeamsMeetingIdLocator, {
         audioOptions,
         videoOptions
       }) as CallTypeOf<AgentType>;
@@ -1380,7 +1401,8 @@ export type CallAdapterLocator =
   | TeamsMeetingLinkLocator
   | GroupCallLocator
   | RoomCallLocator
-  | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator;
+  | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator
+  | /* @conditional-compile-remove(meeting-id) */ TeamsMeetingIdLocator;
 
 /**
  * Common optional parameters to create {@link AzureCommunicationCallAdapter} or {@link TeamsCallAdapter}
@@ -1490,7 +1512,8 @@ export type TeamsCallAdapterArgs = {
   credential: CommunicationTokenCredential;
   locator:
     | TeamsMeetingLinkLocator
-    | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator;
+    | /* @conditional-compile-remove(teams-adhoc-call) */ /* @conditional-compile-remove(PSTN-calls) */ CallParticipantsLocator
+    | /* @conditional-compile-remove(meeting-id) */ TeamsMeetingIdLocator;
   /**
    * Optional parameters for the {@link TeamsCallAdapter} created
    */

packages/react-composites/src/composites/CallComposite/utils/Utils.ts

@@ -23,6 +23,8 @@ const ACCESS_DENIED_TEAMS_MEETING_SUB_CODE = 5854;
 const REMOTE_PSTN_USER_HUNG_UP = 560000;
 const REMOVED_FROM_CALL_SUB_CODES = [5000, 5300, REMOTE_PSTN_USER_HUNG_UP];
 const CALL_REJECTED_CODE = 603;
+/* @conditional-compile-remove(meeting-id) */
+const INVALID_MEETING_IDENTIFIER = 5751;
 /** @private */
 export const ROOM_NOT_FOUND_SUB_CODE = 5732;
 /** @private */
@@ -227,6 +229,16 @@ export const getEndedCallPageProps = (
       }
       break;
   }
+  /* @conditional-compile-remove(meeting-id) */
+  switch (endedCall?.callEndReason?.subCode) {
+    case INVALID_MEETING_IDENTIFIER:
+      if (locale.strings.call.callRejectedTitle) {
+        title = locale.strings.call.callRejectedTitle;
+        moreDetails = locale.strings.call.invalidMeetingIdentifier;
+        disableStartCallButton = true;
+      }
+      break;
+  }
   return { title, moreDetails, disableStartCallButton, iconName };
 };
 

packages/react-composites/src/composites/CallWithChatComposite/adapter/AzureCommunicationCallWithChatAdapter.test.ts

@@ -30,6 +30,28 @@ describe('Adapter is created as expected', () => {
     const adapter = await createAzureCommunicationCallWithChatAdapterFromClients(args);
     expect(adapter).toBeDefined();
   });
+
+  /* @conditional-compile-remove(meeting-id) */
+  it('when creating a new adapter from stateful client with meeting id', async () => {
+    const mockCallClient = new MockCallClient() as unknown as StatefulCallClient;
+    const mockCallAgent = new MockCallAgent();
+    const locator = { meetingId: '123', passcode: 'qwe' };
+    const statefulChatClient = createStatefulChatClientMock(new StubChatThreadClient());
+    const threadClient = statefulChatClient.getChatThreadClient('threadId');
+    /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
+    const options = { credential: stubCommunicationTokenCredential() };
+    const args = {
+      callClient: mockCallClient,
+      callAgent: mockCallAgent,
+      callLocator: locator,
+      chatClient: statefulChatClient,
+      chatThreadClient: threadClient,
+      /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
+      options: options
+    };
+    const adapter = await createAzureCommunicationCallWithChatAdapterFromClients(args);
+    expect(adapter).toBeDefined();
+  });
 });
 /**
  * Stub implementation of CommunicationTokenCredential