Skip to content
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

feat: Validate AccountSid on Init #533

Closed
wants to merge 1 commit into from
Closed

feat: Validate AccountSid on Init #533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/Twilio/Clients/TwilioRestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class TwilioRestClient : ITwilioRestClient
/// <summary>
/// Account SID to use for requests
/// </summary>
public string AccountSid { get; }
public string AccountSid => _accountSid ?? throw new ArgumentException("AccountSID not set in " + nameof(TwilioClient) + "." + nameof(TwilioClient.Init));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit odd having the getter throw an exception, but I can't think of a better solution that doesn't touch hundreds of files.


/// <summary>
/// Twilio region to make requests to
Expand All @@ -42,6 +42,7 @@ public class TwilioRestClient : ITwilioRestClient

private readonly string _username;
private readonly string _password;
private readonly string _accountSid;

/// <summary>
/// Constructor for a TwilioRestClient
Expand All @@ -65,7 +66,16 @@ public TwilioRestClient(
_username = username;
_password = password;

AccountSid = accountSid ?? username;
_accountSid = accountSid;
//Validate prefix in accountSid, https://www.twilio.com/docs/glossary/what-is-a-sid#common-sid-prefixes
if (_accountSid?.StartsWith("AC", StringComparison.Ordinal) == false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logic looks sound to me, but some tests would ease my mind more.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I will see what I can do about adding tests.

throw new ArgumentException("AccountSid must start with \"AC\"", nameof(accountSid));
if (_accountSid == null)
{
if (username.StartsWith("AC", StringComparison.Ordinal))
_accountSid = username;
}

HttpClient = httpClient ?? DefaultClient();

Region = region;
Expand Down