@@ -53,7 +53,7 @@ private FirebaseAuthPlugin(PluginRegistry.Registrar registrar, MethodChannel cha
53
53
}
54
54
55
55
private FirebaseAuth getAuth (MethodCall call ) {
56
- Map <String , Object > arguments = ( Map < String , Object >) call .arguments ;
56
+ Map <String , Object > arguments = call .arguments () ;
57
57
String appName = (String ) arguments .get ("app" );
58
58
FirebaseApp app = FirebaseApp .getInstance (appName );
59
59
return FirebaseAuth .getInstance (app );
@@ -151,8 +151,7 @@ public void onMethodCall(MethodCall call, Result result) {
151
151
152
152
private void handleSignInWithPhoneNumber (
153
153
MethodCall call , Result result , FirebaseAuth firebaseAuth ) {
154
- @ SuppressWarnings ("unchecked" )
155
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
154
+ Map <String , String > arguments = call .arguments ();
156
155
String verificationId = arguments .get ("verificationId" );
157
156
String smsCode = arguments .get ("smsCode" );
158
157
@@ -165,7 +164,6 @@ private void handleSignInWithPhoneNumber(
165
164
166
165
private void handleVerifyPhoneNumber (
167
166
MethodCall call , Result result , final FirebaseAuth firebaseAuth ) {
168
- @ SuppressWarnings ("unchecked" )
169
167
final int handle = call .argument ("handle" );
170
168
String phoneNumber = call .argument ("phoneNumber" );
171
169
int timeout = call .argument ("timeout" );
@@ -237,6 +235,7 @@ public void onCodeAutoRetrievalTimeOut(String verificationId) {
237
235
registrar .activity (),
238
236
verificationCallbacks );
239
237
}
238
+ result .success (null );
240
239
}
241
240
242
241
private Map <String , Object > getVerifyPhoneNumberExceptionMap (FirebaseException e ) {
@@ -259,8 +258,7 @@ private Map<String, Object> getVerifyPhoneNumberExceptionMap(FirebaseException e
259
258
260
259
private void handleLinkWithEmailAndPassword (
261
260
MethodCall call , Result result , FirebaseAuth firebaseAuth ) {
262
- @ SuppressWarnings ("unchecked" )
263
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
261
+ Map <String , String > arguments = call .arguments ();
264
262
String email = arguments .get ("email" );
265
263
String password = arguments .get ("password" );
266
264
@@ -271,25 +269,30 @@ private void handleLinkWithEmailAndPassword(
271
269
.addOnCompleteListener (new SignInCompleteListener (result ));
272
270
}
273
271
274
- private void handleCurrentUser (MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
275
- FirebaseUser user = firebaseAuth .getCurrentUser ();
276
- if (user == null ) {
277
- result .success (null );
278
- return ;
279
- }
280
- Map <String , Object > userMap = mapFromUser (user );
281
- result .success (userMap );
272
+ private void handleCurrentUser (
273
+ @ SuppressWarnings ("unused" ) MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
274
+ final FirebaseAuth .AuthStateListener listener =
275
+ new FirebaseAuth .AuthStateListener () {
276
+ @ Override
277
+ public void onAuthStateChanged (@ NonNull FirebaseAuth firebaseAuth ) {
278
+ firebaseAuth .removeAuthStateListener (this );
279
+ FirebaseUser user = firebaseAuth .getCurrentUser ();
280
+ Map <String , Object > userMap = mapFromUser (user );
281
+ result .success (userMap );
282
+ }
283
+ };
284
+
285
+ firebaseAuth .addAuthStateListener (listener );
282
286
}
283
287
284
288
private void handleSignInAnonymously (
285
- MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
289
+ @ SuppressWarnings ( "unused" ) MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
286
290
firebaseAuth .signInAnonymously ().addOnCompleteListener (new SignInCompleteListener (result ));
287
291
}
288
292
289
293
private void handleCreateUserWithEmailAndPassword (
290
294
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
291
- @ SuppressWarnings ("unchecked" )
292
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
295
+ Map <String , String > arguments = call .arguments ();
293
296
String email = arguments .get ("email" );
294
297
String password = arguments .get ("password" );
295
298
@@ -300,19 +303,17 @@ private void handleCreateUserWithEmailAndPassword(
300
303
301
304
private void handleFetchProvidersForEmail (
302
305
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
303
- @ SuppressWarnings ("unchecked" )
304
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
306
+ Map <String , String > arguments = call .arguments ();
305
307
String email = arguments .get ("email" );
306
308
307
309
firebaseAuth
308
- .fetchProvidersForEmail (email )
309
- .addOnCompleteListener (new ProvidersCompleteListener (result ));
310
+ .fetchSignInMethodsForEmail (email )
311
+ .addOnCompleteListener (new SignInMethodCompleteListener (result ));
310
312
}
311
313
312
314
private void handleSendPasswordResetEmail (
313
315
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
314
- @ SuppressWarnings ("unchecked" )
315
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
316
+ Map <String , String > arguments = call .arguments ();
316
317
String email = arguments .get ("email" );
317
318
318
319
firebaseAuth
@@ -321,24 +322,32 @@ private void handleSendPasswordResetEmail(
321
322
}
322
323
323
324
private void handleSendEmailVerification (
324
- MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
325
+ @ SuppressWarnings ( "unused" ) MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
325
326
firebaseAuth
326
327
.getCurrentUser ()
327
328
.sendEmailVerification ()
328
329
.addOnCompleteListener (new TaskVoidCompleteListener (result ));
329
330
}
330
331
331
- private void handleReload (MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
332
+ private void handleReload (
333
+ @ SuppressWarnings ("unused" ) MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
332
334
firebaseAuth
333
335
.getCurrentUser ()
334
336
.reload ()
335
337
.addOnCompleteListener (new TaskVoidCompleteListener (result ));
336
338
}
337
339
340
+ private void handleDelete (
341
+ @ SuppressWarnings ("unused" ) MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
342
+ firebaseAuth
343
+ .getCurrentUser ()
344
+ .delete ()
345
+ .addOnCompleteListener (new TaskVoidCompleteListener (result ));
346
+ }
347
+
338
348
private void handleSignInWithEmailAndPassword (
339
349
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
340
- @ SuppressWarnings ("unchecked" )
341
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
350
+ Map <String , String > arguments = call .arguments ();
342
351
String email = arguments .get ("email" );
343
352
String password = arguments .get ("password" );
344
353
@@ -347,17 +356,9 @@ private void handleSignInWithEmailAndPassword(
347
356
.addOnCompleteListener (new SignInCompleteListener (result ));
348
357
}
349
358
350
- private void handleDelete (MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
351
- firebaseAuth
352
- .getCurrentUser ()
353
- .delete ()
354
- .addOnCompleteListener (new TaskVoidCompleteListener (result ));
355
- }
356
-
357
359
private void handleSignInWithGoogle (
358
360
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
359
- @ SuppressWarnings ("unchecked" )
360
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
361
+ Map <String , String > arguments = call .arguments ();
361
362
String idToken = arguments .get ("idToken" );
362
363
String accessToken = arguments .get ("accessToken" );
363
364
AuthCredential credential = GoogleAuthProvider .getCredential (idToken , accessToken );
@@ -368,8 +369,7 @@ private void handleSignInWithGoogle(
368
369
369
370
private void handleLinkWithGoogleCredential (
370
371
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
371
- @ SuppressWarnings ("unchecked" )
372
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
372
+ Map <String , String > arguments = call .arguments ();
373
373
String idToken = arguments .get ("idToken" );
374
374
String accessToken = arguments .get ("accessToken" );
375
375
AuthCredential credential = GoogleAuthProvider .getCredential (idToken , accessToken );
@@ -381,8 +381,7 @@ private void handleLinkWithGoogleCredential(
381
381
382
382
private void handleLinkWithFacebookCredential (
383
383
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
384
- @ SuppressWarnings ("unchecked" )
385
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
384
+ Map <String , String > arguments = call .arguments ();
386
385
String accessToken = arguments .get ("accessToken" );
387
386
AuthCredential credential = FacebookAuthProvider .getCredential (accessToken );
388
387
firebaseAuth
@@ -393,8 +392,7 @@ private void handleLinkWithFacebookCredential(
393
392
394
393
private void handleLinkWithTwitterCredential (
395
394
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
396
- @ SuppressWarnings ("unchecked" )
397
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
395
+ Map <String , String > arguments = call .arguments ();
398
396
String authToken = arguments .get ("authToken" );
399
397
String authTokenSecret = arguments .get ("authTokenSecret" );
400
398
AuthCredential credential = TwitterAuthProvider .getCredential (authToken , authTokenSecret );
@@ -406,8 +404,7 @@ private void handleLinkWithTwitterCredential(
406
404
407
405
private void handleSignInWithFacebook (
408
406
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
409
- @ SuppressWarnings ("unchecked" )
410
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
407
+ Map <String , String > arguments = call .arguments ();
411
408
String accessToken = arguments .get ("accessToken" );
412
409
AuthCredential credential = FacebookAuthProvider .getCredential (accessToken );
413
410
firebaseAuth
@@ -434,14 +431,14 @@ private void handleSignInWithCustomToken(
434
431
.addOnCompleteListener (new SignInCompleteListener (result ));
435
432
}
436
433
437
- private void handleSignOut (MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
434
+ private void handleSignOut (
435
+ @ SuppressWarnings ("unused" ) MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
438
436
firebaseAuth .signOut ();
439
437
result .success (null );
440
438
}
441
439
442
440
private void handleGetToken (MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
443
- @ SuppressWarnings ("unchecked" )
444
- Map <String , Boolean > arguments = (Map <String , Boolean >) call .arguments ;
441
+ Map <String , Boolean > arguments = call .arguments ();
445
442
boolean refresh = arguments .get ("refresh" );
446
443
firebaseAuth
447
444
.getCurrentUser ()
@@ -460,8 +457,7 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
460
457
}
461
458
462
459
private void handleUpdateEmail (MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
463
- @ SuppressWarnings ("unchecked" )
464
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
460
+ Map <String , String > arguments = call .arguments ();
465
461
firebaseAuth
466
462
.getCurrentUser ()
467
463
.updateEmail (arguments .get ("email" ))
@@ -470,8 +466,7 @@ private void handleUpdateEmail(MethodCall call, final Result result, FirebaseAut
470
466
471
467
private void handleUpdatePassword (
472
468
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
473
- @ SuppressWarnings ("unchecked" )
474
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
469
+ Map <String , String > arguments = call .arguments ();
475
470
firebaseAuth
476
471
.getCurrentUser ()
477
472
.updatePassword (arguments .get ("password" ))
@@ -480,8 +475,7 @@ private void handleUpdatePassword(
480
475
481
476
private void handleUpdateProfile (
482
477
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
483
- @ SuppressWarnings ("unchecked" )
484
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
478
+ Map <String , String > arguments = call .arguments ();
485
479
486
480
UserProfileChangeRequest .Builder builder = new UserProfileChangeRequest .Builder ();
487
481
if (arguments .containsKey ("displayName" )) {
@@ -498,7 +492,7 @@ private void handleUpdateProfile(
498
492
}
499
493
500
494
private void handleStartListeningAuthState (
501
- MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
495
+ @ SuppressWarnings ( "unused" ) MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
502
496
final int handle = nextHandle ++;
503
497
FirebaseAuth .AuthStateListener listener =
504
498
new FirebaseAuth .AuthStateListener () {
@@ -540,8 +534,7 @@ private void handleStopListeningAuthState(
540
534
541
535
private void handleSetLanguageCode (
542
536
MethodCall call , final Result result , FirebaseAuth firebaseAuth ) {
543
- @ SuppressWarnings ("unchecked" )
544
- Map <String , String > arguments = (Map <String , String >) call .arguments ;
537
+ Map <String , String > arguments = call .arguments ();
545
538
String language = arguments .get ("language" );
546
539
547
540
firebaseAuth .setLanguageCode (language );
@@ -586,20 +579,21 @@ public void onComplete(@NonNull Task<Void> task) {
586
579
}
587
580
}
588
581
589
- private class ProvidersCompleteListener implements OnCompleteListener <ProviderQueryResult > {
582
+ private class SignInMethodCompleteListener
583
+ implements OnCompleteListener <SignInMethodQueryResult > {
590
584
private final Result result ;
591
585
592
- ProvidersCompleteListener (Result result ) {
586
+ SignInMethodCompleteListener (Result result ) {
593
587
this .result = result ;
594
588
}
595
589
596
590
@ Override
597
- public void onComplete (@ NonNull Task <ProviderQueryResult > task ) {
591
+ public void onComplete (@ NonNull Task <SignInMethodQueryResult > task ) {
598
592
if (!task .isSuccessful ()) {
599
593
Exception e = task .getException ();
600
594
result .error (ERROR_REASON_EXCEPTION , e .getMessage (), null );
601
595
} else {
602
- List <String > providers = task .getResult ().getProviders ();
596
+ List <String > providers = task .getResult ().getSignInMethods ();
603
597
result .success (providers );
604
598
}
605
599
}
0 commit comments