Skip to content

Commit

Permalink
Switch WordPressAuthenticator to branch with new user bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
mokagio committed Mar 29, 2023
1 parent 29f810a commit 940e399
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ abstract_target 'Apps' do

pod 'Gridicons', '~> 1.1.0'

pod 'WordPressAuthenticator', '~> 5.6-beta'
# pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: 'trunk'
# pod 'WordPressAuthenticator', '~> 5.6-beta'
pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: 'mokagio/social-service-without-google'
# pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
# pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'

Expand Down
15 changes: 10 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ PODS:
- WordPress-Aztec-iOS (1.19.8)
- WordPress-Editor-iOS (1.19.8):
- WordPress-Aztec-iOS (= 1.19.8)
- WordPressAuthenticator (5.6.0):
- WordPressAuthenticator (5.7.0):
- GoogleSignIn (~> 6.0.1)
- Gridicons (~> 1.0)
- "NSURL+IDN (= 0.4)"
Expand Down Expand Up @@ -611,7 +611,7 @@ DEPENDENCIES:
- SVProgressHUD (= 2.2.5)
- SwiftLint (~> 0.50)
- WordPress-Editor-iOS (~> 1.19.8)
- WordPressAuthenticator (~> 5.6-beta)
- WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `mokagio/social-service-without-google`)
- WordPressKit (~> 7.0.0-beta)
- WordPressShared (~> 2.0-beta)
- WordPressUI (~> 1.12.5)
Expand All @@ -622,7 +622,6 @@ DEPENDENCIES:

SPEC REPOS:
https://github.com/wordpress-mobile/cocoapods-specs.git:
- WordPressAuthenticator
- WordPressShared
trunk:
- Alamofire
Expand Down Expand Up @@ -778,6 +777,9 @@ EXTERNAL SOURCES:
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
:submodules: true
:tag: v1.92.0-alpha1
WordPressAuthenticator:
:branch: mokagio/social-service-without-google
:git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
Yoga:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.92.0-alpha1/third-party-podspecs/Yoga.podspec.json

Expand All @@ -793,6 +795,9 @@ CHECKOUT OPTIONS:
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
:submodules: true
:tag: v1.92.0-alpha1
WordPressAuthenticator:
:commit: 26c8d442b971502bc5a4fb95b897c386c9e9e7bf
:git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git

SPEC CHECKSUMS:
Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
Expand Down Expand Up @@ -880,7 +885,7 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: e6a801d25f4f178de5bdf475ffe29050d0148176
WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
WordPressAuthenticator: 0a2a3699c6ddaabf4a5615f43729170f2bb3031a
WordPressAuthenticator: 51627ce18a62d29f71c9d01dc1e54b3c077fcc7a
WordPressKit: a161c49306369cfa22c648866cee5aba16d7cbac
WordPressShared: 8e59bc8cec256f54a7c4cc6c94911adc2a9a65d2
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
Expand All @@ -896,6 +901,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37

PODFILE CHECKSUM: 48c28f5cf835d8db90a688018500190c97fbf876
PODFILE CHECKSUM: c5ced7b7b57570b867c0b7bdfe753f7e71122569

COCOAPODS: 1.11.3
10 changes: 2 additions & 8 deletions WordPress/Classes/ViewRelated/NUX/LoginEpilogueUserInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ extension LoginEpilogueUserInfo {
/// Updates the Epilogue properties, given a SocialService instance.
///
mutating func update(with service: SocialService) {
switch service {
case .google(let user):
fullName = user.profile?.name ?? String()
email = user.profile?.email ?? String()
case .apple(let user):
fullName = user.fullName
email = user.email
}
fullName = service.user.fullName
email = service.user.email
}
}

0 comments on commit 940e399

Please sign in to comment.