Structure project to conform to DI with backwards compatibility.

Gotrue/Helpers.cs

@@ -11,6 +11,7 @@
 using System.Threading;
 using Supabase.Gotrue.Attributes;
 using System.Linq;
+using Supabase.Gotrue.Interfaces;
 
 namespace Supabase.Gotrue
 {
@@ -72,7 +73,7 @@ public static async Task<T> MakeRequest<T>(HttpMethod method, string url, object
         /// <param name="reqParams"></param>
         /// <param name="headers"></param>
         /// <returns></returns>
-        public static async Task<BaseResponse> MakeRequest(HttpMethod method, string url, object data = null, Dictionary<string, string> headers = null)
+        public static async Task<IBaseResponse> MakeRequest(HttpMethod method, string url, object data = null, Dictionary<string, string> headers = null)
         {
             var builder = new UriBuilder(url);
             var query = HttpUtility.ParseQueryString(builder.Query);

Gotrue/Interfaces/IAdminUserAttributes.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+
+namespace Supabase.Gotrue.Interfaces
+{
+    /// <seealso cref="Supabase.Gotrue.Interfaces.IUserAttributes" />
+    public interface IAdminUserAttributes : IUserAttributes
+    {
+        /// <summary>
+        /// Gets or sets the application metadata.
+        /// </summary>
+        /// <value>
+        /// The application metadata.
+        /// </value>
+        Dictionary<string, object> AppMetadata { get; set; }
+        /// <summary>
+        /// Gets or sets the email confirm.
+        /// </summary>
+        /// <value>
+        /// The email confirm.
+        /// </value>
+        bool? EmailConfirm { get; set; }
+        /// <summary>
+        /// Gets or sets the phone confirm.
+        /// </summary>
+        /// <value>
+        /// The phone confirm.
+        /// </value>
+        bool? PhoneConfirm { get; set; }
+        /// <summary>
+        /// Gets or sets the user metadata.
+        /// </summary>
+        /// <value>
+        /// The user metadata.
+        /// </value>
+        Dictionary<string, object> UserMetadata { get; set; }
+    }
+}

Gotrue/Interfaces/IBaseResponse.cs

@@ -0,0 +1,22 @@
+using System.Net.Http;
+
+namespace Supabase.Gotrue.Interfaces
+{
+    public interface IBaseResponse
+    {
+        /// <summary>
+        /// Gets or sets the content.
+        /// </summary>
+        /// <value>
+        /// The content.
+        /// </value>
+        string Content { get; set; }
+        /// <summary>
+        /// Gets or sets the response message.
+        /// </summary>
+        /// <value>
+        /// The response message.
+        /// </value>
+        HttpResponseMessage ResponseMessage { get; set; }
+    }
+}

Gotrue/Interfaces/IClientStateChanged.cs

@@ -0,0 +1,13 @@
+namespace Supabase.Gotrue.Interfaces
+{
+    public interface IClientStateChanged
+    {
+        /// <summary>
+        /// Gets the state.
+        /// </summary>
+        /// <value>
+        /// The state.
+        /// </value>
+        Client.AuthState State { get; }
+    }
+}

Gotrue/Interfaces/IGotrueApi.cs

@@ -0,0 +1,249 @@
+using Supabase.Gotrue.Interfaces;
+using Supabase.Gotrue.Responses;
+using System.Threading.Tasks;
+
+namespace Supabase.Gotrue.Interfaces
+{
+    public interface IGotrueApi
+    {
+        /// <summary>
+        /// Creates the user.
+        /// </summary>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="attributes">The attributes.</param>
+        /// <returns></returns>
+        Task<User> CreateUser(string jwt, IAdminUserAttributes attributes = null);
+        /// <summary>
+        /// Creates the user.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="attributes">The attributes.</param>
+        /// <returns></returns>
+        Task<T> CreateUser<T>(string jwt, IAdminUserAttributes attributes = null) where T : IUser;
+        /// <summary>
+        /// Deletes the user.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="uid">The uid.</param>
+        /// <param name="jwt">The JWT.</param>
+        /// <returns></returns>
+        Task<IBaseResponse> DeleteUser(string uid, string jwt);
+        /// <summary>
+        /// Gets the URL for provider.
+        /// </summary>
+        /// <param name="provider">The provider.</param>
+        /// <param name="scopes">The scopes.</param>
+        /// <returns></returns>
+        string GetUrlForProvider(Client.Provider provider, string scopes = null);
+        /// <summary>
+        /// Gets the user.
+        /// </summary>
+        /// <param name="jwt">The JWT.</param>
+        /// <returns></returns>
+        Task<User> GetUser(string jwt);
+        /// <summary>
+        /// Gets the user.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="jwt">The JWT.</param>
+        /// <returns></returns>
+        Task<T> GetUser<T>(string jwt) where T : IUser;
+        /// <summary>
+        /// Gets the user by identifier.
+        /// </summary>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="userId">The user identifier.</param>
+        /// <returns></returns>
+        Task<User> GetUserById(string jwt, string userId);
+        /// <summary>
+        /// Gets the user by identifier.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="userId">The user identifier.</param>
+        /// <returns></returns>
+        Task<T> GetUserById<T>(string jwt, string userId) where T : IUser;
+        /// <summary>
+        /// Invites the user by email.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="email">The email.</param>
+        /// <param name="jwt">The JWT.</param>
+        /// <returns></returns>
+        Task<IBaseResponse> InviteUserByEmail(string email, string jwt);
+        /// <summary>
+        /// Lists the users.
+        /// </summary>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="filter">The filter.</param>
+        /// <param name="sortBy">The sort by.</param>
+        /// <param name="sortOrder">The sort order.</param>
+        /// <param name="page">The page.</param>
+        /// <param name="perPage">The per page.</param>
+        /// <returns></returns>
+        Task<UserList> ListUsers(string jwt, string filter = null, string sortBy = null, Constants.SortOrder sortOrder = Constants.SortOrder.Descending, int? page = null, int? perPage = null);
+        /// <summary>
+        /// Lists the users.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="filter">The filter.</param>
+        /// <param name="sortBy">The sort by.</param>
+        /// <param name="sortOrder">The sort order.</param>
+        /// <param name="page">The page.</param>
+        /// <param name="perPage">The per page.</param>
+        /// <returns></returns>
+        Task<T> ListUsers<T>(string jwt, string filter = null, string sortBy = null, Constants.SortOrder sortOrder = Constants.SortOrder.Descending, int? page = null, int? perPage = null) where T : IUserList;
+        /// <summary>
+        /// Refreshes the access token.
+        /// </summary>
+        /// <param name="refreshToken">The refresh token.</param>
+        /// <returns></returns>
+        Task<Session> RefreshAccessToken(string refreshToken);
+        /// <summary>
+        /// Refreshes the access token.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="refreshToken">The refresh token.</param>
+        /// <returns></returns>
+        Task<T> RefreshAccessToken<T>(string refreshToken) where T : ISession;
+        /// <summary>
+        /// Resets the password for email.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="email">The email.</param>
+        /// <returns></returns>
+        Task<IBaseResponse> ResetPasswordForEmail(string email);
+        /// <summary>
+        /// Sends the magic link email.
+        /// </summary>
+        /// <param name="email">The email.</param>
+        /// <param name="options">The options.</param>
+        /// <returns></returns>
+        Task<IBaseResponse> SendMagicLinkEmail(string email, ISignInOptions options = null);
+        /// <summary>
+        /// Sends the mobile otp.
+        /// </summary>
+        /// <param name="phone">The phone.</param>
+        /// <returns></returns>
+        Task<IBaseResponse> SendMobileOTP(string phone);
+        /// <summary>
+        /// Signs the in with email.
+        /// </summary>
+        /// <param name="email">The email.</param>
+        /// <param name="password">The password.</param>
+        /// <returns></returns>
+        Task<Session> SignInWithEmail(string email, string password);
+        /// <summary>
+        /// Signs the in with email.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="email">The email.</param>
+        /// <param name="password">The password.</param>
+        /// <returns></returns>
+        Task<T> SignInWithEmail<T>(string email, string password) where T : ISession;
+        /// <summary>
+        /// Signs the in with phone.
+        /// </summary>
+        /// <param name="phone">The phone.</param>
+        /// <param name="password">The password.</param>
+        /// <returns></returns>
+        Task<Session> SignInWithPhone(string phone, string password);
+        /// <summary>
+        /// Signs the in with phone.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="phone">The phone.</param>
+        /// <param name="password">The password.</param>
+        /// <returns></returns>
+        Task<T> SignInWithPhone<T>(string phone, string password) where T : ISession;
+        /// <summary>
+        /// Represents an event that is raised when the sign-out operation is complete.
+        /// </summary>
+        /// <param name="jwt">The JWT.</param>
+        /// <returns></returns>
+        Task<IBaseResponse> SignOut(string jwt);
+        /// <summary>
+        /// Signs up with email.
+        /// </summary>
+        /// <param name="email">The email.</param>
+        /// <param name="password">The password.</param>
+        /// <param name="options">The options.</param>
+        /// <returns></returns>
+        Task<Session> SignUpWithEmail(string email, string password, ISignUpOptions options = null);
+        /// <summary>
+        /// Signs up with email.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="email">The email.</param>
+        /// <param name="password">The password.</param>
+        /// <param name="options">The options.</param>
+        /// <returns></returns>
+        Task<T> SignUpWithEmail<T>(string email, string password, ISignUpOptions options = null) where T : ISession;
+        /// <summary>
+        /// Signs up with phone.
+        /// </summary>
+        /// <param name="phone">The phone.</param>
+        /// <param name="password">The password.</param>
+        /// <param name="options">The options.</param>
+        /// <returns></returns>
+        Task<Session> SignUpWithPhone(string phone, string password, ISignUpOptions options = null);
+        /// <summary>
+        /// Signs up with phone.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="phone">The phone.</param>
+        /// <param name="password">The password.</param>
+        /// <param name="options">The options.</param>
+        /// <returns></returns>
+        Task<T> SignUpWithPhone<T>(string phone, string password, ISignUpOptions options = null) where T : ISession;
+        /// <summary>
+        /// Updates the user.
+        /// </summary>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="attributes">The attributes.</param>
+        /// <returns></returns>
+        Task<User> UpdateUser(string jwt, IUserAttributes attributes);
+        /// <summary>
+        /// Updates the user.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="attributes">The attributes.</param>
+        /// <returns></returns>
+        Task<T> UpdateUser<T>(string jwt, IUserAttributes attributes) where T : IUser;
+        /// <summary>
+        /// Updates the user by identifier.
+        /// </summary>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="userId">The user identifier.</param>
+        /// <param name="userData">The user data.</param>
+        /// <returns></returns>
+        Task<User> UpdateUserById(string jwt, string userId, IUserAttributes userData);
+        /// <summary>
+        /// Updates the user by identifier.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="jwt">The JWT.</param>
+        /// <param name="userId">The user identifier.</param>
+        /// <param name="userData">The user data.</param>
+        /// <returns></returns>
+        Task<T> UpdateUserById<T>(string jwt, string userId, IUserAttributes userData) where T : IUser;
+        /// <summary>
+        /// Verifies the mobile otp.
+        /// </summary>
+        /// <param name="phone">The phone.</param>
+        /// <param name="token">The token.</param>
+        /// <returns></returns>
+        Task<Session> VerifyMobileOTP(string phone, string token);
+        /// <summary>
+        /// Verifies the mobile otp.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="phone">The phone.</param>
+        /// <param name="token">The token.</param>
+        /// <returns></returns>
+        Task<T> VerifyMobileOTP<T>(string phone, string token) where T : ISession;
+    }
+}