Skip to content

Commit 267ca78

Browse files
committed
bug bash
1 parent 6c84a95 commit 267ca78

File tree

10 files changed

+163
-292
lines changed

10 files changed

+163
-292
lines changed

Auth/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ SPEC CHECKSUMS:
7575

7676
PODFILE CHECKSUM: ebf29e3406d483d781b4dad6fb66d2ff0b7a0f9b
7777

78-
COCOAPODS: 1.10.0
78+
COCOAPODS: 1.10.1

FacebookAuth/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target 'FirebaseFacebookAuthUI' do
99
# The facebook pods generate an unreasonable number of warnings.
1010
inhibit_all_warnings!
1111

12-
pod 'FBSDKLoginKit', '~> 7.0'
12+
pod 'FBSDKLoginKit', '~> 9.0'
1313
pod 'FBSDKCoreKit'
1414

1515
pod 'FirebaseUI/Auth', :path => '../'

FacebookAuth/Podfile.lock

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
PODS:
2-
- FBSDKCoreKit (7.1.1):
3-
- FBSDKCoreKit/Basics (= 7.1.1)
4-
- FBSDKCoreKit/Core (= 7.1.1)
5-
- FBSDKCoreKit/Basics (7.1.1)
6-
- FBSDKCoreKit/Core (7.1.1):
2+
- FBSDKCoreKit (9.0.0):
3+
- FBSDKCoreKit/Basics (= 9.0.0)
4+
- FBSDKCoreKit/Core (= 9.0.0)
5+
- FBSDKCoreKit/Basics (9.0.0)
6+
- FBSDKCoreKit/Core (9.0.0):
77
- FBSDKCoreKit/Basics
8-
- FBSDKLoginKit (7.1.1):
9-
- FBSDKLoginKit/Login (= 7.1.1)
10-
- FBSDKLoginKit/Login (7.1.1):
11-
- FBSDKCoreKit (~> 7.1.1)
12-
- Firebase/Auth (7.3.0):
8+
- FBSDKLoginKit (9.0.0):
9+
- FBSDKLoginKit/Login (= 9.0.0)
10+
- FBSDKLoginKit/Login (9.0.0):
11+
- FBSDKCoreKit (~> 9.0.0)
12+
- Firebase/Auth (7.4.0):
1313
- Firebase/CoreOnly
14-
- FirebaseAuth (~> 7.3.0)
15-
- Firebase/CoreOnly (7.3.0):
16-
- FirebaseCore (= 7.3.0)
17-
- FirebaseAuth (7.3.0):
14+
- FirebaseAuth (~> 7.4.0)
15+
- Firebase/CoreOnly (7.4.0):
16+
- FirebaseCore (= 7.4.0)
17+
- FirebaseAuth (7.4.0):
1818
- FirebaseCore (~> 7.0)
1919
- GoogleUtilities/AppDelegateSwizzler (~> 7.0)
2020
- GoogleUtilities/Environment (~> 7.0)
2121
- GTMSessionFetcher/Core (~> 1.4)
22-
- FirebaseCore (7.3.0):
23-
- FirebaseCoreDiagnostics (~> 7.0)
22+
- FirebaseCore (7.4.0):
23+
- FirebaseCoreDiagnostics (~> 7.4)
2424
- GoogleUtilities/Environment (~> 7.0)
2525
- GoogleUtilities/Logger (~> 7.0)
26-
- FirebaseCoreDiagnostics (7.3.0):
26+
- FirebaseCoreDiagnostics (7.4.0):
2727
- GoogleDataTransport (~> 8.0)
2828
- GoogleUtilities/Environment (~> 7.0)
2929
- GoogleUtilities/Logger (~> 7.0)
30-
- nanopb (~> 2.30906.0)
30+
- nanopb (~> 2.30907.0)
3131
- FirebaseUI/Auth (9.0.0):
3232
- Firebase/Auth
3333
- GoogleUtilities/UserDefaults
34-
- GoogleDataTransport (8.1.0):
35-
- nanopb (~> 2.30906.0)
36-
- GoogleUtilities/AppDelegateSwizzler (7.1.1):
34+
- GoogleDataTransport (8.2.0):
35+
- nanopb (~> 2.30907.0)
36+
- GoogleUtilities/AppDelegateSwizzler (7.2.0):
3737
- GoogleUtilities/Environment
3838
- GoogleUtilities/Logger
3939
- GoogleUtilities/Network
40-
- GoogleUtilities/Environment (7.1.1):
40+
- GoogleUtilities/Environment (7.2.0):
4141
- PromisesObjC (~> 1.2)
42-
- GoogleUtilities/Logger (7.1.1):
42+
- GoogleUtilities/Logger (7.2.0):
4343
- GoogleUtilities/Environment
44-
- GoogleUtilities/Network (7.1.1):
44+
- GoogleUtilities/Network (7.2.0):
4545
- GoogleUtilities/Logger
4646
- "GoogleUtilities/NSData+zlib"
4747
- GoogleUtilities/Reachability
48-
- "GoogleUtilities/NSData+zlib (7.1.1)"
49-
- GoogleUtilities/Reachability (7.1.1):
48+
- "GoogleUtilities/NSData+zlib (7.2.0)"
49+
- GoogleUtilities/Reachability (7.2.0):
5050
- GoogleUtilities/Logger
51-
- GoogleUtilities/UserDefaults (7.1.1):
51+
- GoogleUtilities/UserDefaults (7.2.0):
5252
- GoogleUtilities/Logger
5353
- GTMSessionFetcher/Core (1.5.0)
54-
- nanopb (2.30906.0):
55-
- nanopb/decode (= 2.30906.0)
56-
- nanopb/encode (= 2.30906.0)
57-
- nanopb/decode (2.30906.0)
58-
- nanopb/encode (2.30906.0)
54+
- nanopb (2.30907.0):
55+
- nanopb/decode (= 2.30907.0)
56+
- nanopb/encode (= 2.30907.0)
57+
- nanopb/decode (2.30907.0)
58+
- nanopb/encode (2.30907.0)
5959
- OCMock (3.8.1)
6060
- PromisesObjC (1.2.12)
6161

