Skip to content

Commit

Permalink
Merge branch 'main' into twilio-help-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kridai authored Sep 27, 2023
2 parents 1fb30ec + d4fa507 commit c721a20
Show file tree
Hide file tree
Showing 961 changed files with 10,261 additions and 143 deletions.
24 changes: 24 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
twilio-csharp Changelog
=======================

[2023-09-21] Version 6.14.0
---------------------------
**Library - Chore**
- [PR #699](https://github.com/twilio/twilio-csharp/pull/699): removing override from getparams. Thanks to [@sbansla](https://github.com/sbansla)!

**Library - Fix**
- [PR #695](https://github.com/twilio/twilio-csharp/pull/695): Added contentType and removed unused abstract function GetParam. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!

**Library - Feature**
- [PR #693](https://github.com/twilio/twilio-csharp/pull/693): Added Enum file for contentType. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!

**Conversations**
- Enable conversation email bindings, email address configurations and email message subjects

**Flex**
- Adding `console_errors_included` to Flex Configuration field `debugger_integrations`
- Introducing new channel status as `inactive` in modify channel endpoint for leave functionality **(breaking change)**
- Adding `citrix_voice_vdi` to Flex Configuration

**Taskrouter**
- Add Update Queues, Workers, Workflow Real Time Statistics API to flex-rt-data-api-v2 endpoint
- Add Update Workspace Real Time Statistics API to flex-rt-data-api-v2 endpoint


[2023-09-07] Version 6.13.0
---------------------------
**Library - Fix**
Expand Down
6 changes: 3 additions & 3 deletions src/Twilio/Clients/TwilioRestClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,14 @@ public static void ValidateSslCertificate()

/// <summary>
/// Test that this application can use updated SSL certificates on
/// api.twilio.com:8443. Generally, you'll want to use the version of this
/// tls-test.twilio.com:443. Generally, you'll want to use the version of this
/// function that takes no parameters unless you have a reason not to.
/// </summary>
///
/// <param name="client">HTTP Client to use for testing the request</param>
public static void ValidateSslCertificate(HttpClient client)
{
Request request = new Request("GET", "api", ":8443/", null);
Request request = new Request("GET", "tls-test", ":443/", null);

try
{
Expand All @@ -244,7 +244,7 @@ public static void ValidateSslCertificate(HttpClient client)
catch (Exception e)
{
throw new CertificateValidationException(
"Connection to api.twilio.com:8443 failed",
"Connection to tls-test.twilio.com:443 failed",
e,
request
);
Expand Down
2 changes: 1 addition & 1 deletion src/Twilio/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

internal class AssemblyInfomation
{
public const string AssemblyInformationalVersion = "6.13.0";
public const string AssemblyInformationalVersion = "6.14.0";
}
1 change: 1 addition & 0 deletions src/Twilio/Rest/Accounts/V1/AuthTokenPromotionOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand Down
17 changes: 17 additions & 0 deletions src/Twilio/Rest/Accounts/V1/AuthTokenPromotionResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Collections.Generic;
using Twilio.Base;
using Twilio.Clients;
using Twilio.Constant;
using Twilio.Converters;
using Twilio.Exceptions;
using Twilio.Http;
Expand Down Expand Up @@ -111,6 +112,22 @@ public static AuthTokenPromotionResource FromJson(string json)
throw new ApiException(e.Message, e);
}
}
/// <summary>
/// Converts an object into a json string
/// </summary>
/// <param name="model"> C# model </param>
/// <returns> JSON string </returns>
public static string ToJson(object model)
{
try
{
return JsonConvert.SerializeObject(model);
}
catch (JsonException e)
{
throw new ApiException(e.Message, e);
}
}


///<summary> The SID of the [Account](https://www.twilio.com/docs/iam/api/account) that the secondary Auth Token was created for. </summary>
Expand Down
5 changes: 5 additions & 0 deletions src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down Expand Up @@ -92,6 +93,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand Down Expand Up @@ -121,6 +123,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand All @@ -145,6 +148,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down Expand Up @@ -180,6 +184,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down
17 changes: 17 additions & 0 deletions src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Collections.Generic;
using Twilio.Base;
using Twilio.Clients;
using Twilio.Constant;
using Twilio.Converters;
using Twilio.Exceptions;
using Twilio.Http;
Expand Down Expand Up @@ -448,6 +449,22 @@ public static AwsResource FromJson(string json)
throw new ApiException(e.Message, e);
}
}
/// <summary>
/// Converts an object into a json string
/// </summary>
/// <param name="model"> C# model </param>
/// <returns> JSON string </returns>
public static string ToJson(object model)
{
try
{
return JsonConvert.SerializeObject(model);
}
catch (JsonException e)
{
throw new ApiException(e.Message, e);
}
}


///<summary> The unique string that we created to identify the AWS resource. </summary>
Expand Down
5 changes: 5 additions & 0 deletions src/Twilio/Rest/Accounts/V1/Credential/PublicKeyOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down Expand Up @@ -92,6 +93,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand Down Expand Up @@ -121,6 +123,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand All @@ -145,6 +148,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down Expand Up @@ -180,6 +184,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down
17 changes: 17 additions & 0 deletions src/Twilio/Rest/Accounts/V1/Credential/PublicKeyResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Collections.Generic;
using Twilio.Base;
using Twilio.Clients;
using Twilio.Constant;
using Twilio.Converters;
using Twilio.Exceptions;
using Twilio.Http;
Expand Down Expand Up @@ -448,6 +449,22 @@ public static PublicKeyResource FromJson(string json)
throw new ApiException(e.Message, e);
}
}
/// <summary>
/// Converts an object into a json string
/// </summary>
/// <param name="model"> C# model </param>
/// <returns> JSON string </returns>
public static string ToJson(object model)
{
try
{
return JsonConvert.SerializeObject(model);
}
catch (JsonException e)
{
throw new ApiException(e.Message, e);
}
}


