Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 0 additions & 12 deletions src/Twilio/Clients/TwilioRestClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ public TwilioRestClient(
AccountSid = accountSid ?? username;
HttpClient = httpClient ?? DefaultClient();

if (GlobalConstants.IsOnlyOneSet(edge,region))
Console.WriteLine("Deprecation Warning: For regional processing, DNS is of format product.edge.region.twilio.com;otherwise use product.twilio.com");

Region = region;
Edge = edge;
}
Expand Down Expand Up @@ -115,9 +112,6 @@ public TwilioRestClient(
AccountSid = accountSid ?? username;
HttpClient = httpClient ?? DefaultClient();

if (GlobalConstants.IsOnlyOneSet(edge,region))
Console.WriteLine("Deprecation Warning: For regional processing, DNS is of format product.edge.region.twilio.com;otherwise use product.twilio.com");

Region = region;
Edge = edge;
}
Expand All @@ -131,12 +125,6 @@ public TwilioRestClient(
public Response Request(Request request)
{

if (string.IsNullOrEmpty(Edge) && !string.IsNullOrEmpty(Region) && GlobalConstants.RegionToEdgeMap.TryGetValue(Region, out var edge))
{
Console.WriteLine("Deprecation Warning: Setting default `edge` for provided `region`");
Edge = edge;
}

if(_username != null && _password != null){
request.SetAuth(_username, _password);
}
Expand Down
25 changes: 0 additions & 25 deletions src/Twilio/Constant/GlobalConstants.cs

This file was deleted.

8 changes: 0 additions & 8 deletions src/Twilio/Twilio.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
private static string _username;
private static string _password;
private static AuthStrategy _authstrategy;

Check warning on line 18 in src/Twilio/Twilio.cs

View workflow job for this annotation

GitHub Actions / Test

The field 'TwilioClient._authstrategy' is never used
private static string _accountSid;
private static string _region;
private static string _edge;
Expand Down Expand Up @@ -221,14 +221,6 @@
/// <returns>The rest client</returns>
public static ITwilioRestClient GetRestClient()
{
if (GlobalConstants.IsOnlyOneSet(_edge,_region))
Console.WriteLine("Deprecation Warning: For regional processing, DNS is of format product.edge.region.twilio.com;otherwise use product.twilio.com");

if (string.IsNullOrEmpty(_edge) && !string.IsNullOrEmpty(_region) && GlobalConstants.RegionToEdgeMap.TryGetValue(_region, out var edge))
{
Console.WriteLine("Deprecation Warning: Setting default `edge` for provided `region`");
_edge = edge;
}

if (_restClient != null)
{
Expand Down
26 changes: 0 additions & 26 deletions test/Twilio.Test/Clients/TwilioRestClientTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,32 +190,6 @@ public async Task RequestAsyncWithUserAgentExtensions()
Assert.AreEqual(request.UserAgentExtensions, userAgentExtensions);
}

[Test]
public async Task EdgeWhenRegionIsSet()
{
client.MakeRequestAsync(Arg.Any<Request>()).Returns(new Response(HttpStatusCode.OK, "OK"));
Request request = new Request(HttpMethod.Get, "https://verify.twilio.com/");
TwilioRestClient twilioClient = new TwilioRestClient("foo", "bar", region: "us1", httpClient: client);

await twilioClient.RequestAsync(request);

Assert.AreEqual("ashburn", request.Edge);
Assert.AreEqual("us1", request.Region);
}

[Test]
public async Task EdgeWhenRegionIsSetAbc()
{
client.MakeRequestAsync(Arg.Any<Request>()).Returns(new Response(HttpStatusCode.OK, "OK"));
Request request = new Request(HttpMethod.Get, "https://verify.twilio.com/");
TwilioRestClient twilioClient = new TwilioRestClient("foo", "bar", region: "abc", httpClient: client);

await twilioClient.RequestAsync(request);

Assert.AreEqual("", request.Edge);
Assert.AreEqual("abc", request.Region);
}

#endif
}
}
44 changes: 0 additions & 44 deletions test/Twilio.Test/Constant/GlobalConstantsTests.cs

This file was deleted.

Loading