Expose PersonNameComponents for AppleSignIn

poviolabs · Apr 29, 2024 · 2ba9405 · 2ba9405
1 parent 3c0244c
commit 2ba9405
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/Sources/Apple/AppleAuthenticator+Models.swift b/Sources/Apple/AppleAuthenticator+Models.swift
@@ -19,9 +19,15 @@ public extension AppleAuthenticator {
     public let userId: String
     public let token: String
     public let authCode: String
-    public let name: String?
+    public let name: PersonNameComponents?
     public let email: Email
     public let expiresAt: Date
+
+    public var displayName: String {
+      [name?.givenName, name?.familyName]
+        .compactMap { $0 }
+        .joined(separator: " ")
+    }
   }
 
   enum Error: Swift.Error {
@@ -43,11 +49,3 @@ public extension AppleAuthenticator.Response {
     public let isVerified: Bool
   }
 }
-
-extension ASAuthorizationAppleIDCredential {
-  var displayName: String {
-    [fullName?.givenName, fullName?.familyName]
-      .compactMap { $0 }
-      .joined(separator: " ")
-  }
-}
diff --git a/Sources/Apple/AppleAuthenticator.swift b/Sources/Apple/AppleAuthenticator.swift
@@ -133,7 +133,7 @@ extension AppleAuthenticator: ASAuthorizationControllerDelegate {
       let response = Response(userId: credential.user,
                               token: identityTokenString,
                               authCode: authCode,
-                              name: credential.displayName,
+                              name: credential.fullName,
                               email: email,
                               expiresAt: expiresAt)