///<summary> The unique string that that we created to identify the PublicKey resource. </summary>
Expand Down
2 changes: 2 additions & 0 deletions src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand All @@ -56,6 +57,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand Down
17 changes: 17 additions & 0 deletions src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Collections.Generic;
using Twilio.Base;
using Twilio.Clients;
using Twilio.Constant;
using Twilio.Converters;
using Twilio.Exceptions;
using Twilio.Http;
Expand Down Expand Up @@ -175,6 +176,22 @@ public static SecondaryAuthTokenResource FromJson(string json)
throw new ApiException(e.Message, e);
}
}
/// <summary>
/// Converts an object into a json string
/// </summary>
/// <param name="model"> C# model </param>
/// <returns> JSON string </returns>
public static string ToJson(object model)
{
try
{
return JsonConvert.SerializeObject(model);
}
catch (JsonException e)
{
throw new ApiException(e.Message, e);
}
}


///<summary> The SID of the [Account](https://www.twilio.com/docs/iam/api/account) that the secondary Auth Token was created for. </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Collections.Generic;
using Twilio.Base;
using Twilio.Clients;
using Twilio.Constant;
using Twilio.Converters;
using Twilio.Exceptions;
using Twilio.Http;
Expand Down Expand Up @@ -209,6 +210,22 @@ public static DependentPhoneNumberResource FromJson(string json)
throw new ApiException(e.Message, e);
}
}
/// <summary>
/// Converts an object into a json string
/// </summary>
/// <param name="model"> C# model </param>
/// <returns> JSON string </returns>
public static string ToJson(object model)
{
try
{
return JsonConvert.SerializeObject(model);
}
catch (JsonException e)
{
throw new ApiException(e.Message, e);
}
}


///<summary> The unique string that that we created to identify the DependentPhoneNumber resource. </summary>
Expand Down
5 changes: 5 additions & 0 deletions src/Twilio/Rest/Api/V2010/Account/AddressOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down Expand Up @@ -157,6 +158,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand Down Expand Up @@ -189,6 +191,7 @@ public List<KeyValuePair<string, string>> GetParams()

return p;
}



}
Expand Down Expand Up @@ -237,6 +240,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down Expand Up @@ -331,6 +335,7 @@ public List<KeyValuePair<string, string>> GetParams()
}
return p;
}



}
Expand Down
Loading

0 comments on commit c721a20

Please sign in to comment.