Merge changes for 7.0.0 release

CHANGELOG.md

@@ -48,6 +48,15 @@ _None._
 
 _None._
 
+## 7.0.0
+
+### Breaking Changes
+
+- Removed dependency GoogleSignIn SDK and flags to configure it [#777]
+- Made `LoginFieldsMeta` `internal`, forwarding the few properties read by clients to `LoginFields` [#778]
+- Restructured `SocialService` into `SocialUser`, removing the `SocialServiceName` `SocialService` `enum` cases duplicity [#778]
+- Made `presentSignupEpilogue` in `WordPressAuthenticatorDelegateProtocol` use `SocialUser` instead of `SocialService` [#778]
+
 ## 6.3.0
 
 _Note: This should have been 6.2.1 because it contained only a bug fix. Unfortunately we currently don't have automation in place to enfore SemVer. Given a beta had already been released, we went with 6.3.0 stable._

Demo/AuthenticatorDemo/ViewController+WordPressAuthenticationDelegate.swift

@@ -37,7 +37,7 @@ extension ViewController: WordPressAuthenticatorDelegate {
         fatalError("TODO")
     }
 
-    func presentSignupEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, service: SocialService?) {
+    func presentSignupEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, socialUser: SocialUser?) {
         fatalError("TODO")
     }
 

Demo/AuthenticatorDemo/ViewController+WordPressAuthenticator.swift

@@ -4,7 +4,7 @@ import WordPressAuthenticator
 
 extension ViewController {
 
-    func initializeWordPressAuthenticator(withGoogleSDK: Bool) {
+    func initializeWordPressAuthenticator() {
         // 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(
@@ -29,8 +29,7 @@ extension ViewController {
                 enableUnifiedCarousel: true,
                 // Notice that this is required as well as `enableSignupWithGoogle` to show the
                 // option to login with Google.
-                enableSocialLogin: true,
-                googleLoginWithoutSDK: withGoogleSDK == false
+                enableSocialLogin: true
             ),
             style: WordPressAuthenticatorStyle(
                 // Primary (normal and highlight) is the color of buttons such as "Log in or signup

Demo/AuthenticatorDemo/ViewController.swift

@@ -8,22 +8,16 @@ 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 - With Google SDK") { [weak self] in
+        CellConfiguration(text: "Show Login") { [weak self] in
             guard let self else { fatalError() }
 
-            self.initializeWordPressAuthenticator(withGoogleSDK: true)
+            self.initializeWordPressAuthenticator()
             WordPressAuthenticator.showLoginFromPresenter(self, animated: true)
         },
-        CellConfiguration(text: "Show Login - Without Google SDK") { [weak self] in
+        CellConfiguration(text: "Get Google token only") { [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.initializeWordPressAuthenticator()
             self.getAuthTokenFromGoogle()
         }
     ]

Podfile

@@ -17,7 +17,6 @@ workspace 'WordPressAuthenticator.xcworkspace'
 ## =====================
 ##
 def third_party_pods
-  pod 'GoogleSignIn', '6.0.1'
   pod 'NSURL+IDN', '0.4'
   pod 'SVProgressHUD', '2.2.5'
 end

Podfile.lock

@@ -1,29 +1,15 @@
 PODS:
   - Alamofire (4.8.2)
-  - AppAuth (1.4.0):
-    - AppAuth/Core (= 1.4.0)
-    - AppAuth/ExternalUserAgent (= 1.4.0)
-  - AppAuth/Core (1.4.0)
-  - AppAuth/ExternalUserAgent (1.4.0)
   - Expecta (1.0.6)
-  - GoogleSignIn (6.0.1):
-    - AppAuth (~> 1.4)
-    - GTMAppAuth (~> 1.0)
-    - GTMSessionFetcher/Core (~> 1.1)
   - Gridicons (1.0.1)
-  - GTMAppAuth (1.2.2):
-    - AppAuth/Core (~> 1.4)
-    - GTMSessionFetcher/Core (~> 1.5)
-  - GTMSessionFetcher/Core (1.6.1)
   - NSObject-SafeExpectations (0.0.6)
   - "NSURL+IDN (0.4)"
   - OCMock (3.8.1)
   - Specta (1.0.7)
   - SVProgressHUD (2.2.5)
   - SwiftLint (0.49.1)
   - UIDeviceIdentifier (2.2.0)
-  - WordPressAuthenticator (6.3.0):
-    - GoogleSignIn (~> 6.0.1)
+  - WordPressAuthenticator (7.0.0-beta.1):
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
@@ -42,7 +28,6 @@ PODS:
 
 DEPENDENCIES:
   - Expecta (= 1.0.6)
-  - GoogleSignIn (= 6.0.1)
   - Gridicons (~> 1.0)
   - "NSURL+IDN (= 0.4)"
   - OCMock (~> 3.4)
@@ -57,12 +42,8 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - Alamofire
-    - AppAuth
     - Expecta
-    - GoogleSignIn
     - Gridicons
-    - GTMAppAuth
-    - GTMSessionFetcher
     - NSObject-SafeExpectations
     - "NSURL+IDN"
     - OCMock
@@ -81,25 +62,21 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
-  AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
-  GoogleSignIn: 1b0c4ec33a6fe282f4fa35d8ac64263230ddaf36
   Gridicons: 8e19276b20bb15d1fda1d4d0db96d066d170135b
-  GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
-  GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
   NSObject-SafeExpectations: c01c8881cbd97efad6f668286b913cd0b7d62ab5
   "NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca
   OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
   UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67
-  WordPressAuthenticator: d77d347e638e0c80d5539b3d7bd12140ada16845
+  WordPressAuthenticator: 31b2b358ec1b5c724998f3944b20c29be9be1c95
   WordPressKit: 8e1c5a64645a59493a7316f38468ac036de9c79b
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
 
-PODFILE CHECKSUM: c9f023378cc56b2cc3b60aae45af6fea750fe085
+PODFILE CHECKSUM: 39d49f77667f2645b9a7575b7288487421a70c5d
 
 COCOAPODS: 1.11.3

WordPressAuthenticator.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressAuthenticator'
-  s.version       = '6.3.0'
+  s.version       = '7.0.0-beta.1'
 
   s.summary       = 'WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps.'
   s.description   = <<-DESC
@@ -36,7 +36,6 @@ Pod::Spec.new do |s|
   s.dependency 'NSURL+IDN', '0.4'
   s.dependency 'SVProgressHUD', '~> 2.2.5'
   s.dependency 'Gridicons', '~> 1.0'
-  s.dependency 'GoogleSignIn', '~> 6.0.1'
 
   # Use a loose restriction that allows both production and beta versions, up to the next major version.
   # If you want to update which of these is used, specify it in the host app.