fix: renamed auth_service to auth_controller

fix: minor fixes
build: updated dependencies

Author: rithik-dev

README.md

@@ -288,6 +288,8 @@ class VerifyPhoneNumberScreen extends StatelessWidget {
         builder: (context, controller) {
           return Scaffold(
             appBar: AppBar(
+              leadingWidth: 0,
+              leading: const SizedBox.shrink(),
               title: const Text("Verify Phone Number"),
               actions: [
                 if (controller.codeSent)

lib/src/auth_service.dart lib/src/auth_controller.dartlib/src/auth_service.dart renamed to lib/src/auth_controller.dart

@@ -3,13 +3,20 @@ import 'dart:async';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:provider/provider.dart';
+
+class FirebasePhoneAuthController extends ChangeNotifier {
+  static FirebasePhoneAuthController of(
+    BuildContext context, {
+    bool listen = true,
+  }) =>
+      Provider.of<FirebasePhoneAuthController>(context, listen: listen);
 
-class FirebasePhoneAuthService extends ChangeNotifier {
   /// {@macro timeOutDuration}
   static const kTimeOutDuration = Duration(seconds: 60);
 
-  /// Firebase Auth instance using the default [FirebaseApp].
-  FirebaseAuth? _auth = FirebaseAuth.instance;
+  /// Firebase auth instance using the default [FirebaseApp].
+  static final FirebaseAuth _auth = FirebaseAuth.instance;
 
   /// Web confirmation result for OTP.
   ConfirmationResult? _webConfirmationResult;
@@ -116,54 +123,47 @@ class FirebasePhoneAuthService extends ChangeNotifier {
   /// [_onLoginFailed] is called with [FirebaseAuthException]
   /// object to handle the error.
   Future<bool> sendOTP() async {
-    // this.clear();
-    _auth ??= FirebaseAuth.instance;
-
-    this.codeSent = false;
-    await Future.delayed(Duration.zero, () {
-      notifyListeners();
-    });
+    codeSent = false;
+    await Future.delayed(Duration.zero, notifyListeners);
 
-    verificationCompleted(AuthCredential authCredential) async {
+    verificationCompletedCallback(AuthCredential authCredential) async {
       await _loginUser(authCredential: authCredential, autoVerified: true);
     }
 
-    verificationFailed(FirebaseAuthException authException) {
+    verificationFailedCallback(FirebaseAuthException authException) {
       if (_onLoginFailed != null) _onLoginFailed!(authException);
     }
 
-    codeSent(
+    codeSentCallback(
       String verificationId, [
       int? forceResendingToken,
     ]) async {
       _verificationId = verificationId;
       _forceResendingToken = forceResendingToken;
-      this.codeSent = true;
+      codeSent = true;
       notifyListeners();
       _setTimer();
     }
 
-    codeAutoRetrievalTimeout(String verificationId) {
+    codeAutoRetrievalTimeoutCallback(String verificationId) {
       _verificationId = verificationId;
     }
 
     try {
-      _auth ??= FirebaseAuth.instance;
-
       if (kIsWeb) {
-        _webConfirmationResult = await _auth!.signInWithPhoneNumber(
+        _webConfirmationResult = await _auth.signInWithPhoneNumber(
           _phoneNumber!,
           _recaptchaVerifierForWeb,
         );
-        this.codeSent = true;
+        codeSent = true;
         _setTimer();
       } else {
-        await _auth!.verifyPhoneNumber(
+        await _auth.verifyPhoneNumber(
           phoneNumber: _phoneNumber!,
-          verificationCompleted: verificationCompleted,
-          verificationFailed: verificationFailed,
-          codeSent: codeSent,
-          codeAutoRetrievalTimeout: codeAutoRetrievalTimeout,
+          verificationCompleted: verificationCompletedCallback,
+          verificationFailed: verificationFailedCallback,
+          codeSent: codeSentCallback,
+          codeAutoRetrievalTimeout: codeAutoRetrievalTimeoutCallback,
           timeout: _timeoutDuration,
           forceResendingToken: _forceResendingToken,
         );
@@ -204,8 +204,7 @@ class FirebasePhoneAuthService extends ChangeNotifier {
 
     // Not on web.
     try {
-      _auth ??= FirebaseAuth.instance;
-      final authResult = await _auth!.signInWithCredential(authCredential!);
+      final authResult = await _auth.signInWithCredential(authCredential!);
       if (_onLoginSuccess != null) _onLoginSuccess!(authResult, autoVerified);
       return true;
     } on FirebaseAuthException catch (e) {
@@ -227,9 +226,7 @@ class FirebasePhoneAuthService extends ChangeNotifier {
 
   /// {@macro signOut}
   Future<void> signOut() async {
-    // this.clear();
-    _auth ??= FirebaseAuth.instance;
-    await _auth!.signOut();
+    await _auth.signOut();
     notifyListeners();
   }
 
@@ -240,7 +237,6 @@ class FirebasePhoneAuthService extends ChangeNotifier {
       _recaptchaVerifierForWeb = null;
     }
     codeSent = false;
-    _auth = null;
     _webConfirmationResult = null;
     _onLoginSuccess = null;
     _onLoginFailed = null;

lib/src/auth_handler.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:firebase_phone_auth_handler/src/auth_service.dart';
+import 'package:firebase_phone_auth_handler/src/auth_controller.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -13,7 +13,7 @@ class FirebasePhoneAuthHandler extends StatefulWidget {
     required this.builder,
     this.onLoginFailed,
     this.onLoginSuccess,
-    this.timeOutDuration = FirebasePhoneAuthService.kTimeOutDuration,
+    this.timeOutDuration = FirebasePhoneAuthController.kTimeOutDuration,
     this.recaptchaVerifierForWebProvider,
   }) : super(key: key);
 
@@ -50,7 +50,7 @@ class FirebasePhoneAuthHandler extends StatefulWidget {
   ///
   /// Maximum allowed value is 2 minutes.
   ///
-  /// Defaults to [FirebasePhoneAuthService.kTimeOutDuration].
+  /// Defaults to [FirebasePhoneAuthController.kTimeOutDuration].
   /// {@endtemplate}
   final Duration timeOutDuration;
 
@@ -72,13 +72,13 @@ class FirebasePhoneAuthHandler extends StatefulWidget {
   /// The builder provides a controller which can be used to render the UI based
   /// on the current state.
   /// {@endtemplate}
-  final Widget Function(BuildContext, FirebasePhoneAuthService) builder;
+  final Widget Function(BuildContext, FirebasePhoneAuthController) builder;
 
   /// {@template signOut}
   /// Signs out the current user.
   /// {@endtemplate}
   static Future<void> signOut(BuildContext context) =>
-      Provider.of<FirebasePhoneAuthService>(context, listen: false).signOut();
+      FirebasePhoneAuthController.of(context, listen: false).signOut();
 
   @override
   _FirebasePhoneAuthHandlerState createState() =>
@@ -89,8 +89,7 @@ class _FirebasePhoneAuthHandlerState extends State<FirebasePhoneAuthHandler> {
   @override
   void initState() {
     (() async {
-      final _con =
-          Provider.of<FirebasePhoneAuthService>(context, listen: false);
+      final _con = FirebasePhoneAuthController.of(context, listen: false);
 
       RecaptchaVerifier? _captcha;
       if (widget.recaptchaVerifierForWebProvider != null) {
@@ -113,14 +112,14 @@ class _FirebasePhoneAuthHandlerState extends State<FirebasePhoneAuthHandler> {
   @override
   void dispose() {
     try {
-      Provider.of<FirebasePhoneAuthService>(context, listen: false).clear();
+      FirebasePhoneAuthController.of(context, listen: false).clear();
     } catch (_) {}
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<FirebasePhoneAuthService>(
+    return Consumer<FirebasePhoneAuthController>(
       builder: (context, controller, _) => widget.builder(context, controller),
     );
   }

lib/src/auth_provider.dart

@@ -1,4 +1,4 @@
-import 'package:firebase_phone_auth_handler/src/auth_service.dart';
+import 'package:firebase_phone_auth_handler/src/auth_controller.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -15,8 +15,8 @@ class FirebasePhoneAuthProvider extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ChangeNotifierProvider(
-      create: (_) => FirebasePhoneAuthService(),
+    return ChangeNotifierProvider<FirebasePhoneAuthController>(
+      create: (_) => FirebasePhoneAuthController(),
       child: child,
     );
   }

pubspec.lock

@@ -56,21 +56,21 @@ packages:
       name: firebase_auth
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.5"
+    version: "3.3.16"
   firebase_auth_platform_interface:
     dependency: transitive
     description:
       name: firebase_auth_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.10"
+    version: "6.2.4"
   firebase_auth_web:
     dependency: transitive
     description:
       name: firebase_auth_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.6"
+    version: "3.3.13"
   firebase_core:
     dependency: transitive
     description:
@@ -84,14 +84,14 @@ packages:
       name: firebase_core_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.3"
+    version: "4.2.5"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.3"
+    version: "1.6.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -149,6 +149,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -230,7 +237,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -246,5 +253,5 @@ packages:
     source: hosted
     version: "2.1.1"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.16.0 <3.0.0"
   flutter: ">=1.17.0"

pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  firebase_auth: ^3.3.5
+  firebase_auth: ^3.3.16
   provider: ^6.0.2
 
 dev_dependencies: