Introduce NewGoogleAuthenticator for SDK-less authentication (#743)

Author: mokagio

CHANGELOG.md

@@ -18,7 +18,7 @@ _None._
 
 ### New Features
 
-_None._
+- It's now possible to authenticate with a Google account without using the Google SDK, via the `googleLoginWithoutSDK` configuration. [#743]
 
 ### Bug Fixes
 

Demo/AuthenticatorDemo/AppDelegate.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -10,7 +11,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // crash the app if the value it finds is nil.
     var window: UIWindow?
 
+    let logger = ConsoleLogger()
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        WPKitSetLoggingDelegate(logger)
         return true
     }
 

Demo/AuthenticatorDemo/ViewController+WordPressAuthenticationDelegate.swift

@@ -1,4 +1,6 @@
+import WebKit
 import WordPressAuthenticator
+import WordPressKit
 
 extension ViewController: WordPressAuthenticatorDelegate {
 
@@ -68,11 +70,7 @@ extension ViewController: WordPressAuthenticatorDelegate {
 
     func sync(credentials: AuthenticatorCredentials, onCompletion: @escaping () -> Void) {
         dismiss(animated: true) { [weak self] in
-            self?.presentAlert(
-                title: "Authentication Successful",
-                message: "Next step will be syncing credentials",
-                onDismiss: {}
-            )
+            self?.sync(credentials: credentials)
         }
     }
 
@@ -90,3 +88,46 @@ extension ViewController: WordPressAuthenticatorDelegate {
         print(error)
     }
 }
+
+extension ViewController {
+
+    // This is just so we can avoid nesting within a dismiss block and the weak self dance.
+    //
+    // See WordPress iOS
+    //
+    // - WordPressAuthenticationManager sync(credentials:, onCompletion:)
+    // - WordPressAuthenticationManager syncWPCom(authToken:, isJetpackLogin:, onCompletion:)
+    // - AccountService createOrUpdateAccountWithAuthToken:success:failure:
+    private func sync(credentials: AuthenticatorCredentials) {
+        switch (credentials.wpcom, credentials.wporg) {
+        case (.none, .none), (.some, .some):
+            fatalError("Inconsistent state!")
+        case (.none, .some):
+            fatalError("Not implemented yet")
+        case (.some(let wpComCredentials), .none):
+            let api = WordPressComRestApi(
+                oAuthToken: wpComCredentials.authToken,
+                // TODO: there should be a way to read the user agent from the library configs
+                userAgent: WKWebView.userAgent
+            )
+            let remote = AccountServiceRemoteREST(wordPressComRestApi: api)
+
+            remote.getAccountDetails(
+                success: { [weak self] remoteUser in
+                    guard let remoteUser else {
+                        fatalError("Received no RemoteUser – Likely an Objective-C types byproduct.")
+                    }
+
+                    self?.presentAlert(
+                        title: "🎉",
+                        message: "Welcome \(remoteUser.displayName ?? "'no display name'")",
+                        onDismiss: {}
+                    )
+                },
+                failure: { error in
+                    print(error!.localizedDescription)
+                }
+            )
+        }
+    }
+}

Demo/AuthenticatorDemo/ViewController+WordPressAuthenticator.swift

@@ -1,9 +1,10 @@
 import WebKit
 import WordPressAuthenticator
+import WordPressKit
 
 extension ViewController {
 
-    func initializeWordPressAuthenticator() {
+    func initializeWordPressAuthenticator(withGoogleSDK: Bool) {
         // In a proper app, we'd want to split this call to keep the code readable. Here, it's
         // useful to keep it all in one block to show how insanely long it is.
         WordPressAuthenticator.initialize(
@@ -28,7 +29,8 @@ extension ViewController {
                 enableUnifiedCarousel: true,
                 // Notice that this is required as well as `enableSignupWithGoogle` to show the
                 // option to login with Google.
-                enableSocialLogin: true
+                enableSocialLogin: true,
+                googleLoginWithoutSDK: withGoogleSDK == false
             ),
             style: WordPressAuthenticatorStyle(
                 // Primary (normal and highlight) is the color of buttons such as "Log in or signup
@@ -76,5 +78,27 @@ extension ViewController {
                 navTitleTextColor: .white
             )
         )
+
+        WordPressAuthenticator.shared.delegate = self
+    }
+
+    // Note that this method does not try to authenticate the user with the WordPress backend.
+    // It only verifies that we can get a token from Google.
+    func getAuthTokenFromGoogle() {
+        Task { @MainActor in
+            do {
+                let token = try await self.googleAuthenticator.getOAuthToken()
+
+                presentAlert(
+                    title: "🎉",
+                    message: "Successfully authenticated with Google.\n\nEmail in received token: \(token.email)",
+                    onDismiss: {}
+                )
+            } catch let error as OAuthError {
+                presentAlert(title: "❌", message: error.errorDescription, onDismiss: {})
+            } catch {
+                fatalError("Caught an error that was not of the expected `OAuthError` type: \(error)")
+            }
+        }
     }
 }

Demo/AuthenticatorDemo/ViewController.swift

@@ -1,3 +1,4 @@
+import AuthenticationServices
 import UIKit
 import WordPressAuthenticator
 
@@ -7,24 +8,43 @@ class ViewController: UIViewController {
 
     /// Add `CellConfiguration` items to add new actionable rows to the table view in `ViewController`.
     lazy var configuration: [CellConfiguration] = [
-        CellConfiguration(text: "Show Login") { [weak self] in
+        CellConfiguration(text: "Show Login - With Google SDK") { [weak self] in
             guard let self else { fatalError() }
+
+            self.initializeWordPressAuthenticator(withGoogleSDK: true)
+            WordPressAuthenticator.showLoginFromPresenter(self, animated: true)
+        },
+        CellConfiguration(text: "Show Login - Without Google SDK") { [weak self] in
+            guard let self else { fatalError() }
+
+            self.initializeWordPressAuthenticator(withGoogleSDK: false)
             WordPressAuthenticator.showLoginFromPresenter(self, animated: true)
+        },
+        CellConfiguration(text: "Get Google token only - Standalone, Wihout SDK") { [weak self] in
+            guard let self else { fatalError() }
+
+            self.initializeWordPressAuthenticator(withGoogleSDK: false)
+            self.getAuthTokenFromGoogle()
         }
     ]
 
     let tableView = UITableView(frame: .zero, style: .grouped)
     let reuseIdentifier = "cell"
 
+    lazy var googleAuthenticator = NewGoogleAuthenticator(
+        clientId: GoogleClientId(string: APICredentials.googleLoginClientId)!,
+        scheme: APICredentials.googleLoginSchemeId,
+        audience: APICredentials.googleLoginServerClientId,
+        viewController: self,
+        urlSession: URLSession.shared
+    )
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
         title = "Authenticator Demo 🔐"
 
         setUpTableView()
-
-        initializeWordPressAuthenticator()
-        WordPressAuthenticator.shared.delegate = self
     }
 
     func setUpTableView() {

Podfile

@@ -29,7 +29,7 @@ def wordpress_authenticator_pods
   pod 'Gridicons', '~> 1.0-beta' # Don't change this until we hit 2.0 in Gridicons
   pod 'WordPressUI', '~> 1.7-beta' # Don't change this until we hit 2.0 in WordPressUI
   pod 'WordPressKit', '~> 6.0-beta' # Don't change this until we hit 5.0 in WPKit
-  pod 'WordPressShared', '~> 2.0-beta' # Don't change this until we hit 2.0 in WPShared
+  pod 'WordPressShared', '~> 2.1-beta'
 
   third_party_pods
 end

Podfile.lock

@@ -28,15 +28,15 @@ PODS:
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
     - WordPressKit (~> 6.0-beta)
-    - WordPressShared (~> 2.0-beta)
+    - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
   - WordPressKit (6.0.0-beta.1):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
     - WordPressShared (~> 2.0-beta)
     - wpxmlrpc (~> 0.10)
-  - WordPressShared (2.0.0-beta.2)
+  - WordPressShared (2.1.0)
   - WordPressUI (1.7.0)
   - wpxmlrpc (0.10.0)
 
@@ -51,7 +51,7 @@ DEPENDENCIES:
   - SwiftLint (~> 0.49)
   - WordPressAuthenticator (from `.`)
   - WordPressKit (~> 6.0-beta)
-  - WordPressShared (~> 2.0-beta)
+  - WordPressShared (~> 2.1-beta)
   - WordPressUI (~> 1.7-beta)
 
 SPEC REPOS:
@@ -94,12 +94,12 @@ SPEC CHECKSUMS:
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
   UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67
-  WordPressAuthenticator: fb233ed409d2cf86edf01ce5616dd15d4e9c9ca4
+  WordPressAuthenticator: 0620a9f3a367af505d9bc946975184a73906e2e5
   WordPressKit: 08da0bc981f6398ef7a32e523fd054de7d7c7069
-  WordPressShared: 04403b43f821c4ed2b84a2112ef9f64f1e7cdceb
+  WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
 
-PODFILE CHECKSUM: f1d40bf767881fbe9b0328b875768ee4a60a113f
+PODFILE CHECKSUM: 8746ca27deaec1c319801f91d81dab582ee1c0f5
 
 COCOAPODS: 1.11.3

WordPressAuthenticator.podspec

@@ -42,5 +42,5 @@ Pod::Spec.new do |s|
   # If you want to update which of these is used, specify it in the host app.
   s.dependency 'WordPressUI', '~> 1.7-beta'
   s.dependency 'WordPressKit', '~> 6.0-beta'
-  s.dependency 'WordPressShared', '~> 2.0-beta'
+  s.dependency 'WordPressShared', '~> 2.1-beta'
 end