Skip to content

Commit 78b92b1

Browse files
itsmeichigoitsmeichigo
authored
Merge pull request #7929 from woocommerce/issue/7899-simplified-prologue
Simplified login: Integrate the mimimal login screens
2 parents b1b4eb3 + 1a1c3f2 commit 78b92b1

File tree

8 files changed

+95
-23
lines changed

8 files changed

+95
-23
lines changed

‎Experiments/Experiments/DefaultFeatureFlagService.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
4545
return buildConfig == .localDeveloper || buildConfig == .alpha
4646
case .storeCreationMVP:
4747
return buildConfig == .localDeveloper || buildConfig == .alpha
48-
case .productsOnboarding:
49-
return buildConfig == .localDeveloper || buildConfig == .alpha
5048
case .simplifiedLoginFlowI1:
5149
return buildConfig == .localDeveloper || buildConfig == .alpha
50+
case .productsOnboarding:
51+
return buildConfig == .localDeveloper || buildConfig == .alpha
5252
default:
5353
return true
5454
}

‎Experiments/Experiments/FeatureFlag.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,12 @@ public enum FeatureFlag: Int {
8686
///
8787
case storeCreationMVP
8888

89-
/// Hides products onboarding development.
90-
///
91-
case productsOnboarding
92-
9389
/// Temporary feature flag for the simplified login flow.
9490
/// TODO: replace with A/B testing.
9591
///
9692
case simplifiedLoginFlowI1
9793

94+
/// Hides products onboarding development.
95+
///
96+
case productsOnboarding
9897
}

‎Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ target 'WooCommerce' do
6565
pod 'Gridicons', '~> 1.2.0'
6666

6767
# To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
68-
pod 'WordPressAuthenticator', '~> 3.2.0'
68+
pod 'WordPressAuthenticator', '~> 3.3.0-beta.1'
6969
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
7070
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
7171
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

‎Podfile.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ PODS:
4242
- WordPress-Aztec-iOS (1.11.0)
4343
- WordPress-Editor-iOS (1.11.0):
4444
- WordPress-Aztec-iOS (= 1.11.0)
45-
- WordPressAuthenticator (3.2.0):
46-
- Alamofire (~> 4.8)
45+
- WordPressAuthenticator (3.3.0-beta.1):
4746
- CocoaLumberjack (~> 3.5)
4847
- GoogleSignIn (~> 6.0.1)
4948
- Gridicons (~> 1.0)
@@ -92,7 +91,7 @@ DEPENDENCIES:
9291
- Sourcery (~> 1.0.3)
9392
- StripeTerminal (~> 2.7)
9493
- WordPress-Editor-iOS (~> 1.11.0)
95-
- WordPressAuthenticator (~> 3.2.0)
94+
- WordPressAuthenticator (~> 3.3.0-beta.1)
9695
- WordPressKit (~> 4.49.0)
9796
- WordPressShared (~> 1.15)
9897
- WordPressUI (~> 1.12.5)
@@ -102,6 +101,8 @@ DEPENDENCIES:
102101
- ZendeskSupportSDK (~> 5.0)
103102

104103
SPEC REPOS:
104+
https://github.com/wordpress-mobile/cocoapods-specs.git:
105+
- WordPressAuthenticator
105106
trunk:
106107
- Alamofire
107108
- AppAuth
@@ -124,7 +125,6 @@ SPEC REPOS:
124125
- UIDeviceIdentifier
125126
- WordPress-Aztec-iOS
126127
- WordPress-Editor-iOS
127-
- WordPressAuthenticator
128128
- WordPressKit
129129
- WordPressShared
130130
- WordPressUI
@@ -162,7 +162,7 @@ SPEC CHECKSUMS:
162162
UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
163163
WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
164164
WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
165-
WordPressAuthenticator: ee31d9b0420d2ab7a98e7fe931d3333bf97a47b2
165+
WordPressAuthenticator: 11f20320f3a80dbe1803d0af38958561b078ca84
166166
WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
167167
WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
168168
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
178178
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
179179
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
180180

181-
PODFILE CHECKSUM: 2824ed96b744a10c5fd0ac69b7e99ae9e1cdeb7d
181+
PODFILE CHECKSUM: 7d6054e92998bd533f3ee9097331e22ad596717c
182182

183183
COCOAPODS: 1.11.3

‎WooCommerce/Classes/Authentication/AuthenticationConstants.swift‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ struct AuthenticationConstants {
2525
comment: "Sign in instructions on the 'log in using WordPress.com account' screen."
2626
)
2727

