Fix HTTP login and logout features

Iggy_SDK/Contracts/Http/Auth/AuthResponse.cs

@@ -0,0 +1,7 @@
+namespace Iggy_SDK.Contracts.Http;
+
+public record AuthResponse(int UserId, TokenInfo AccessToken)
+{
+    // public required int UserId { get; init; }
+    // public TokenInfo AccessToken { get; init; }
+}

Iggy_SDK/Contracts/Http/ChangePasswordRequest.cs → Iggy_SDK/Contracts/Http/Auth/ChangePasswordRequest.cs

@@ -1,10 +1,10 @@
-using System.Text.Json.Serialization;
-namespace Iggy_SDK.Contracts.Http;
-
-public sealed class ChangePasswordRequest
-{
-    [JsonIgnore]
-    public required Identifier UserId { get; init; }
-    public required string CurrentPassword { get; init; }
-    public required string NewPassword { get; init; }
+using System.Text.Json.Serialization;
+namespace Iggy_SDK.Contracts.Http;
+
+public sealed class ChangePasswordRequest
+{
+    [JsonIgnore]
+    public required Identifier UserId { get; init; }
+    public required string CurrentPassword { get; init; }
+    public required string NewPassword { get; init; }
 }

Iggy_SDK/Contracts/Http/CreateUserRequest.cs → Iggy_SDK/Contracts/Http/Auth/CreateUserRequest.cs

@@ -1,10 +1,10 @@
-using Iggy_SDK.Enums;
-namespace Iggy_SDK.Contracts.Http;
-
-public sealed class CreateUserRequest
-{
-    public required string Username { get; init; }
-    public required string Password { get; init; }
-    public required UserStatus Status { get; init; }
-    public Permissions? Permissions { get; init; }
+using Iggy_SDK.Enums;
+namespace Iggy_SDK.Contracts.Http;
+
+public sealed class CreateUserRequest
+{
+    public required string Username { get; init; }
+    public required string Password { get; init; }
+    public required UserStatus Status { get; init; }
+    public Permissions? Permissions { get; init; }
 }

Iggy_SDK/Contracts/Http/LoginUserRequest.cs → Iggy_SDK/Contracts/Http/Auth/LoginUserRequest.cs

@@ -1,7 +1,7 @@
-namespace Iggy_SDK.Contracts.Http;
-
-public sealed class LoginUserRequest
-{
-    public required string Username { get; init; }
-    public required string Password { get; init; }
+namespace Iggy_SDK.Contracts.Http;
+
+public sealed class LoginUserRequest
+{
+    public required string Username { get; init; }
+    public required string Password { get; init; }
 }

Iggy_SDK/Contracts/Http/Auth/TokenInfo.cs

@@ -0,0 +1,3 @@
+namespace Iggy_SDK.Contracts.Http;
+
+public record TokenInfo(string Token, DateTimeOffset Expiry);

Iggy_SDK/Contracts/Http/UpdateUserPermissionsRequest.cs → Iggy_SDK/Contracts/Http/Auth/UpdateUserPermissionsRequest.cs

@@ -1,9 +1,9 @@
-using System.Text.Json.Serialization;
-namespace Iggy_SDK.Contracts.Http;
-
-public sealed class UpdateUserPermissionsRequest
-{
-    [JsonIgnore]
-    public required Identifier UserId { get; init; }
-    public Permissions? Permissions { get; init; }
+using System.Text.Json.Serialization;
+namespace Iggy_SDK.Contracts.Http;
+
+public sealed class UpdateUserPermissionsRequest
+{
+    [JsonIgnore]
+    public required Identifier UserId { get; init; }
+    public Permissions? Permissions { get; init; }
 }

Iggy_SDK/Contracts/Http/UpdateUserRequest.cs → Iggy_SDK/Contracts/Http/Auth/UpdateUserRequest.cs

@@ -1,11 +1,11 @@
-using Iggy_SDK.Enums;
-using System.Text.Json.Serialization;
-namespace Iggy_SDK.Contracts.Http;
-
-public sealed class UpdateUserRequest
-{
-    [JsonIgnore]
-    public required Identifier UserId { get; init; }
-    public string? Username { get; init; }
-    public UserStatus? UserStatus { get; init; }
+using Iggy_SDK.Enums;
+using System.Text.Json.Serialization;
+namespace Iggy_SDK.Contracts.Http;
+
+public sealed class UpdateUserRequest
+{
+    [JsonIgnore]
+    public required Identifier UserId { get; init; }
+    public string? Username { get; init; }
+    public UserStatus? UserStatus { get; init; }
 }

Iggy_SDK/IggyClient/Implementations/HttpMessageStream.cs

@@ -41,6 +41,7 @@ internal HttpMessageStream(HttpClient httpClient, Channel<MessageSendRequest>? c
         _messageInvoker = messageInvoker;
         _logger = loggerFactory.CreateLogger<HttpMessageStream>();
     }
+
     public async Task CreateStreamAsync(StreamRequest request, CancellationToken token = default)
     {
         var json = JsonSerializer.Serialize(request, JsonConverterFactory.SnakeCaseOptions);
@@ -238,6 +239,7 @@ public async Task<PolledMessages<TMessage>> FetchMessagesAsync<TMessage>(Message
         await HandleResponseAsync(response);
         return PolledMessages<TMessage>.Empty;
     }
+
     public async IAsyncEnumerable<MessageResponse<TMessage>> PollMessagesAsync<TMessage>(PollMessagesRequest request, 
         Func<byte[], TMessage> deserializer, Func<byte[], byte[]>? decryptor = null, 
         [EnumeratorCancellation] CancellationToken token = default)
@@ -295,6 +297,7 @@ public async IAsyncEnumerable<MessageResponse<TMessage>> PollMessagesAsync<TMess
             }
         }
     }
+
     private async Task StartPollingMessagesAsync<TMessage>(MessageFetchRequest request,
         Func<byte[], TMessage> deserializer, TimeSpan interval, ChannelWriter<MessageResponse<TMessage>> writer,
         Func<byte[], byte[]>? decryptor = null,
@@ -324,6 +327,7 @@ private async Task StartPollingMessagesAsync<TMessage>(MessageFetchRequest reque
         }
         writer.Complete();
     }
+
     public async Task StoreOffsetAsync(StoreOffsetRequest request, CancellationToken token = default)
     {
         var json = JsonSerializer.Serialize(request, JsonConverterFactory.SnakeCaseOptions);
@@ -372,6 +376,7 @@ public async Task<IReadOnlyList<ConsumerGroupResponse>> GetConsumerGroupsAsync(I
         await HandleResponseAsync(response);
         return null;
     }
+
     public async Task CreateConsumerGroupAsync(CreateConsumerGroupRequest request, CancellationToken token = default)
     {
         var json = JsonSerializer.Serialize(request, JsonConverterFactory.SnakeCaseOptions);
@@ -383,6 +388,7 @@ public async Task CreateConsumerGroupAsync(CreateConsumerGroupRequest request, C
             await HandleResponseAsync(response);
         }
     }
+
     public async Task DeleteConsumerGroupAsync(DeleteConsumerGroupRequest request, CancellationToken token = default)
     {
         var response = await _httpClient.DeleteAsync($"/streams/{request.StreamId}/topics/{request.TopicId}/consumer-groups/{request.ConsumerGroupId}", token);
@@ -550,8 +556,8 @@ public async Task ChangePassword(ChangePasswordRequest request, CancellationToke
         if (response.IsSuccessStatusCode)
         {
             var authResponse = await response.Content.ReadFromJsonAsync<AuthResponse>(JsonConverterFactory.AuthResponseOptions, cancellationToken: token);
-            var jwtToken = authResponse!.Tokens?.AccessToken?.Token;
-            if (!string.IsNullOrEmpty(authResponse!.Tokens!.AccessToken!.Token))
+            var jwtToken = authResponse!.AccessToken?.Token;
+            if (!string.IsNullOrEmpty(authResponse!.AccessToken!.Token))
             {
                 _httpClient.DefaultRequestHeaders.Authorization = 
                     new AuthenticationHeaderValue("Bearer", jwtToken); 
@@ -567,11 +573,11 @@ public async Task ChangePassword(ChangePasswordRequest request, CancellationToke
     }
     public async Task LogoutUser(CancellationToken token = default)
     {
-        var json = JsonSerializer.Serialize(new
-        {
-        }, JsonConverterFactory.SnakeCaseOptions);
-        var content = new StringContent(json, Encoding.UTF8, "application/json"); 
-        var response = await _httpClient.PostAsync("users/logout", content, token);
+        // var json = JsonSerializer.Serialize(new
+        // {
+        // }, JsonConverterFactory.SnakeCaseOptions);
+        // var content = new StringContent(json, Encoding.UTF8, "application/json"); 
+        var response = await _httpClient.DeleteAsync("users/logout", token);
         if (!response.IsSuccessStatusCode)
         {
             await HandleResponseAsync(response);
@@ -610,25 +616,27 @@ public async Task DeletePersonalAccessTokenAsync(DeletePersonalAccessTokenReques
     }
     public async Task<AuthResponse?> LoginWithPersonalAccessToken(LoginWithPersonalAccessToken request, CancellationToken token = default)
     {
-        var json = JsonSerializer.Serialize(request, JsonConverterFactory.SnakeCaseOptions); 
-        var content = new StringContent(json, Encoding.UTF8, "application/json"); 
-        var response = await _httpClient.PostAsync("/personal-access-tokens/login", content, token);
-        if (response.IsSuccessStatusCode)
-        {
-            var authResponse = await response.Content.ReadFromJsonAsync<AuthResponse>(JsonConverterFactory.AuthResponseOptions, cancellationToken: token);
-            var jwtToken = authResponse!.Tokens?.AccessToken?.Token;
-            if (!string.IsNullOrEmpty(authResponse!.Tokens!.AccessToken!.Token))
-            {
-                _httpClient.DefaultRequestHeaders.Authorization = 
-                    new AuthenticationHeaderValue("Bearer", jwtToken); 
-            }
-            else
-            {
-                throw new Exception("The JWT token is missing.");
-            }
-            return authResponse;
-        }
-        await HandleResponseAsync(response);
-        return null;
+        // var json = JsonSerializer.Serialize(request, JsonConverterFactory.SnakeCaseOptions); 
+        // var content = new StringContent(json, Encoding.UTF8, "application/json"); 
+        // var response = await _httpClient.PostAsync("/personal-access-tokens/login", content, token);
+        // if (response.IsSuccessStatusCode)
+        // {
+        //     var authResponse = await response.Content.ReadFromJsonAsync<AuthResponse>(JsonConverterFactory.AuthResponseOptions, cancellationToken: token);
+        //     var jwtToken = authResponse!.Tokens?.AccessToken?.Token;
+        //     if (!string.IsNullOrEmpty(authResponse!.Tokens!.AccessToken!.Token))
+        //     {
+        //         _httpClient.DefaultRequestHeaders.Authorization = 
+        //             new AuthenticationHeaderValue("Bearer", jwtToken); 
+        //     }
+        //     else
+        //     {
+        //         throw new Exception("The JWT token is missing.");
+        //     }
+        //     return authResponse;
+        // }
+        // await HandleResponseAsync(response);
+        // return null;
+
+        throw new NotImplementedException();
     }
 }

Iggy_SDK/IggyClient/Implementations/TcpMessageStream.cs

@@ -1045,10 +1045,9 @@ public async Task ChangePassword(ChangePasswordRequest request, CancellationToke
         }
 
         var userId = BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan()[8..(8 + response.Length)]);
-        return new AuthResponse
-        {
-            UserId = userId
-        };
+
+        //TODO: Figure out how to solve this workaround about default of TokenInfo
+        return new AuthResponse(userId, default);
     }
     public async Task LogoutUser(CancellationToken token = default)
     {
@@ -1164,9 +1163,8 @@ public async Task DeletePersonalAccessTokenAsync(DeletePersonalAccessTokenReques
             return null;
         }
         var userId = BinaryPrimitives.ReadInt32LittleEndian(responseBuffer.AsSpan()[..4]);
-        return new AuthResponse
-        {
-            UserId = userId
-        };
+
+        //TODO: Figure out how to solve this workaround about default of TokenInfo
+        return new AuthResponse(userId, default);
     }
 }

Iggy_SDK/JsonConfiguration/AuthResponseConverter.cs

@@ -12,34 +12,15 @@
         using var doc = JsonDocument.ParseValue(ref reader);
         var root = doc.RootElement;
 
-        var userId = root.GetProperty(nameof(AuthResponse.UserId).ToSnakeCase()).GetInt32(); 
-        var tokens = root.GetProperty(nameof(AuthResponse.Tokens).ToSnakeCase());
+        var userId = root.GetProperty(nameof(AuthResponse.UserId).ToSnakeCase()).GetInt32();
+        var accessToken = root.GetProperty(nameof(AuthResponse.AccessToken).ToSnakeCase());
+        var token = accessToken.GetProperty(nameof(TokenInfo.Token).ToSnakeCase()).GetString();
+        var accessTokenExpiry = accessToken.GetProperty(nameof(TokenInfo.Expiry).ToSnakeCase()).GetInt64();
 
-        var accessTokenProperty = tokens.GetProperty(nameof(Tokens.AccessToken).ToSnakeCase());
-        var accessToken = accessTokenProperty.GetProperty(nameof(TokenInfo.Token).ToSnakeCase()).GetString();
-        var accessTokenExpiry = accessTokenProperty.GetProperty(nameof(TokenInfo.Expiry).ToSnakeCase()).GetInt64();
-
-        var refreshTokenProperty = tokens.GetProperty(nameof(Tokens.RefreshToken).ToSnakeCase());
-        var refreshToken = refreshTokenProperty.GetProperty(nameof(TokenInfo.Token).ToSnakeCase()).GetString();
-        var refreshTokenExpiry = refreshTokenProperty.GetProperty(nameof(TokenInfo.Expiry).ToSnakeCase()).GetInt64();
-
-        return new AuthResponse
-        {
-            UserId = userId,
-            Tokens = new Tokens
-            {
-                AccessToken = new TokenInfo
-                {
-                    Token = accessToken!,
-                    Expiry = DateTimeOffset.FromUnixTimeSeconds(accessTokenExpiry).LocalDateTime,
-                },
-                RefreshToken = new TokenInfo
-                {
-                    Token = refreshToken!,
-                    Expiry = DateTimeOffset.FromUnixTimeSeconds(refreshTokenExpiry).LocalDateTime,
-                }
-            }
-        };
+        return new AuthResponse(
+            userId,
+            new TokenInfo(token, DateTimeOffset.FromUnixTimeSeconds(accessTokenExpiry).LocalDateTime)
+        );
     }
     public override void Write(Utf8JsonWriter writer, AuthResponse value, JsonSerializerOptions options)
     {