Skip to content

[ACS][CallAutomation] Updates to be aligned with GA version #37543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minwoolee-msft merged 6 commits into from
Jul 28, 2023
Merged

[ACS][CallAutomation] Updates to be aligned with GA version #37543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b76b64
Updates to be aligned with GA version
minwoolee-msft Jul 11, 2023
c8c6368
ChannelAffinity access modifier update
minwoolee-msft Jul 11, 2023
d2e87dd
Updated api file
minwoolee-msft Jul 11, 2023
a2cd077
Fixing tests
minwoolee-msft Jul 11, 2023
1801e3f
Merge branch 'main' into minwoolee/smallfixes
minwoolee-msft Jul 24, 2023
96ccf20
Removed double newline
minwoolee-msft Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 28 additions & 37 deletions ...ure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 13 additions & 44 deletions sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ public class CallAutomationClient
internal CallRecordingRestClient CallRecordingRestClient { get; }
internal CallDialogRestClient CallDialogRestClient { get; }
internal CallAutomationEventProcessor EventProcessor { get; }
internal CommunicationUserIdentifier Source { get; }

/// <summary>
/// CommunicationUserIdentifier that makes the outbound call.
/// This can be provided by providing CallAutomationClientOption during construction of CallAutomationClient.
/// If left blank, service will create one each request.
/// </summary>
public CommunicationUserIdentifier Source { get; }

#region public constructors
/// <summary> Initializes a new instance of <see cref="CallAutomationClient"/>.</summary>
Expand Down Expand Up @@ -233,21 +239,11 @@ public virtual Response<AnswerCallResult> AnswerCall(AnswerCallOptions options,

private AnswerCallRequestInternal CreateAnswerCallRequest(AnswerCallOptions options)
{
// validate callbackUri
if (!IsValidHttpsUri(options.CallbackUri))
{
throw new ArgumentException(CallAutomationErrorMessages.InvalidHttpsUriMessage);
}

AnswerCallRequestInternal request = new AnswerCallRequestInternal(options.IncomingCallContext, options.CallbackUri.AbsoluteUri);
// Add custom cognitive service domain name
if (options.AzureCognitiveServicesEndpointUrl != null)
if (options.AzureCognitiveServicesEndpointUri != null)
{
if (!IsValidHttpsUri(options.AzureCognitiveServicesEndpointUrl))
{
throw new ArgumentException(CallAutomationErrorMessages.InvalidCognitiveServiceHttpsUriMessage);
}
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUrl.AbsoluteUri;
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUri.AbsoluteUri;
}
request.MediaStreamingConfiguration = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
request.AnsweredByIdentifier = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id);
Expand Down Expand Up @@ -622,13 +618,9 @@ private CreateCallRequestInternal CreateCallRequest(CreateCallOptions options)
options.CallInvite.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomContext.VoipHeaders);

// Add custom cognitive service domain name
if (options.AzureCognitiveServicesEndpointUrl != null)
if (options.AzureCognitiveServicesEndpointUri != null)
{
if (!IsValidHttpsUri(options.AzureCognitiveServicesEndpointUrl))
{
throw new ArgumentException(CallAutomationErrorMessages.InvalidCognitiveServiceHttpsUriMessage);
}
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUrl.AbsoluteUri;
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUri.AbsoluteUri;
}
request.OperationContext = options.OperationContext;
request.MediaStreamingConfiguration = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
Expand All @@ -654,13 +646,9 @@ private CreateCallRequestInternal CreateCallRequest(CreateGroupCallOptions optio
options.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CustomContext.VoipHeaders);

// Add custom cognitive service domain name
if (options.AzureCognitiveServicesEndpointUrl != null)
if (options.AzureCognitiveServicesEndpointUri != null)
{
if (!IsValidHttpsUri(options.AzureCognitiveServicesEndpointUrl))
{
throw new ArgumentException(CallAutomationErrorMessages.InvalidCognitiveServiceHttpsUriMessage);
}
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUrl.AbsoluteUri;
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUri.AbsoluteUri;
}
request.OperationContext = options.OperationContext;
request.MediaStreamingConfiguration = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
Expand Down Expand Up @@ -736,24 +724,5 @@ public virtual CallAutomationEventProcessor GetEventProcessor()
throw;
}
}

/// <summary>
/// Get source identity used by Call Automation client.
/// </summary>
/// <returns></returns>
public virtual CommunicationUserIdentifier GetSourceIdentity()
{
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallAutomationClient)}.{nameof(GetSourceIdentity)}");
scope.Start();
try
{
return Source;
}
catch (Exception ex)
{
scope.Failed(ex);
throw;
}
}
}
}
Loading