Added sign in with apple SUI button.

Author: ivanvorobei

Sources/FirewrapAuth/FirewrapAuth.swift

@@ -3,6 +3,7 @@ import Firewrap
 import Firebase
 import FirebaseAuth
 import SwiftBoost
+import GoogleSignIn
 import UIKit
 
 public class FirewrapAuth {
@@ -35,6 +36,7 @@ public class FirewrapAuth {
 
 
     public static func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+        
         let handleEmailWay = handleSignInWithEmailURL(url) { error in
             shared.completionSignInViaEmail?(error)
         }
@@ -43,7 +45,7 @@ public class FirewrapAuth {
             return true
         } else {
             #if os(iOS) || os(macOS)
-            return false//GIDSignIn.sharedInstance.handle(url)
+            return GIDSignIn.sharedInstance.handle(url)
             #else
             return false
             #endif
@@ -95,19 +97,24 @@ public class FirewrapAuth {
                 completion?(nil, .failed)
                 return
             }
-            let credential = OAuthProvider.appleCredential(
-                withIDToken: data.identityToken,
-                rawNonce: nil,
-                fullName: data.name
-            )
-            Auth.auth().signIn(with: credential) { (authResult, firebaseError) in
-                if let firebaseError {
-                    printConsole("Sign in with Apple complete with Firebase error: \(firebaseError.localizedDescription)")
-                    completion?(data, .failed)
-                } else {
-                    printConsole("Sign in with Apple complete")
-                    completion?(data, nil)
-                }
+            
+            signInWithApple(with: data, completion: completion)
+        }
+    }
+    
+    static func signInWithApple(with data: SignInWithAppleData, completion: ((SignInWithAppleData?, FirewrapAuthSignInError?) -> Void)?) {
+        let credential = OAuthProvider.appleCredential(
+            withIDToken: data.identityToken,
+            rawNonce: nil,
+            fullName: data.name
+        )
+        Auth.auth().signIn(with: credential) { (authResult, firebaseError) in
+            if let firebaseError {
+                printConsole("Sign in with Apple complete with Firebase error: \(firebaseError.localizedDescription)")
+                completion?(data, .failed)
+            } else {
+                printConsole("Sign in with Apple complete successfully")
+                completion?(data, nil)
             }
         }
     }
@@ -149,7 +156,7 @@ public class FirewrapAuth {
                 printConsole("Sign in with Email complete with Firebase error: \(emailError.localizedDescription)")
                 completion?(.failed)
             } else {
-                printConsole("Sign in with Email complete")
+                printConsole("Sign in with Email success complete")
                 shared.completionSignInViaEmail = completion
                 completion?(.mustConfirmViaEmail)
             }

Sources/FirewrapAuth/Services/AppleAuthService.swift

@@ -15,18 +15,15 @@ class AppleAuthService: NSObject, ASAuthorizationControllerDelegate, ASAuthoriza
         authorizationController.performRequests()
     }
 
-    // MARK: - ASAuthorizationControllerDelegate
-    
-    func authorizationController(controller: ASAuthorizationController, didCompleteWithAuthorization authorization: ASAuthorization) {
+    static func parse(_ authorization: ASAuthorization, completion: ((SignInWithAppleData?, FirewrapAuthSignInError?) -> Void)) {
         guard
             let appleCredential = authorization.credential as? ASAuthorizationAppleIDCredential,
             let identityToken = appleCredential.identityToken,
             let identityTokenString = String(data: identityToken, encoding: .utf8),
             let authorizationCode = appleCredential.authorizationCode,
             let authorizationCodeString = String(data: authorizationCode, encoding: .utf8)
         else {
-            // todo parse
-            completion?(nil, FirewrapAuthSignInError.failed)
+            completion(nil, FirewrapAuthSignInError.failed)
             return
         }
 
@@ -36,7 +33,15 @@ class AppleAuthService: NSObject, ASAuthorizationControllerDelegate, ASAuthoriza
             name: appleCredential.fullName,
             email: appleCredential.email
         )
-        completion?(data, nil)
+        completion(data, nil)
+    }
+    
+    // MARK: - ASAuthorizationControllerDelegate
+    
+    func authorizationController(controller: ASAuthorizationController, didCompleteWithAuthorization authorization: ASAuthorization) {
+        Self.parse(authorization) { data, error in
+            self.completion?(data, error)
+        }
     }
 
     func authorizationController(controller: ASAuthorizationController, didCompleteWithError error: Error) {

Sources/FirewrapAuth/Views/WrapperSignInWithAppleButton.swift

@@ -0,0 +1,33 @@
+#if canImport(SwiftUI)
+import SwiftUI
+import AuthenticationServices
+
+@available(iOS 14.0, *)
+public struct WrapperSignInWithAppleButton: View {
+    
+    private let completion: ((SignInWithAppleData?, FirewrapAuthSignInError?) -> Void)?
+    
+    public init(completion: ((SignInWithAppleData?, FirewrapAuthSignInError?) -> Void)? = nil) {
+        self.completion = completion
+    }
+    
+    public var body: some View {
+        SignInWithAppleButton { request in
+            
+        } onCompletion: { result in
+            switch result {
+            case .success(let authorisation):
+                AppleAuthService.parse(authorisation) { data, error in
+                    if let data {
+                        FirewrapAuth.signInWithApple(with: data, completion: completion)
+                    } else {
+                        self.completion?(nil, error ?? .failed)
+                    }
+                }
+            case .failure(_):
+                self.completion?(nil, .failed)
+            }
+        }
+    }
+}
+#endif