Refactor exceptions, code cleanup, and move to delegate auth state changes

Gotrue/Api.cs

@@ -16,11 +16,10 @@ namespace Supabase.Gotrue
 {
 	public class Api : IGotrueApi<User, Session>
 	{
-		protected string Url { get; private set; }
+		private string Url { get; }
 
 		/// <summary>
 		/// Function that can be set to return dynamic headers.
-		/// 
 		/// Headers specified in the constructor will ALWAYS take precedence over headers returned by this function.
 		/// </summary>
 		public Func<Dictionary<string, string>>? GetHeaders { get; set; }
@@ -39,14 +38,13 @@ protected Dictionary<string, string> Headers
 		}
 
 		/// <summary>
-		/// Creates a new user using their email address.
+		/// Creates a new API client
 		/// </summary>
 		/// <param name="url"></param>
 		/// <param name="headers"></param>
 		public Api(string url, Dictionary<string, string>? headers = null)
 		{
 			Url = url;
-
 			headers ??= new Dictionary<string, string>();
 			_headers = headers;
 		}
@@ -61,8 +59,7 @@ public Api(string url, Dictionary<string, string>? headers = null)
 		public async Task<Session?> SignUpWithEmail(string email, string password, SignUpOptions? options = null)
 		{
 			var body = new Dictionary<string, object> { { "email", email }, { "password", password } };
-
-			string endpoint = $"{Url}/signup";
+			var endpoint = $"{Url}/signup";
 
 			if (options != null)
 			{
@@ -94,10 +91,7 @@ public Api(string url, Dictionary<string, string>? headers = null)
 
 				return session;
 			}
-			else
-			{
-				return null;
-			}
+			return null;
 		}
 
 		/// <summary>
@@ -138,12 +132,12 @@ public async Task<PasswordlessSignInState> SignInWithOtp(SignInWithPasswordlessE
 			{
 				{ "email", options.Email },
 				{ "data", options.Data },
-				{ "create_user", options.ShouldCreateUser },
+				{ "create_user", options.ShouldCreateUser }
 			};
 
 			if (options.FlowType == OAuthFlowType.PKCE)
 			{
-				string challenge = Helpers.GenerateNonce();
+				var challenge = Helpers.GenerateNonce();
 				verifier = Helpers.GeneratePKCENonceVerifier(challenge);
 
 				body.Add("code_challenge", challenge);
@@ -205,16 +199,18 @@ public async Task<PasswordlessSignInState> SignInWithOtp(SignInWithPasswordlessP
 		/// <param name="nonce"></param>
 		/// <param name="captchaToken"></param>
 		/// <returns></returns>
-		/// <exception cref="InvalidProviderException"></exception>
+		/// <exception>
+		///     <cref>InvalidProviderException</cref>
+		/// </exception>
 		public Task<Session?> SignInWithIdToken(Provider provider, string idToken, string? nonce = null, string? captchaToken = null)
 		{
 			if (provider != Provider.Google && provider != Provider.Apple)
-				throw new InvalidProviderException($"Provider must either be: `Provider.Google` or `Provider.Apple`.");
+				throw new GotrueException($"Provider must be `Provider.Google` or `Provider.Apple` not {provider}");
 
 			var body = new Dictionary<string, object?>
 			{
 				{"provider", Core.Helpers.GetMappedToAttr(provider).Mapping },
-				{"id_token", idToken },
+				{"id_token", idToken }
 			};
 
 			if (!string.IsNullOrEmpty(nonce))
@@ -237,7 +233,7 @@ public Task<BaseResponse> SendMagicLinkEmail(string email, SignInOptions? option
 		{
 			var data = new Dictionary<string, string> { { "email", email } };
 
-			string endpoint = $"{Url}/magiclink";
+			var endpoint = $"{Url}/magiclink";
 
 			if (options != null)
 			{
@@ -304,7 +300,7 @@ public Task<BaseResponse> InviteUserByEmail(string email, string jwt)
 		{
 			var data = new Dictionary<string, object> {
 				{ "phone", phone },
-				{ "password", password },
+				{ "password", password }
 			};
 			return Helpers.MakeRequest<Session>(HttpMethod.Post, $"{Url}/token?grant_type=password", data, Headers);
 		}
@@ -406,9 +402,9 @@ public ProviderAuthState GetUriForProvider(Provider provider, SignInOptions? opt
 				result.PKCEVerifier = codeVerifier;
 			}
 
-			if (attr is MapToAttribute mappedAttr)
+			if (attr is MapToAttribute)
 			{
-				query.Add("provider", mappedAttr.Mapping);
+				query.Add("provider", attr.Mapping);
 
 				if (!string.IsNullOrEmpty(options.Scopes))
 					query.Add("scopes", options.Scopes);
@@ -500,7 +496,7 @@ public Task<BaseResponse> SignOut(string jwt)
 		/// </summary>
 		/// <param name="jwt">A valid JWT. Must be a full-access API key (e.g. service_role key).</param>
 		/// <param name="filter">A string for example part of the email</param>
-		/// <param name="sortBy">Snake case string of the given key, currently only created_at is suppported</param>
+		/// <param name="sortBy">Snake case string of the given key, currently only created_at is supported</param>
 		/// <param name="sortOrder">asc or desc, if null desc is used</param>
 		/// <param name="page">page to show for pagination</param>
 		/// <param name="perPage">items per page for pagination</param>
@@ -548,10 +544,7 @@ private Dictionary<string, string> TransformListUsersParams(string? filter = nul
 		/// <returns></returns>
 		public Task<User?> CreateUser(string jwt, AdminUserAttributes? attributes = null)
 		{
-			if (attributes == null)
-			{
-				attributes = new AdminUserAttributes();
-			}
+			attributes ??= new AdminUserAttributes();
 
 			return Helpers.MakeRequest<User>(HttpMethod.Post, $"{Url}/admin/users", attributes, CreateAuthedRequestHeaders(jwt));
 		}
@@ -580,6 +573,11 @@ public Task<BaseResponse> DeleteUser(string uid, string jwt)
 			return Helpers.MakeRequest(HttpMethod.Delete, $"{Url}/admin/users/{uid}", data, CreateAuthedRequestHeaders(jwt));
 		}
 
+		public Task<Settings?> Settings()
+		{
+			return Helpers.MakeRequest<Settings>(HttpMethod.Get, $"{Url}/settings");
+		}
+
 		/// <summary>
 		/// Generates a new JWT
 		/// </summary>