28+
/// Get started instructions when simplified login is enabled.
29+
///
30+
static let getStartedInstructionsForSimplifiedLogin = NSLocalizedString(
31+
"Enter your email address to get started.",
32+
comment: "Sign in instructions on the 'log in using WordPress.com account' screen."
33+
)
34+
2835
/// What is WordPress.com? link (Continue with WordPress.com)
2936
///
3037
static let whatIsWPComLinkTitle = NSLocalizedString(
@@ -58,6 +65,13 @@ struct AuthenticationConstants {
5865
comment: "Sign in instructions asking user to enter WordPress.com password to proceed with sign in using Apple process"
5966
)
6067

68+
/// Simplified Log In button
69+
///
70+
static let loginButtonTitle = NSLocalizedString(
71+
"Log In",
72+
comment: "Button title in the simplified login prologue screen. Takes the user to the login flow."
73+
)
74+
6175
/// Title of "Continue With WordPress.com" button in Login Prologue
6276
//
6377
static let continueWithWPButtonTitle = NSLocalizedString(
@@ -106,4 +120,18 @@ struct AuthenticationConstants {
106120
"If you continue with Apple and don't already have a WordPress.com account, you are creating an account and you agree to our _Terms of Service_.",
107121
comment: "Legal disclaimer for signing up. The underscores _..._ denote underline."
108122
)
123+
124+
/// Create a Store button in Simplified login flow
125+
///
126+
static let createSiteButtonTitle = NSLocalizedString(
127+
"Create a Store",
128+
comment: "Button displayed on the prologue screen of the simplified login flow to create a new store"
129+
)
130+
131+
/// Instructions for WPCom password
132+
///
133+
static let wpcomPasswordInstructions = NSLocalizedString(
134+
"Enter the password for your account.",
135+
comment: "Instructional text shown when requesting the user's password for WPCom login."
136+
)
109137
}

‎WooCommerce/Classes/Authentication/AuthenticationManager.swift‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ class AuthenticationManager: Authentication {
5454
let isWPComMagicLinkShownAsSecondaryActionOnPasswordScreen = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginMagicLinkEmphasisM2)
5555
let isFeatureCarouselShown = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginPrologueOnboarding) == false
5656
|| loggedOutAppSettings.hasFinishedOnboarding == true
57+
let isSimplifiedLoginI1Enabled = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.simplifiedLoginFlowI1)
58+
let isStoreCreationMVPEnabled = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.storeCreationMVP)
5759
let configuration = WordPressAuthenticatorConfiguration(wpcomClientId: ApiCredentials.dotcomAppId,
5860
wpcomSecret: ApiCredentials.dotcomSecret,
5961
wpcomScheme: ApiCredentials.dotcomAuthScheme,
6062
wpcomTermsOfServiceURL: WooConstants.URLs.termsOfService.rawValue,
6163
wpcomAPIBaseURL: Settings.wordpressApiBaseURL,
62-
whatIsWPComURL: WooConstants.URLs.whatIsWPCom.rawValue,
64+
whatIsWPComURL: isSimplifiedLoginI1Enabled ? nil : WooConstants.URLs.whatIsWPCom.rawValue,
6365
googleLoginClientId: ApiCredentials.googleClientId,
6466
googleLoginServerClientId: ApiCredentials.googleServerId,
6567
googleLoginScheme: ApiCredentials.googleAuthScheme,
@@ -74,7 +76,13 @@ class AuthenticationManager: Authentication {
7476
isWPComLoginRequiredForSiteCredentialsLogin: true,
7577
isWPComMagicLinkPreferredToPassword: isWPComMagicLinkPreferredToPassword,
7678
isWPComMagicLinkShownAsSecondaryActionOnPasswordScreen:
77-
isWPComMagicLinkShownAsSecondaryActionOnPasswordScreen)
79+
isWPComMagicLinkShownAsSecondaryActionOnPasswordScreen,
80+
enableWPComLoginOnlyInPrologue: isSimplifiedLoginI1Enabled,
81+
enableSiteCreation: isStoreCreationMVPEnabled,
82+
enableSocialLogin: !isSimplifiedLoginI1Enabled,
83+
emphasizeEmailForWPComPassword: isSimplifiedLoginI1Enabled,
84+
wpcomPasswordInstructions: isSimplifiedLoginI1Enabled ?
85+
AuthenticationConstants.wpcomPasswordInstructions : nil)
7886

7987
let systemGray3LightModeColor = UIColor(red: 199/255.0, green: 199/255.0, blue: 204/255.0, alpha: 1)
8088
let systemLabelLightModeColor = UIColor(red: 0, green: 0, blue: 0, alpha: 1)
@@ -108,22 +116,34 @@ class AuthenticationManager: Authentication {
108116
LoginPrologueViewController(isFeatureCarouselShown: isFeatureCarouselShown),
109117
statusBarStyle: .default)
110118

