From 47065b6f198b852d671d45c84d2f0935b655c455 Mon Sep 17 00:00:00 2001
From: Fang Chen <fanche@microsoft.com>
Date: Wed, 12 Jul 2023 09:09:23 +0800
Subject: [PATCH 1/6] create Customcontext class

---
 .../src/CallAutomationClient.cs               | 16 ++---
 .../src/CallConnection.cs                     |  8 +--
 .../src/Models/CallInvite.cs                  | 27 ++++----
 .../src/Models/CreateGroupCallOptions.cs      | 10 +--
 .../src/Models/CustomContext.cs               | 65 +++++++++++++++++++
 .../src/Models/CustomContextHeader.cs         | 30 +++++++++
 .../src/Models/SIPCustomHeader.cs             | 20 ++++++
 .../src/Models/SIPUUIHeader.cs                | 19 ++++++
 .../Models/TransferToParticipantOptions.cs    | 28 ++++----
 .../src/Models/VoipHeader.cs                  | 20 ++++++
 10 files changed, 193 insertions(+), 50 deletions(-)
 create mode 100644 sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs
 create mode 100644 sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs
 create mode 100644 sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs
 create mode 100644 sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs
 create mode 100644 sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs

diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
index 274b40d38985..45fefd49b5e1 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
@@ -297,8 +297,8 @@ public virtual async Task<Response> RedirectCallAsync(RedirectCallOptions option
                 var repeatabilityHeaders = new RepeatabilityHeaders();
 
                 request.CustomContext = new CustomContextInternal(
-                   options.CallInvite.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.SipHeaders,
-                   options.CallInvite.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.VoipHeaders);
+                   options.CallInvite.CustomContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomContext.SipHeaders,
+                   options.CallInvite.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomContext.VoipHeaders);
 
                 return await AzureCommunicationServicesRestClient.RedirectCallAsync(
                     request,
@@ -346,8 +346,8 @@ public virtual Response RedirectCall(RedirectCallOptions options, CancellationTo
                 var repeatabilityHeaders = new RepeatabilityHeaders();
 
                 request.CustomContext = new CustomContextInternal(
-                   options.CallInvite.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.SipHeaders,
-                   options.CallInvite.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.VoipHeaders);
+                   options.CallInvite.CustomContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomContext.SipHeaders,
+                   options.CallInvite.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomContext.VoipHeaders);
 
                 return AzureCommunicationServicesRestClient.RedirectCall(
                     request,
@@ -674,8 +674,8 @@ private CreateCallRequestInternal CreateCallRequest(CreateCallOptions options)
             };
 
             request.CustomContext = new CustomContextInternal(
-               options.CallInvite.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.SipHeaders,
-               options.CallInvite.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.VoipHeaders);
+               options.CallInvite.CustomContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomContext.SipHeaders,
+               options.CallInvite.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomContext.VoipHeaders);
 
             // Add custom cognitive service domain name
             if (options.AzureCognitiveServicesEndpointUrl != null)
@@ -706,8 +706,8 @@ private CreateCallRequestInternal CreateCallRequest(CreateGroupCallOptions optio
             };
 
             request.CustomContext = new CustomContextInternal(
-               options.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.SipHeaders,
-               options.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.VoipHeaders);
+               options.CustomContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CustomContext.SipHeaders,
+               options.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CustomContext.VoipHeaders);
 
             // Add custom cognitive service domain name
             if (options.AzureCognitiveServicesEndpointUrl != null)
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs
index e35981cdf663..3d30430f7171 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs
@@ -305,8 +305,8 @@ private static TransferToParticipantRequestInternal CreateTransferToParticipantR
             TransferToParticipantRequestInternal request = new TransferToParticipantRequestInternal(CommunicationIdentifierSerializer.Serialize(options.Target));
 
             request.CustomContext = new CustomContextInternal(
-                options.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.SipHeaders,
-                options.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.VoipHeaders);
+                options.CustomContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CustomContext.SipHeaders,
+                options.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CustomContext.VoipHeaders);
 
             if (options.OperationContext != null && options.OperationContext.Length > CallAutomationConstants.InputValidation.StringMaxLength)
             {
@@ -444,8 +444,8 @@ private static AddParticipantRequestInternal CreateAddParticipantRequest(AddPart
             }
 
             request.CustomContext = new CustomContextInternal(
-                options.ParticipantToAdd.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.ParticipantToAdd.SipHeaders,
-                options.ParticipantToAdd.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.ParticipantToAdd.VoipHeaders);
+                options.ParticipantToAdd.CustomContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.ParticipantToAdd.CustomContext.SipHeaders,
+                options.ParticipantToAdd.CustomContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.ParticipantToAdd.CustomContext.VoipHeaders);
 
             return request;
         }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs
