Refactor BlinkClient for simplified authorization

Simplified BlinkClient instantiation by removing constructor overloads and handling authorization directly in AuthorizeAsync. Updated Program.cs to reflect these changes. Removed BlinkAuthorizationData and integrated its functionality into LoginResult, which now includes a ToJson method. Updated IBlinkClient interface and added exception handling for required fields in BlinkClient methods.

Author: bvdcode

Sources/Blink.ConsoleTest/Program.cs

@@ -13,11 +13,8 @@ private static async Task Start()
         {
             string json = File.ReadAllText("secrets.json");
             var secrets = JsonSerializer.Deserialize<Secrets>(json)!;
-            BlinkClient client = string.IsNullOrEmpty(secrets.Token) ?
-                new BlinkClient(secrets.Email, secrets.Password) :
-                new(secrets.Email, secrets.Password, secrets.Token);
-
-            var authData = await client.AuthorizeAsync(reauth: string.IsNullOrEmpty(secrets.Token));
+            BlinkClient client = new();
+            var authData = await client.AuthorizeAsync(secrets.Email, secrets.Password, reauth: string.IsNullOrEmpty(secrets.Token));
 
             if (string.IsNullOrEmpty(secrets.Token))
             {

Sources/Blink/BlinkClient.cs

@@ -26,16 +26,16 @@ public class BlinkClient : IBlinkClient
         private int? _clientId;
         private int? _accountId;
         private HttpClient? _http;
-        private readonly string _email;
-        private readonly string _password;
-        private const string _baseUrl = "https://rest-prod.immedia-semi.com";
+        private readonly string _uniqueId = "15c204d5-1577-4825-9bc8-b09efe619f00";
 
         /// <summary>
-        /// Create Blink client with email and password.
+        /// Authorize with email and password provided in constructor.
         /// </summary>
-        /// <param name="email">Email</param>
-        /// <param name="password">Password</param>
-        public BlinkClient(string email, string password)
+        /// <returns><see cref="LoginResult"/> object with authorization data</returns>
+        /// <exception cref="BlinkClientException">Thrown when email or password is not provided in constructor</exception>
+        /// <exception cref="BlinkClientException">Thrown when authorization fails</exception>
+        /// <exception cref="BlinkClientException">Thrown when no content is returned</exception>
+        public async Task<LoginResult> AuthorizeAsync(string email, string password, bool reauth = true)
         {
             if (string.IsNullOrWhiteSpace(email))
             {
@@ -45,55 +45,24 @@ public BlinkClient(string email, string password)
             {
                 throw new BlinkClientException("Password is required to authorize");
             }
-            _email = email;
-            _password = password;
-        }
-
-        /// <summary>
-        /// Create Blink client with token, tier, client ID and account ID from 
-        /// <see cref="BlinkAuthorizationData"/> object returned by <see cref="AuthorizeAsync"/> method.
-        /// </summary>
-        /// <param name="email">Email</param>
-        /// <param name="password">Password</param>
-        /// <param name="token">Authorization token</param>
-        public BlinkClient(string email, string password, string token) : this(email, password)
-        {
-            if (string.IsNullOrWhiteSpace(token))
-            {
-                throw new BlinkClientException("Token is required to authorize");
-            }
-            _http = CreateHttpClient(_baseUrl, token);
-        }
 
-        /// <summary>
-        /// Authorize with email and password provided in constructor.
-        /// </summary>
-        /// <returns><see cref="BlinkAuthorizationData"/> object with authorization data</returns>
-        /// <exception cref="BlinkClientException">Thrown when email or password is not provided in constructor</exception>
-        /// <exception cref="BlinkClientException">Thrown when authorization fails</exception>
-        /// <exception cref="BlinkClientException">Thrown when no content is returned</exception>
-        public async Task<BlinkAuthorizationData> AuthorizeAsync(bool reauth = false)
-        {
-            if (string.IsNullOrWhiteSpace(_email) || string.IsNullOrWhiteSpace(_password))
-            {
-                throw new BlinkClientException("Email and password are required in constructor to authorize");
-            }
-
-            string appName = Assembly.GetEntryAssembly()!.GetName().Name + " v" + Assembly.GetEntryAssembly()!.GetName().Version;
+            string clientName = Assembly.GetEntryAssembly()!.GetName().Name + "_v" + Assembly.GetEntryAssembly()!.GetName().Version;
             var body = new
             {
-                unique_id = appName,
-                email = _email,
-                password = _password,
-                client_name = "Blink.NET Library",
-                reauth,
+                unique_id = _uniqueId,
+                email,
+                password,
+                client_name = clientName,
+                reauth = reauth ? "true" : "false",
 
                 //app_version = "",
                 //client_type = "",
                 //device_identifier = "Amazon ",
                 //notification_key = "",
                 //os_version = "",
             };
+            const string _baseUrl = "https://rest-prod.immedia-semi.com";
+            _http = CreateHttpClient(_baseUrl);
             var httpClient = GetHttpClient();
             var response = await httpClient.PostAsJsonAsync("/api/v5/account/login", body);
             if (!response.IsSuccessStatusCode)
@@ -113,16 +82,14 @@ public async Task<BlinkAuthorizationData> AuthorizeAsync(bool reauth = false)
             }
             _accountId = loginResult.Account.AccountId;
             _clientId = loginResult.Account.ClientId;
-            return new BlinkAuthorizationData
+            if (_accountId == null || _clientId == null)
             {
-                AccountId = loginResult.Account.AccountId,
-                ClientId = loginResult.Account.ClientId,
-                Tier = loginResult.Account.Tier,
-                Token = loginResult.Auth.Token
-            };
+                throw new BlinkClientException("Failed to authorize - no account ID or client ID in response");
+            }
+            return loginResult;
         }
 
-        private HttpClient CreateHttpClient(string baseUrl, string token = "")
+        private HttpClient CreateHttpClient(string baseUrl, string? token = "")
         {
             if (string.IsNullOrWhiteSpace(baseUrl))
             {
@@ -155,7 +122,11 @@ public async Task VerifyPinAsync(string code)
         {
             if (_accountId == null)
             {
-                throw new BlinkClientException("Not authorized");
+                throw new BlinkClientException("Account ID is required to verify pin");
+            }
+            if (_clientId == null)
+            {
+                throw new BlinkClientException("Client ID is required to verify pin");
             }
             string url = $"/api/v4/account/{_accountId}/client/{_clientId}/pin/verify";
             var body = new
@@ -297,7 +268,7 @@ public async Task DeleteVideoAsync(BlinkVideoInfo video)
 
         private HttpClient GetHttpClient()
         {
-            return _http ??= CreateHttpClient(_baseUrl);
+            return _http ?? throw new BlinkClientException("Not authorized");
         }
     }
 }

Sources/Blink/IBlinkClient.cs

@@ -1,6 +1,7 @@
 using Blink.Models;
-using System.Collections.Generic;
+using Blink.Exceptions;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Blink
 {
@@ -17,12 +18,13 @@ public interface IBlinkClient
         int GeneralSleepTime { get; set; }
 
         /// <summary>
-        /// Authorizes the client asynchronously.
+        /// Authorize with email and password provided in constructor.
         /// </summary>
-        /// <param name="reauth">If set to <c>true</c>, forces reauthorization.
-        /// If set to <c>false</c>, the client will use the existing authorization token if it is still valid.</param>
-        /// <returns>A task that represents the asynchronous authorization operation. The task result contains the authorization data.</returns>
-        Task<BlinkAuthorizationData> AuthorizeAsync(bool reauth = false);
+        /// <returns><see cref="LoginResult"/> object with authorization data</returns>
+        /// <exception cref="BlinkClientException">Thrown when email or password is not provided in constructor</exception>
+        /// <exception cref="BlinkClientException">Thrown when authorization fails</exception>
+        /// <exception cref="BlinkClientException">Thrown when no content is returned</exception>
+        Task<LoginResult> AuthorizeAsync(string email, string password, bool reauth = true);
 
         /// <summary>
         /// Deletes a specified video asynchronously.

Sources/Blink/Models/BlinkAuthorizationData.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Blink.Models
 {
@@ -42,5 +43,14 @@ public class LoginResult
         /// </summary>
         [JsonPropertyName("allow_pin_resend_seconds")]
         public int AllowPinResendSeconds { get; set; }
+
+        /// <summary>
+        /// Convert to JSON string
+        /// </summary>
+        /// <returns>JSON string</returns>
+        public string ToJson()
+        {
+            return JsonSerializer.Serialize(this);
+        }
     }
 }