Skip to content

Commit 8fd19df

Browse files
committed
Quick fixes to auto anonymous upgrade
1 parent a72ad9e commit 8fd19df

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

FirebaseAuthUI/FUIAuth.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ __attribute__((deprecated("Instead use authUI:didSignInWithAuthDataResult:error:
204204
/** @property shouldAutoUpgradeAnonymousUsers
205205
@brief Whether to enable auto upgrading of anonymous accounts, defaults to NO.
206206
*/
207-
@property(nonatomic, assign, getter=shouldAutoUpgradeAnonymousUsers) BOOL
208-
shouldAutoUpgradeAnonymousUsers;
207+
@property(nonatomic, assign, getter=shouldAutoUpgradeAnonymousUsers) BOOL autoUpgradeAnonymousUsers;
209208

210209
/** @property privacyPolicyURL
211210
@brief The URL of your app's Privacy Policy. If not nil, a privacy policy notice is

FirebaseAuthUI/FUIAuthBaseViewController.m

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,18 @@ + (void)showAlertWithTitle:(nullable NSString *)title
256256
[UIAlertAction actionWithTitle:actionTitle
257257
style:UIAlertActionStyleDefault
258258
handler:^(UIAlertAction *_Nonnull action) {
259-
actionHandler();
259+
if (actionHandler) {
260+
actionHandler();
261+
}
260262
}];
261263
[alertController addAction:okAction];
262264
UIAlertAction *cancelAction =
263265
[UIAlertAction actionWithTitle:FUILocalizedString(kStr_Cancel)
264266
style:UIAlertActionStyleCancel
265267
handler:^(UIAlertAction * _Nonnull action) {
266-
cancelHandler();
268+
if (cancelHandler) {
269+
cancelHandler();
270+
}
267271
}];
268272
[alertController addAction:cancelAction];
269273
[presentingViewController presentViewController:alertController animated:YES completion:nil];
@@ -299,14 +303,18 @@ + (void)showSignInAlertWithEmail:(NSString *)email
299303
[UIAlertAction actionWithTitle:providerSignInLabel
300304
style:UIAlertActionStyleDefault
301305
handler:^(UIAlertAction *_Nonnull action) {
302-
signinHandler();
306+
if (signinHandler) {
307+
signinHandler();
308+
}
303309
}];
304310
[alertController addAction:signInAction];
305311
UIAlertAction *cancelAction =
306312
[UIAlertAction actionWithTitle:FUILocalizedString(kStr_Cancel)
307313
style:UIAlertActionStyleCancel
308314
handler:^(UIAlertAction * _Nonnull action) {
309-
cancelHandler();
315+
if (cancelHandler) {
316+
cancelHandler();
317+
}
310318
}];
311319
[alertController addAction:cancelAction];
312320
[presentingViewController presentViewController:alertController animated:YES completion:nil];

samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ - (IBAction)onAuthUIDelegateChanged:(UISwitch *)sender {
231231

232232
- (IBAction)onAuthorization:(id)sender {
233233
if (!_auth.currentUser || _auth.currentUser.isAnonymous) {
234-
FUIAuth.defaultAuthUI.shouldAutoUpgradeAnonymousUsers = YES;
234+
FUIAuth.defaultAuthUI.autoUpgradeAnonymousUsers = YES;
235235
_authUI.providers = [self getListOfIDPs];
236236
_authUI.signInWithEmailHidden = ![self isEmailEnabled];
237237

0 commit comments

Comments
 (0)