6262
DEPENDENCIES:
6363
- FBSDKCoreKit
64-
- FBSDKLoginKit (~> 7.0)
64+
- FBSDKLoginKit (~> 9.0)
6565
- FirebaseUI/Auth (from `../`)
6666
- OCMock
6767

@@ -85,20 +85,20 @@ EXTERNAL SOURCES:
8585
:path: "../"
8686

8787
SPEC CHECKSUMS:
88-
FBSDKCoreKit: b46507dc8b8cefed31d644e74d7cc30e2a715ef8
89-
FBSDKLoginKit: 1a61d79e2b25e2fc0d03dccab1e34b38bbdf2546
90-
Firebase: 26223c695fe322633274198cb19dca8cb7e54416
91-
FirebaseAuth: c224a0cf1afa0949bd5c7bfcf154b4f5ce8ddef2
92-
FirebaseCore: 4d3c72622ce0e2106aaa07bb4b2935ba2c370972
93-
FirebaseCoreDiagnostics: d50e11039e5984d92c8a512be2395f13df747350
94-
FirebaseUI: f0677a1cc235f6da602cbd5c9b5fbbd24544a6b3
95-
GoogleDataTransport: 116c84c4bdeb76be2a7a46de51244368f9794eab
96-
GoogleUtilities: 3dc4ff0d5e4840e2fa8eef0889620e8c33d4218c
88+
FBSDKCoreKit: ac6cc500b8e104bb9a4dd20b1527b5d199123c2e
89+
FBSDKLoginKit: e9b6542fdee322333502ab497f628b011dce7d78
90+
Firebase: 09fb40287b6dfc8ee65f726fa0b788719d3f2a07
91+
FirebaseAuth: d8dba8db90a1705ee2493857047282ca4f6e7598
92+
FirebaseCore: 99c06e5a1e8d6952e75cb1f0a6d0b23c0f5ccdcf
93+
FirebaseCoreDiagnostics: 3770093ac4f2be4590fa03cfa1d3a6e5602d4557
94+
FirebaseUI: ea730675a9a97e5282b5ea5c1db9b15dea51e1e2
95+
GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
96+
GoogleUtilities: d866834472f1324d080496bc67ab3ce5d0d46027
9797
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
98-
nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
98+
nanopb: 59221d7f958fb711001e6a449489542d92ae113e
9999
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
100100
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
101101