index 995d3c8adedc..6441bf3b753b 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
+using Azure.Communication.CallAutomation.Models;
 
 namespace Azure.Communication.CallAutomation
 {
@@ -15,34 +16,31 @@ public class CallInvite
         /// </summary>
         /// <param name="targetPhoneNumberIdentity"></param>
         /// <param name="callerIdNumber"></param>
-        /// /// <param name="sipHeaders"></param>
-        public CallInvite(PhoneNumberIdentifier targetPhoneNumberIdentity, PhoneNumberIdentifier callerIdNumber, IDictionary<string, string> sipHeaders = null)
+        public CallInvite(PhoneNumberIdentifier targetPhoneNumberIdentity, PhoneNumberIdentifier callerIdNumber)
         {
             Target = targetPhoneNumberIdentity;
             SourceCallerIdNumber = callerIdNumber;
-            SipHeaders= sipHeaders == null ? new Dictionary<string, string>() : sipHeaders;
+            CustomContext = new CustomContext(sipHeaders: new Dictionary<string, string>(), voipHeaders: null);
         }
 
         /// <summary>
         /// Creates a new CallInvite object.
         /// </summary>
         /// <param name="targetIdentity"></param>
-        /// <param name="voipHeaders"></param>
-        public CallInvite(CommunicationUserIdentifier targetIdentity, IDictionary<string, string> voipHeaders = null)
+        public CallInvite(CommunicationUserIdentifier targetIdentity)
         {
             Target = targetIdentity;
-            VoipHeaders= voipHeaders == null ? new Dictionary<string, string>() : voipHeaders;
+            CustomContext = new CustomContext(sipHeaders: null, voipHeaders: new Dictionary<string, string>());
         }
 
         /// <summary>
         /// Creates a new CallInvite object.
         /// </summary>
         /// <param name="targetIdentity"></param>
-        /// <param name="voipHeaders"></param>
-        public CallInvite(MicrosoftTeamsUserIdentifier targetIdentity, IDictionary<string, string> voipHeaders = null)
+        public CallInvite(MicrosoftTeamsUserIdentifier targetIdentity)
         {
             Target = targetIdentity;
-            VoipHeaders = voipHeaders == null ? new Dictionary<string, string>() : voipHeaders;
+            CustomContext = new CustomContext(sipHeaders: null, voipHeaders: new Dictionary<string, string>());
         }
 
         /// <summary>
@@ -57,16 +55,15 @@ public CallInvite(MicrosoftTeamsUserIdentifier targetIdentity, IDictionary<strin
         /// <value></value>
         public PhoneNumberIdentifier SourceCallerIdNumber { get; }
 
-        /// <summary> Dictionary of VOIP headers. </summary>
-        public IDictionary<string, string> VoipHeaders { get; }
-
-        /// <summary> Dictionary of SIP headers. </summary>
-        public IDictionary<string, string> SipHeaders { get; }
-
         /// <summary>
         /// The display name to appear on target callee.
         /// </summary>
         /// <value></value>
         public string SourceDisplayName { get; set; }
+
+        /// <summary>
+        /// The Custom Context which contains SIP and voip headers
+        /// </summary>
+        public CustomContext CustomContext { get; }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
index 038f3449aa65..d2371b1f84f4 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.Communication.CallAutomation.Models;
 
 namespace Azure.Communication.CallAutomation
 {
@@ -57,13 +58,8 @@ public CreateGroupCallOptions(IEnumerable<CommunicationIdentifier> targets, Uri
         public Uri AzureCognitiveServicesEndpointUrl { get; set; }
 
         /// <summary>
-        /// Custom Context for PSTN targets.
+        /// The Custom Context which contains SIP and voip headers
         /// </summary>
-        public IDictionary<string, string> SipHeaders { get; set; }
-
-        /// <summary>
-        /// Custom Context for Voip targets.
-        /// </summary>
-        public IDictionary<string, string> VoipHeaders { get; set; }
+        public CustomContext CustomContext { get; set; }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs
new file mode 100644
index 000000000000..55bf99dda932
--- /dev/null
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.Communication.CallAutomation.Models
+{
+    /// <summary>
+    /// CustomContext details.
+    /// </summary>
+    public class CustomContext
+    {
+        /// <summary> Dictionary of VOIP headers. </summary>
+        public IDictionary<string, string> VoipHeaders { get; }
+
+        /// <summary> Dictionary of SIP headers. </summary>
+        public IDictionary<string, string> SipHeaders { get; }
+
+        /// <summary>
+        /// Creates a new CustomContext.
+        /// </summary>
+        public CustomContext(IDictionary<string, string> sipHeaders, IDictionary<string, string> voipHeaders)
+        {
+            SipHeaders = sipHeaders;
+            VoipHeaders = voipHeaders;
+        }
+
+        /// <summary>
+        /// Add a custom context sip or voip header.
+        /// </summary>
+        /// <param name="header">custom context sip UUI, custom header or voip header.</param>
+        public void Add(CustomContextHeader header)
+        {
+            if (header is SIPUUIHeader sipUUIHeader)
+            {
+                if (SipHeaders == null)
+                {
+                    throw new InvalidOperationException("Cannot add sip header, SipHeaders is null.");
+                }
+                SipHeaders.Add(sipUUIHeader.Key, sipUUIHeader.Value);
+            }
+            else if (header is SIPCustomHeader sipCustomHeader)
+            {
+                if (SipHeaders == null)
+                {
+                    throw new InvalidOperationException("Cannot add sip header, SipHeaders is null.");
+                }
+                SipHeaders.Add(sipCustomHeader.Key, sipCustomHeader.Value);
+            }
+            else if (header is VoipHeader voipHeader)
+            {
+                if (VoipHeaders == null)
+                {
+                    throw new InvalidOperationException("Cannot add voip header, VoipHeaders is null");
+                }
+                VoipHeaders.Add(voipHeader.Key, voipHeader.Value);
+            }
+            else
+            {
+                throw new InvalidOperationException("Unknown custom context header type.");
+            }
+        }
+    }
+}
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs
new file mode 100644
index 000000000000..e8b1ea7e4e85
--- /dev/null
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Communication.CallAutomation.Models
+{
+    /// <summary>
+    /// The base class of CustomContext SipHeader and VoipHeader.
+    /// </summary>
+    public abstract class CustomContextHeader
+    {
+        /// <summary>
+        /// The CustomContext Key name.
+        /// </summary>
+        public string Key { get; }
+
+        /// <summary>
+        /// The CustomContext Key value.
+        /// </summary>
+        public string Value { get; }
+
+        /// <summary>
+        /// Creates a new CustomContextHeader
+        /// </summary>
+        protected CustomContextHeader(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+    }
+}
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs
new file mode 100644
index 000000000000..eddd6b2692da
--- /dev/null
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Communication.CallAutomation.Models
+{
+    /// <summary>
+    /// Custom Context Sip header.
+    /// </summary>
+    public class SIPCustomHeader : CustomContextHeader
+    {
+        /// <summary>
+        /// Create a new Sip header.
+        /// </summary>
+        /// <param name="key">sip header key name.</param>
+        /// <param name="value">sip header value.</param>
+        public SIPCustomHeader(string key, string value) : base("X-MS-Custom-"+key, value)
+        {
+        }
+    }
+}
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs
new file mode 100644
index 000000000000..7ac0b532e9bb
--- /dev/null
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Communication.CallAutomation.Models
+{
+    /// <summary>
+    /// Custom Context User-to-User Sip header.
+    /// </summary>
+    public class SIPUUIHeader : CustomContextHeader
+    {
+        /// <summary>
+        /// Create a new Sip UUI header.
+        /// </summary>
+        /// <param name="value">CustomContext Sip UUI value.</param>
+        public SIPUUIHeader(string value) : base("User-to-User", value)
+        {
+        }
+    }
+}
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs
index 35e758681276..5d1b64ad43d9 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
+using Azure.Communication.CallAutomation.Models;
 
 namespace Azure.Communication.CallAutomation
 {
@@ -15,33 +15,30 @@ public class TransferToParticipantOptions
         /// Creates a new TransferToParticipantOptions object.
         /// </summary>
         /// <param name="targetPhoneNumberIdentity"> The target to transfer the call to. </param>
-        /// <param name="sipHeaders"> Custom Context Sip headers. </param>
-        public TransferToParticipantOptions(PhoneNumberIdentifier targetPhoneNumberIdentity, IDictionary<string, string> sipHeaders = null)
+        public TransferToParticipantOptions(PhoneNumberIdentifier targetPhoneNumberIdentity)
         {
             Target = targetPhoneNumberIdentity;
-            SipHeaders = sipHeaders == null ? new Dictionary<string, string>() : sipHeaders;
+            CustomContext = new CustomContext(sipHeaders: new Dictionary<string, string>(), null);
         }
 
         /// <summary>
         /// Creates a new TransferToParticipantOptions object.
         /// </summary>
         /// <param name="targetIdentity"> The target to transfer the call to. </param>
-        /// <param name="voipHeaders"> Custom Context Voip headers. </param>
-        public TransferToParticipantOptions(CommunicationUserIdentifier targetIdentity, IDictionary<string, string> voipHeaders = null)
+        public TransferToParticipantOptions(CommunicationUserIdentifier targetIdentity)
         {
             Target = targetIdentity;
-            VoipHeaders = voipHeaders == null ? new Dictionary<string, string>() : voipHeaders;
+            CustomContext = new CustomContext(sipHeaders: null, voipHeaders: new Dictionary<string, string>());
         }
 
         /// <summary>
         /// Creates a new TransferToParticipantOptions object.
         /// </summary>
         /// <param name="targetIdentity"> The target to transfer the call to. </param>
-        /// <param name="voipHeaders"> Custom Context Voip headers. </param>
-        public TransferToParticipantOptions(MicrosoftTeamsUserIdentifier targetIdentity, IDictionary<string, string> voipHeaders = null)
+        public TransferToParticipantOptions(MicrosoftTeamsUserIdentifier targetIdentity)
         {
             Target = targetIdentity;
-            VoipHeaders = voipHeaders == null ? new Dictionary<string, string>() : voipHeaders;
+            CustomContext = new CustomContext(sipHeaders: null, voipHeaders: new Dictionary<string, string>());
         }
 
         /// <summary>
@@ -50,15 +47,14 @@ public TransferToParticipantOptions(MicrosoftTeamsUserIdentifier targetIdentity,
         /// <value></value>
         public CommunicationIdentifier Target { get; }
 
-        /// <summary> Dictionary of VOIP headers. </summary>
-        public IDictionary<string, string> VoipHeaders { get; }
-
-        /// <summary> Dictionary of SIP headers. </summary>
-        public IDictionary<string, string> SipHeaders { get; }
-
         /// <summary>
         /// The operationContext for this transfer call.
         /// </summary>
         public string OperationContext { get; set; }
+
+        /// <summary>
+        /// The Custom Context which contains SIP and voip headers
+        /// </summary>
+        public CustomContext CustomContext { get; }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs
new file mode 100644
index 000000000000..177ffa09bee6
--- /dev/null
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Communication.CallAutomation.Models
+{
+    /// <summary>
+    /// Custom Context Voip header.
+    /// </summary>
+    public class VoipHeader : CustomContextHeader
+    {
+        /// <summary>
+        /// Create a new voip header.
+        /// </summary>
+        /// <param name="key">voip header key name.</param>
+        /// <param name="value">voip header value.</param>
+        public VoipHeader(string key, string value) : base(key, value)
+        {
+        }
+    }
+}

From b4e04e89d2cc30719435c1af1bcdc01c54cf7958 Mon Sep 17 00:00:00 2001
From: Fang Chen <fanche@microsoft.com>
Date: Wed, 12 Jul 2023 11:38:59 +0800
Subject: [PATCH 2/6] fix UT

---
 .../tests/CallConnections/CallConnectionTests.cs            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs b/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs
index 1a32c2216f02..4ef39fd9d74c 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/tests/CallConnections/CallConnectionTests.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
+using Azure.Communication.CallAutomation.Models;
 using Azure.Communication.CallAutomation.Tests.Infrastructure;
 using System;
 
@@ -561,12 +562,13 @@ private CallConnection CreateMockCallConnection(int responseCode, string? respon
 
         private static IEnumerable<object?[]> TestData_TransferCallToParticipant()
         {
+            var callInvite = new CallInvite(new CommunicationUserIdentifier("userId"));
+            callInvite.CustomContext.Add(new VoipHeader("key1", "value1"));
             return new[]
             {
                 new object?[]
                 {
-                    new CallInvite(new CommunicationUserIdentifier("userId")){
-                        VoipHeaders = {{ "key1", "value1" }}}
+                    callInvite
                 },
             };
         }

From 8a7e45d31b040b0fcd6e5b14e61be13e8eb1969e Mon Sep 17 00:00:00 2001
From: Fang Chen <fanche@microsoft.com>
Date: Wed, 12 Jul 2023 12:37:30 +0800
Subject: [PATCH 3/6] update api

---
 ...unication.CallAutomation.netstandard2.0.cs | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs b/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
index 21732bbc62e3..2febf3e51ebd 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
@@ -236,14 +236,13 @@ internal CallDisconnected() { }
     }
     public partial class CallInvite
     {
-        public CallInvite(Azure.Communication.CommunicationUserIdentifier targetIdentity, System.Collections.Generic.IDictionary<string, string> voipHeaders = null) { }
-        public CallInvite(Azure.Communication.MicrosoftTeamsUserIdentifier targetIdentity, System.Collections.Generic.IDictionary<string, string> voipHeaders = null) { }
-        public CallInvite(Azure.Communication.PhoneNumberIdentifier targetPhoneNumberIdentity, Azure.Communication.PhoneNumberIdentifier callerIdNumber, System.Collections.Generic.IDictionary<string, string> sipHeaders = null) { }
-        public System.Collections.Generic.IDictionary<string, string> SipHeaders { get { throw null; } }
+        public CallInvite(Azure.Communication.CommunicationUserIdentifier targetIdentity) { }
+        public CallInvite(Azure.Communication.MicrosoftTeamsUserIdentifier targetIdentity) { }
+        public CallInvite(Azure.Communication.PhoneNumberIdentifier targetPhoneNumberIdentity, Azure.Communication.PhoneNumberIdentifier callerIdNumber) { }
+        public Azure.Communication.CallAutomation.Models.CustomContext CustomContext { get { throw null; } }
         public Azure.Communication.PhoneNumberIdentifier SourceCallerIdNumber { get { throw null; } }
         public string SourceDisplayName { get { throw null; } set { } }
         public Azure.Communication.CommunicationIdentifier Target { get { throw null; } }
-        public System.Collections.Generic.IDictionary<string, string> VoipHeaders { get { throw null; } }
     }
     public abstract partial class CallLocator : System.IEquatable<Azure.Communication.CallAutomation.CallLocator>
     {
@@ -526,13 +525,12 @@ public partial class CreateGroupCallOptions
         public CreateGroupCallOptions(System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> targets, System.Uri callbackUri) { }
         public System.Uri AzureCognitiveServicesEndpointUrl { get { throw null; } set { } }
         public System.Uri CallbackUri { get { throw null; } }
+        public Azure.Communication.CallAutomation.Models.CustomContext CustomContext { get { throw null; } set { } }
         public Azure.Communication.CallAutomation.MediaStreamingOptions MediaStreamingOptions { get { throw null; } set { } }
         public string OperationContext { get { throw null; } set { } }
-        public System.Collections.Generic.IDictionary<string, string> SipHeaders { get { throw null; } set { } }
         public Azure.Communication.PhoneNumberIdentifier SourceCallerIdNumber { get { throw null; } set { } }
         public string SourceDisplayName { get { throw null; } set { } }
         public System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> Targets { get { throw null; } }
-        public System.Collections.Generic.IDictionary<string, string> VoipHeaders { get { throw null; } set { } }
     }
     public partial class DialogCompleted : Azure.Communication.CallAutomation.CallAutomationEventBase
     {
@@ -1253,13 +1251,12 @@ internal TransferCallToParticipantResult() { }
     }
     public partial class TransferToParticipantOptions
     {
-        public TransferToParticipantOptions(Azure.Communication.CommunicationUserIdentifier targetIdentity, System.Collections.Generic.IDictionary<string, string> voipHeaders = null) { }
-        public TransferToParticipantOptions(Azure.Communication.MicrosoftTeamsUserIdentifier targetIdentity, System.Collections.Generic.IDictionary<string, string> voipHeaders = null) { }
-        public TransferToParticipantOptions(Azure.Communication.PhoneNumberIdentifier targetPhoneNumberIdentity, System.Collections.Generic.IDictionary<string, string> sipHeaders = null) { }
+        public TransferToParticipantOptions(Azure.Communication.CommunicationUserIdentifier targetIdentity) { }
+        public TransferToParticipantOptions(Azure.Communication.MicrosoftTeamsUserIdentifier targetIdentity) { }
+        public TransferToParticipantOptions(Azure.Communication.PhoneNumberIdentifier targetPhoneNumberIdentity) { }
+        public Azure.Communication.CallAutomation.Models.CustomContext CustomContext { get { throw null; } }
         public string OperationContext { get { throw null; } set { } }
-        public System.Collections.Generic.IDictionary<string, string> SipHeaders { get { throw null; } }
         public Azure.Communication.CommunicationIdentifier Target { get { throw null; } }
-        public System.Collections.Generic.IDictionary<string, string> VoipHeaders { get { throw null; } }
     }
     public partial class UnmuteParticipantsOptions
     {
@@ -1278,3 +1275,31 @@ internal UserConsent() { }
         public int? Recording { get { throw null; } }
     }
 }
+namespace Azure.Communication.CallAutomation.Models
+{
+    public partial class CustomContext
+    {
+        public CustomContext(System.Collections.Generic.IDictionary<string, string> sipHeaders, System.Collections.Generic.IDictionary<string, string> voipHeaders) { }
+        public System.Collections.Generic.IDictionary<string, string> SipHeaders { get { throw null; } }
+        public System.Collections.Generic.IDictionary<string, string> VoipHeaders { get { throw null; } }
+        public void Add(Azure.Communication.CallAutomation.Models.CustomContextHeader header) { }
+    }
+    public abstract partial class CustomContextHeader
+    {
+        protected CustomContextHeader(string key, string value) { }
+        public string Key { get { throw null; } }
+        public string Value { get { throw null; } }
+    }
+    public partial class SIPCustomHeader : Azure.Communication.CallAutomation.Models.CustomContextHeader
+    {
+        public SIPCustomHeader(string key, string value) : base (default(string), default(string)) { }
+    }
+    public partial class SIPUUIHeader : Azure.Communication.CallAutomation.Models.CustomContextHeader
+    {
+        public SIPUUIHeader(string value) : base (default(string), default(string)) { }
+    }
+    public partial class VoipHeader : Azure.Communication.CallAutomation.Models.CustomContextHeader
+    {
+        public VoipHeader(string key, string value) : base (default(string), default(string)) { }
+    }
+}

From 9ae1b1bfeecd8cbb556d1c5d0714cbd32a3dba23 Mon Sep 17 00:00:00 2001
From: Fang Chen <fanche@microsoft.com>
Date: Wed, 12 Jul 2023 13:27:01 +0800
Subject: [PATCH 4/6] for groupcall, create both headers by default

---
 .../src/Models/CreateGroupCallOptions.cs                         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
index d2371b1f84f4..8a3dca0b40f1 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
@@ -19,6 +19,7 @@ public CreateGroupCallOptions(IEnumerable<CommunicationIdentifier> targets, Uri
         {
             Targets = targets;
             CallbackUri = callbackUri;
+            CustomContext = new CustomContext(sipHeaders: new Dictionary<string, string>(), voipHeaders: new Dictionary<string, string>());
         }
 
         /// <summary>

From 4303096a61c473b6917d70d984b92dddf221b000 Mon Sep 17 00:00:00 2001
From: Fang Chen <fanche@microsoft.com>
Date: Thu, 13 Jul 2023 08:42:52 +0800
Subject: [PATCH 5/6] fix comments

---
 .../src/Models/CallInvite.cs                                 | 1 -
 .../src/Models/CreateGroupCallOptions.cs                     | 5 ++---
 .../src/Models/CustomContext.cs                              | 4 ++--
 .../src/Models/CustomContextHeader.cs                        | 2 +-
 .../src/Models/SIPCustomHeader.cs                            | 2 +-
 .../src/Models/SIPUUIHeader.cs                               | 2 +-
 .../src/Models/TransferToParticipantOptions.cs               | 1 -
 .../src/Models/VoipHeader.cs                                 | 2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs
index 6441bf3b753b..c34ddbbf08bc 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
-using Azure.Communication.CallAutomation.Models;
 
 namespace Azure.Communication.CallAutomation
 {
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
index 8a3dca0b40f1..4b4ce4d13b0d 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Azure.Communication.CallAutomation.Models;
 
 namespace Azure.Communication.CallAutomation
 {
@@ -59,8 +58,8 @@ public CreateGroupCallOptions(IEnumerable<CommunicationIdentifier> targets, Uri
         public Uri AzureCognitiveServicesEndpointUrl { get; set; }
 
         /// <summary>
-        /// The Custom Context which contains SIP and voip headers
+        /// The Custom Context which contains SIP and voip headers.
         /// </summary>
-        public CustomContext CustomContext { get; set; }
+        public CustomContext CustomContext { get; }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs
index 55bf99dda932..b9e0f98e9a16 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContext.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.Communication.CallAutomation.Models
+namespace Azure.Communication.CallAutomation
 {
     /// <summary>
     /// CustomContext details.
@@ -20,7 +20,7 @@ public class CustomContext
         /// <summary>
         /// Creates a new CustomContext.
         /// </summary>
-        public CustomContext(IDictionary<string, string> sipHeaders, IDictionary<string, string> voipHeaders)
+        internal CustomContext(IDictionary<string, string> sipHeaders, IDictionary<string, string> voipHeaders)
         {
             SipHeaders = sipHeaders;
             VoipHeaders = voipHeaders;
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs
index e8b1ea7e4e85..d0db6706ef15 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CustomContextHeader.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Communication.CallAutomation.Models
+namespace Azure.Communication.CallAutomation
 {
     /// <summary>
     /// The base class of CustomContext SipHeader and VoipHeader.
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs
index eddd6b2692da..9c43d6558dc8 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPCustomHeader.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Communication.CallAutomation.Models
+namespace Azure.Communication.CallAutomation
 {
     /// <summary>
     /// Custom Context Sip header.
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs
index 7ac0b532e9bb..392ee389f681 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/SIPUUIHeader.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Communication.CallAutomation.Models
+namespace Azure.Communication.CallAutomation
 {
     /// <summary>
     /// Custom Context User-to-User Sip header.
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs
index 5d1b64ad43d9..c2d7f301683c 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/TransferToParticipantOptions.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
-using Azure.Communication.CallAutomation.Models;
 
 namespace Azure.Communication.CallAutomation
 {
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs
index 177ffa09bee6..89c8191dd180 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/src/Models/VoipHeader.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Communication.CallAutomation.Models
+namespace Azure.Communication.CallAutomation
 {
     /// <summary>
     /// Custom Context Voip header.

From 95e7416b4dacccab4e4ada83642d83880bf05646 Mon Sep 17 00:00:00 2001
From: Fang Chen <fanche@microsoft.com>
Date: Thu, 13 Jul 2023 09:54:19 +0800
Subject: [PATCH 6/6] update api

---
 ...unication.CallAutomation.netstandard2.0.cs | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs b/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
index 2febf3e51ebd..a9d60af64da8 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
+++ b/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
@@ -239,7 +239,7 @@ public partial class CallInvite
         public CallInvite(Azure.Communication.CommunicationUserIdentifier targetIdentity) { }
         public CallInvite(Azure.Communication.MicrosoftTeamsUserIdentifier targetIdentity) { }
         public CallInvite(Azure.Communication.PhoneNumberIdentifier targetPhoneNumberIdentity, Azure.Communication.PhoneNumberIdentifier callerIdNumber) { }
-        public Azure.Communication.CallAutomation.Models.CustomContext CustomContext { get { throw null; } }
+        public Azure.Communication.CallAutomation.CustomContext CustomContext { get { throw null; } }
         public Azure.Communication.PhoneNumberIdentifier SourceCallerIdNumber { get { throw null; } }
         public string SourceDisplayName { get { throw null; } set { } }
         public Azure.Communication.CommunicationIdentifier Target { get { throw null; } }
@@ -525,13 +525,26 @@ public partial class CreateGroupCallOptions
         public CreateGroupCallOptions(System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> targets, System.Uri callbackUri) { }
         public System.Uri AzureCognitiveServicesEndpointUrl { get { throw null; } set { } }
         public System.Uri CallbackUri { get { throw null; } }
-        public Azure.Communication.CallAutomation.Models.CustomContext CustomContext { get { throw null; } set { } }
+        public Azure.Communication.CallAutomation.CustomContext CustomContext { get { throw null; } }
         public Azure.Communication.CallAutomation.MediaStreamingOptions MediaStreamingOptions { get { throw null; } set { } }
         public string OperationContext { get { throw null; } set { } }
         public Azure.Communication.PhoneNumberIdentifier SourceCallerIdNumber { get { throw null; } set { } }
         public string SourceDisplayName { get { throw null; } set { } }
         public System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> Targets { get { throw null; } }
     }
+    public partial class CustomContext
+    {
+        internal CustomContext() { }
+        public System.Collections.Generic.IDictionary<string, string> SipHeaders { get { throw null; } }
+        public System.Collections.Generic.IDictionary<string, string> VoipHeaders { get { throw null; } }
+        public void Add(Azure.Communication.CallAutomation.CustomContextHeader header) { }
+    }
+    public abstract partial class CustomContextHeader
+    {
+        protected CustomContextHeader(string key, string value) { }
+        public string Key { get { throw null; } }
+        public string Value { get { throw null; } }
+    }
     public partial class DialogCompleted : Azure.Communication.CallAutomation.CallAutomationEventBase
     {
         internal DialogCompleted() { }
@@ -1172,6 +1185,14 @@ public ServerCallLocator(string id) { }
         public override int GetHashCode() { throw null; }
         public override string ToString() { throw null; }
     }
+    public partial class SIPCustomHeader : Azure.Communication.CallAutomation.CustomContextHeader
+    {
+        public SIPCustomHeader(string key, string value) : base (default(string), default(string)) { }
+    }
+    public partial class SIPUUIHeader : Azure.Communication.CallAutomation.CustomContextHeader
+    {
+        public SIPUUIHeader(string value) : base (default(string), default(string)) { }
+    }
     public partial class SpeechResult : Azure.Communication.CallAutomation.RecognizeResult
     {
         internal SpeechResult() { }
@@ -1254,7 +1275,7 @@ public partial class TransferToParticipantOptions
         public TransferToParticipantOptions(Azure.Communication.CommunicationUserIdentifier targetIdentity) { }
         public TransferToParticipantOptions(Azure.Communication.MicrosoftTeamsUserIdentifier targetIdentity) { }
         public TransferToParticipantOptions(Azure.Communication.PhoneNumberIdentifier targetPhoneNumberIdentity) { }
-        public Azure.Communication.CallAutomation.Models.CustomContext CustomContext { get { throw null; } }
+        public Azure.Communication.CallAutomation.CustomContext CustomContext { get { throw null; } }
         public string OperationContext { get { throw null; } set { } }
         public Azure.Communication.CommunicationIdentifier Target { get { throw null; } }
     }
@@ -1274,31 +1295,7 @@ public partial class UserConsent
         internal UserConsent() { }
         public int? Recording { get { throw null; } }
     }
-}
-namespace Azure.Communication.CallAutomation.Models
-{
-    public partial class CustomContext
-    {
-        public CustomContext(System.Collections.Generic.IDictionary<string, string> sipHeaders, System.Collections.Generic.IDictionary<string, string> voipHeaders) { }
-        public System.Collections.Generic.IDictionary<string, string> SipHeaders { get { throw null; } }
-        public System.Collections.Generic.IDictionary<string, string> VoipHeaders { get { throw null; } }
-        public void Add(Azure.Communication.CallAutomation.Models.CustomContextHeader header) { }
-    }
-    public abstract partial class CustomContextHeader
-    {
-        protected CustomContextHeader(string key, string value) { }
-        public string Key { get { throw null; } }
-        public string Value { get { throw null; } }
-    }
-    public partial class SIPCustomHeader : Azure.Communication.CallAutomation.Models.CustomContextHeader
-    {
-        public SIPCustomHeader(string key, string value) : base (default(string), default(string)) { }
-    }
-    public partial class SIPUUIHeader : Azure.Communication.CallAutomation.Models.CustomContextHeader
-    {
-        public SIPUUIHeader(string value) : base (default(string), default(string)) { }
-    }
-    public partial class VoipHeader : Azure.Communication.CallAutomation.Models.CustomContextHeader
+    public partial class VoipHeader : Azure.Communication.CallAutomation.CustomContextHeader
     {
         public VoipHeader(string key, string value) : base (default(string), default(string)) { }
     }