From e45cdfd64cf3dd3140f0907f1e8e170908625835 Mon Sep 17 00:00:00 2001 From: Sharma Elanthiraiyan Date: Wed, 18 Jan 2023 08:46:59 +0530 Subject: [PATCH 1/4] Point `WordPressAuthenticator` to beta commit version. --- Podfile | 4 ++-- Podfile.lock | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Podfile b/Podfile index 3df977a6953..cfd5d3dea1d 100644 --- a/Podfile +++ b/Podfile @@ -86,8 +86,8 @@ target 'WooCommerce' do pod 'Gridicons', '~> 1.2.0' # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1 - pod 'WordPressAuthenticator', '~> 5.0.0' - # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '' + # pod 'WordPressAuthenticator', '~> 5.0.0' + pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => 'bf6681f979ea3edbc07021130cfc0f4644138575' # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => '' # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS' diff --git a/Podfile.lock b/Podfile.lock index dd412d210a2..d359d909b11 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,7 +39,7 @@ PODS: - WordPress-Aztec-iOS (1.11.0) - WordPress-Editor-iOS (1.11.0): - WordPress-Aztec-iOS (= 1.11.0) - - WordPressAuthenticator (5.0.0): + - WordPressAuthenticator (5.1.0-beta.1): - GoogleSignIn (~> 6.0.1) - Gridicons (~> 1.0) - "NSURL+IDN (= 0.4)" @@ -84,7 +84,7 @@ DEPENDENCIES: - Sourcery (~> 1.0.3) - StripeTerminal (~> 2.14) - WordPress-Editor-iOS (~> 1.11.0) - - WordPressAuthenticator (~> 5.0.0) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `bf6681f979ea3edbc07021130cfc0f4644138575`) - WordPressKit (~> 5.0.0) - WordPressShared (~> 2.0) - WordPressUI (~> 1.12.5) @@ -94,8 +94,6 @@ DEPENDENCIES: - ZendeskSupportSDK (~> 5.0) SPEC REPOS: - https://github.com/wordpress-mobile/cocoapods-specs.git: - - WordPressAuthenticator trunk: - Alamofire - AppAuth @@ -132,6 +130,16 @@ SPEC REPOS: - ZendeskSupportProvidersSDK - ZendeskSupportSDK +EXTERNAL SOURCES: + WordPressAuthenticator: + :commit: bf6681f979ea3edbc07021130cfc0f4644138575 + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + +CHECKOUT OPTIONS: + WordPressAuthenticator: + :commit: bf6681f979ea3edbc07021130cfc0f4644138575 + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + SPEC CHECKSUMS: Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add @@ -153,7 +161,7 @@ SPEC CHECKSUMS: UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67 WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 - WordPressAuthenticator: 0cdf1bff75bd3f58fe733d6457221f27bbbdc9f4 + WordPressAuthenticator: 95f698805ebbbe86c5721ce244e1302ea810326b WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5 WordPressShared: 35d41bdf0927e714af1fc85fa9cb692f934473be WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac @@ -169,6 +177,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba -PODFILE CHECKSUM: 17ff88b703dd664331487078325e3a051db87976 +PODFILE CHECKSUM: 7df16dcb0266dd8a5570da921db0ab4918ff6a1b COCOAPODS: 1.11.3 From c2781232a9e4bc7c2dcee857084a574d3d6619fb Mon Sep 17 00:00:00 2001 From: Sharma Elanthiraiyan Date: Wed, 18 Jan 2023 08:47:27 +0530 Subject: [PATCH 2/4] Enable custom step value flag in authenticator config. --- WooCommerce/Classes/Authentication/AuthenticationManager.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WooCommerce/Classes/Authentication/AuthenticationManager.swift b/WooCommerce/Classes/Authentication/AuthenticationManager.swift index bb1c4301e26..63c693e92e7 100644 --- a/WooCommerce/Classes/Authentication/AuthenticationManager.swift +++ b/WooCommerce/Classes/Authentication/AuthenticationManager.swift @@ -90,7 +90,8 @@ class AuthenticationManager: Authentication { emphasizeEmailForWPComPassword: true, wpcomPasswordInstructions: AuthenticationConstants.wpcomPasswordInstructions, - skipXMLRPCCheckForSiteDiscovery: true) + skipXMLRPCCheckForSiteDiscovery: true, + useEnterEmailAddressAsStepValueForGetStartedVC: true) let systemGray3LightModeColor = UIColor(red: 199/255.0, green: 199/255.0, blue: 204/255.0, alpha: 1) let systemLabelLightModeColor = UIColor(red: 0, green: 0, blue: 0, alpha: 1) From 87642d32c0b82f92b7856358e12841541f2e5e0f Mon Sep 17 00:00:00 2001 From: Sharma Elanthiraiyan Date: Wed, 18 Jan 2023 11:10:41 +0530 Subject: [PATCH 3/4] Point WordPressAuthenticator pod to beta release version. --- Podfile | 4 ++-- Podfile.lock | 18 +++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Podfile b/Podfile index cfd5d3dea1d..aa6062df445 100644 --- a/Podfile +++ b/Podfile @@ -86,8 +86,8 @@ target 'WooCommerce' do pod 'Gridicons', '~> 1.2.0' # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1 - # pod 'WordPressAuthenticator', '~> 5.0.0' - pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => 'bf6681f979ea3edbc07021130cfc0f4644138575' + pod 'WordPressAuthenticator', '~> 5.1.0-beta.1' + # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '' # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => '' # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS' diff --git a/Podfile.lock b/Podfile.lock index d359d909b11..003d06c5b84 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -84,7 +84,7 @@ DEPENDENCIES: - Sourcery (~> 1.0.3) - StripeTerminal (~> 2.14) - WordPress-Editor-iOS (~> 1.11.0) - - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `bf6681f979ea3edbc07021130cfc0f4644138575`) + - WordPressAuthenticator (~> 5.1.0-beta.1) - WordPressKit (~> 5.0.0) - WordPressShared (~> 2.0) - WordPressUI (~> 1.12.5) @@ -94,6 +94,8 @@ DEPENDENCIES: - ZendeskSupportSDK (~> 5.0) SPEC REPOS: + https://github.com/wordpress-mobile/cocoapods-specs.git: + - WordPressAuthenticator trunk: - Alamofire - AppAuth @@ -130,16 +132,6 @@ SPEC REPOS: - ZendeskSupportProvidersSDK - ZendeskSupportSDK -EXTERNAL SOURCES: - WordPressAuthenticator: - :commit: bf6681f979ea3edbc07021130cfc0f4644138575 - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - -CHECKOUT OPTIONS: - WordPressAuthenticator: - :commit: bf6681f979ea3edbc07021130cfc0f4644138575 - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - SPEC CHECKSUMS: Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add @@ -161,7 +153,7 @@ SPEC CHECKSUMS: UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67 WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 - WordPressAuthenticator: 95f698805ebbbe86c5721ce244e1302ea810326b + WordPressAuthenticator: b4df3148e7a7c1ad739bcbe6cc7b5ce728a1b15d WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5 WordPressShared: 35d41bdf0927e714af1fc85fa9cb692f934473be WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac @@ -177,6 +169,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba -PODFILE CHECKSUM: 7df16dcb0266dd8a5570da921db0ab4918ff6a1b +PODFILE CHECKSUM: 1722df035b660fdbca6ea0b77580dd512ca22e7f COCOAPODS: 1.11.3 From bc7b5c437b43dc36f84e16db4f7304b1e5e6bb6f Mon Sep 17 00:00:00 2001 From: Sharma Elanthiraiyan Date: Wed, 18 Jan 2023 11:11:29 +0530 Subject: [PATCH 4/4] Update pod file checksum. --- Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile.lock b/Podfile.lock index 003d06c5b84..83485a2d9d8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -169,6 +169,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba -PODFILE CHECKSUM: 1722df035b660fdbca6ea0b77580dd512ca22e7f +PODFILE CHECKSUM: d9ae1586866c135c8c538e08c02a66f17b63c344 COCOAPODS: 1.11.3