119+
let getStartedInstructions = isSimplifiedLoginI1Enabled ?
120+
AuthenticationConstants.getStartedInstructionsForSimplifiedLogin :
121+
AuthenticationConstants.getStartedInstructions
122+
123+
let continueWithWPButtonTitle = isSimplifiedLoginI1Enabled ?
124+
AuthenticationConstants.loginButtonTitle :
125+
AuthenticationConstants.continueWithWPButtonTitle
126+
127+
let emailAddressPlaceholder = isSimplifiedLoginI1Enabled ?
128+
"[email protected]" :
129+
WordPressAuthenticatorDisplayStrings.defaultStrings.emailAddressPlaceholder
130+
111131
let displayStrings = WordPressAuthenticatorDisplayStrings(emailLoginInstructions: AuthenticationConstants.emailInstructions,
112-
getStartedInstructions: isWPComSignupEnabled ?
113-
AuthenticationConstants.getStartedInstructionsWithWPComSignupEnabled:
114-
AuthenticationConstants.getStartedInstructions,
132+
getStartedInstructions: getStartedInstructions,
115133
jetpackLoginInstructions: AuthenticationConstants.jetpackInstructions,
116134
siteLoginInstructions: AuthenticationConstants.siteInstructions,
117135
siteCredentialInstructions: AuthenticationConstants.siteCredentialInstructions,
118136
usernamePasswordInstructions: AuthenticationConstants.usernamePasswordInstructions,
119137
applePasswordInstructions: AuthenticationConstants.applePasswordInstructions,
120-
continueWithWPButtonTitle: AuthenticationConstants.continueWithWPButtonTitle,
138+
continueWithWPButtonTitle: continueWithWPButtonTitle,
121139
enterYourSiteAddressButtonTitle: AuthenticationConstants.enterYourSiteAddressButtonTitle,
122140
signInWithSiteCredentialsButtonTitle: AuthenticationConstants.signInWithSiteCredsButtonTitle,
123141
findSiteButtonTitle: AuthenticationConstants.findYourStoreAddressButtonTitle,
124142
signupTermsOfService: AuthenticationConstants.signupTermsOfService,
125143
whatIsWPComLinkTitle: AuthenticationConstants.whatIsWPComLinkTitle,
126-
getStartedTitle: AuthenticationConstants.loginTitle)
144+
siteCreationButtonTitle: AuthenticationConstants.createSiteButtonTitle,
145+
getStartedTitle: AuthenticationConstants.loginTitle,
146+
emailAddressPlaceholder: emailAddressPlaceholder)
127147

128148
let unifiedStyle = WordPressAuthenticatorUnifiedStyle(borderColor: .divider,
129149
errorColor: .error,
@@ -516,6 +536,12 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
516536
}
517537
ServiceLocator.analytics.track(wooEvent, withError: error)
518538
}
539+
540+
// Navigate to store creation
541+
func showSiteCreation(in navigationController: UINavigationController) {
542+
// TODO: add tracks
543+
// Navigate to store creation
544+
}
519545
}
520546

521547
// MARK: - Local notifications

‎WooCommerce/UITestsFoundation/Screens/Login/PrologueScreen.swift‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ public final class PrologueScreen: ScreenObject {
55

66
public init(app: XCUIApplication = XCUIApplication()) throws {
77
try super.init(
8-
expectedElementGetter: { $0.buttons["Prologue Continue Button"] },
8+
expectedElementGetter: { Self.findContinueButton(in: $0) },
99
app: app
1010
)
1111
}
1212

1313
public func selectContinueWithWordPress() -> GetStartedScreen {
14-
app.buttons["Prologue Continue Button"].tap()
15-
14+
Self.findContinueButton(in: app).tap()
1615
return GetStartedScreen()
1716
}
1817

@@ -28,3 +27,19 @@ public final class PrologueScreen: ScreenObject {
2827
return self
2928
}
3029
}
30+
31+
extension PrologueScreen {
32+
static func findContinueButton(in app: XCUIApplication) -> XCUIElement {
33+
let continueButton = app.buttons["Prologue Continue Button"]
34+
if continueButton.waitForExistence(timeout: 1) {
35+
return continueButton
36+
} else {
37+
// On simplified login flow, the button has different identifier
38+
return app.buttons["Prologue Log In Button"]
39+
}
40+
}
41+
42+
public static func isSiteAddressLoginAvailable(in app: XCUIApplication = .init()) -> Bool {
43+
app.buttons["Prologue Self Hosted Button"].waitForExistence(timeout: 1)
44+
}
45+
}

‎WooCommerce/WooCommerceUITests/Tests/LoginTests.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ final class LoginTests: XCTestCase {
1212
}
1313

1414
func test_site_address_login_logout() throws {
15+
// do not test this case for simplified login since site address login is not available
16+
guard PrologueScreen.isSiteAddressLoginAvailable() else {
17+
return
18+
}
1519
try PrologueScreen()
1620
.selectSiteAddress()
1721
.proceedWith(siteUrl: TestCredentials.siteUrl)

0 commit comments

Comments
 (0)