Change login response to FullUserIdentifier

kloenk · kloenk · commit d2b0505d6da3 · 2022-04-22T22:01:32.000+02:00
diff --git a/Sources/MatrixClient/API/Auth/Login.swift b/Sources/MatrixClient/API/Auth/Login.swift
@@ -309,7 +309,7 @@ extension MatrixLoginRequest: MatrixRequest {
 
 public struct MatrixLogin: MatrixResponse {
     public init(
-        userId: MatrixUserIdentifier? = nil,
+        userId: MatrixFullUserIdentifier? = nil,
         accessToken: String? = nil,
         homeServer: String? = nil,
         deviceId: String? = nil,
@@ -323,7 +323,7 @@ public struct MatrixLogin: MatrixResponse {
     }
 
     /// The fully-qualified Matrix ID that has been registered.
-    public var userId: MatrixUserIdentifier?
+    public var userId: MatrixFullUserIdentifier?
 
     /// An access token for the account. This access token can then be used to authorise other requests.
     public var accessToken: String?
diff --git a/Sources/MatrixClient/UserIdentifier.swift b/Sources/MatrixClient/UserIdentifier.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public protocol MatrixUserIdentifierProtocol: Equatable, Comparable, Hashable {
+public protocol MatrixUserIdentifierProtocol: Equatable, Comparable, Hashable, CustomStringConvertible {
     var localpart: String { get set }
 
     init?(string: String)
@@ -148,6 +148,10 @@ public struct MatrixUserIdentifier: RawRepresentable, MatrixUserIdentifierProtoc
         return nil
     }
 
+    public var description: String {
+        rawValue
+    }
+
     // MARK: static variables
 
     static let allowedLocalCharacters = CharacterSet(charactersIn: "1234567890abcdefghijklmnopqrstuvwxyz-.=_/")
@@ -209,6 +213,10 @@ public struct MatrixFullUserIdentifier: RawRepresentable, MatrixUserIdentifierPr
         "@\(localpart):\(domain)"
     }
 
+    public var description: String {
+        FQMXID
+    }
+
     public var id: String {
         FQMXID
     }