102-
PODFILE CHECKSUM: bd55467c7e4a99e9a0956db8228918532b9a340f
102+
PODFILE CHECKSUM: 46618b1c5d74d8b0eadcee97838015eab3535a08
103103

104-
COCOAPODS: 1.10.0
104+
COCOAPODS: 1.10.1

FirebaseUI.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Pod::Spec.new do |s|
109109
facebook.public_header_files = 'FacebookAuth/FirebaseFacebookAuthUI/*.h'
110110
facebook.source_files = 'FacebookAuth/FirebaseFacebookAuthUI/*.{h,m}'
111111
facebook.dependency 'FirebaseUI/Auth'
112-
facebook.dependency 'FBSDKLoginKit', '~> 7.0'
112+
facebook.dependency 'FBSDKLoginKit', '~> 9.0'
113113
facebook.resource_bundle = {
114114
'FirebaseFacebookAuthUI' => ['FacebookAuth/FirebaseFacebookAuthUI/**/*.{png,lproj}']
115115
}

OAuth/FirebaseOAuthUI/FUIOAuth.m

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,17 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)source
317317

318318
#pragma mark - ASAuthorizationControllerDelegate
319319

320+
+ (NSPersonNameComponentsFormatter *)nameFormatter {
321+
static NSPersonNameComponentsFormatter *nameFormatter;
322+
static dispatch_once_t onceToken;
323+
dispatch_once(&onceToken, ^{
324+
nameFormatter = [[NSPersonNameComponentsFormatter alloc] init];
325+
});
326+
return nameFormatter;
327+
}
328+
320329
- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization API_AVAILABLE(ios(13.0)) {
321-
ASAuthorizationAppleIDCredential* appleIDCredential = authorization.credential;
330+
ASAuthorizationAppleIDCredential *appleIDCredential = authorization.credential;
322331
NSData *rawIdentityToken = appleIDCredential.identityToken;
323332
if (rawIdentityToken == nil) {
324333
// It's pretty awful to not have an error when login is unsuccessful, but Apple's docs
@@ -331,7 +340,24 @@ - (void)authorizationController:(ASAuthorizationController *)controller didCompl
331340
FIROAuthCredential *credential = [FIROAuthProvider credentialWithProviderID:@"apple.com"
332341
IDToken:idToken
333342
accessToken:nil];
334-
_providerSignInCompletion(credential, nil, nil, nil);
343+
FIRAuthResultCallback result;
344+
NSPersonNameComponents *nameComponents = appleIDCredential.fullName;
345+
if (nameComponents != nil) {
346+
NSPersonNameComponentsFormatter *formatter = [[self class] nameFormatter];
347+
NSString *displayName = [formatter stringFromPersonNameComponents:nameComponents];
348+
NSDictionary *userInfo = @{FIRAuthCredentialDisplayName: displayName};
349+
credential.userInfo = userInfo;
350+
351+
result = ^(FIRUser *_Nullable user,
352+
NSError *_Nullable error) {
353+
if (user != nil) {
354+
FIRUserProfileChangeRequest *displayNameUpdate = [user profileChangeRequest];
355+
displayNameUpdate.displayName = displayName;
356+
[displayNameUpdate commitChangesWithCompletion:^(NSError * _Nullable error) {}];
357+
}
358+
};
359+
}
360+
_providerSignInCompletion(credential, nil, result, nil);
335361
}
336362

337363
- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithError:(NSError *)error API_AVAILABLE(ios(13.0)) {

OAuth/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ SPEC CHECKSUMS:
8585

8686
PODFILE CHECKSUM: dcf8182c19c131f92e73d6686d8630aed6758672
8787

88-
COCOAPODS: 1.10.0
88+
COCOAPODS: 1.10.1

PhoneAuth/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ SPEC CHECKSUMS:
8585

8686
PODFILE CHECKSUM: 24b73289886a6b6531d9f0f910da6449101d2cb4
8787

88-
COCOAPODS: 1.10.0
88+
COCOAPODS: 1.10.1

0 commit comments

Comments
 (0)