1 files changed, 7 insertions, 13 deletions
diff --git a/LibMatrix/Responses/LoginResponse.cs b/LibMatrix/Responses/LoginResponse.cs
index 28fb245..1944276 100644
--- a/LibMatrix/Responses/LoginResponse.cs
+++ b/LibMatrix/Responses/LoginResponse.cs
@@ -1,30 +1,24 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
-using LibMatrix.Homeservers;
 
 namespace LibMatrix.Responses;
 
 public class LoginResponse {
     [JsonPropertyName("access_token")]
-    public string AccessToken { get; set; } = null!;
+    public string AccessToken { get; set; }
 
     [JsonPropertyName("device_id")]
-    public string DeviceId { get; set; } = null!;
-
-    private string? _homeserver;
+    public string DeviceId { get; set; }
 
     [JsonPropertyName("home_server")]
+    [field: AllowNull, MaybeNull]
     public string Homeserver {
-        get => _homeserver ?? UserId.Split(':', 2).Last();
-        protected init => _homeserver = value;
+        get => field ?? UserId.Split(':', 2).Last();
+        set;
     }
 
     [JsonPropertyName("user_id")]
-    public string UserId { get; set; } = null!;
-
-    // public async Task<AuthenticatedHomeserverGeneric> GetAuthenticatedHomeserver(string? proxy = null) {
-        // var urls = await new HomeserverResolverService().ResolveHomeserverFromWellKnown(Homeserver);
-        // await AuthenticatedHomeserverGeneric.Create<AuthenticatedHomeserverGeneric>(Homeserver, AccessToken, proxy);
-    // }
+    public string UserId { get; set; }
 }
 
 public class LoginRequest {