From d8cf5ed01e2cc0de3de018c2272a075622bd7f62 Mon Sep 17 00:00:00 2001 From: emkartal1 Date: Sat, 29 Jul 2023 22:40:41 +0200 Subject: [PATCH] Change exception error login --- .../justMUSIC/lib/screens/login_screen.dart | 4 +-- .../justMUSIC/lib/service/AuthService.dart | 11 +++++- Sources/justMUSIC/pubspec.lock | 34 +++++++++---------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Sources/justMUSIC/lib/screens/login_screen.dart b/Sources/justMUSIC/lib/screens/login_screen.dart index 1924761..578ec8b 100644 --- a/Sources/justMUSIC/lib/screens/login_screen.dart +++ b/Sources/justMUSIC/lib/screens/login_screen.dart @@ -30,11 +30,11 @@ class _LoginScreenState extends State { await MyApp.userViewModel .login(_userMailTextField.text, _passwordTextField.text); Navigator.pushNamed(context, '/explanation'); - } on FirebaseAuthException catch (e) { + } catch (e) { ScaffoldMessenger.of(context).showSnackBar( SnackBar( content: Text( - e.message ?? "", + e.toString() ?? "", style: GoogleFonts.plusJakartaSans( color: Colors.white, fontWeight: FontWeight.w400, diff --git a/Sources/justMUSIC/lib/service/AuthService.dart b/Sources/justMUSIC/lib/service/AuthService.dart index 707a9c5..80879cb 100644 --- a/Sources/justMUSIC/lib/service/AuthService.dart +++ b/Sources/justMUSIC/lib/service/AuthService.dart @@ -39,7 +39,16 @@ class AuthService { try { await FirebaseAuth.instance .signInWithEmailAndPassword(email: email, password: password); - } on FirebaseAuthException { + } on FirebaseAuthException catch (e) { + if(e.code == 'user-not-found') { + throw('Mail incorrect'); + } else if(e.code == 'wrong-password') { + throw('Mot de passe incorrect'); + } else if(e.code == 'invalid-email') { + throw('Format de mail incorrect'); + } else if(e.code == 'too-many-requests') { + throw('L\'accès à ce compte a été temporairement désactivé en raison de nombreuses tentatives de connexion infructueuses. Réessayer plus tard.'); + } rethrow; } } diff --git a/Sources/justMUSIC/pubspec.lock b/Sources/justMUSIC/pubspec.lock index 979c119..894b62f 100644 --- a/Sources/justMUSIC/pubspec.lock +++ b/Sources/justMUSIC/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.10.0" audioplayers: dependency: "direct main" description: @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.1" circular_reveal_animation: dependency: "direct main" description: @@ -141,10 +141,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.0" crypto: dependency: transitive description: @@ -348,10 +348,10 @@ packages: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.6.5" lints: dependency: transitive description: @@ -364,10 +364,10 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.13" material_color_utilities: dependency: transitive description: @@ -380,10 +380,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.8.0" modal_bottom_sheet: dependency: "direct main" description: @@ -396,10 +396,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.8.2" path_provider: dependency: transitive description: @@ -529,10 +529,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.4.16" text_scroll: dependency: "direct main" description: @@ -598,5 +598,5 @@ packages: source: hosted version: "1.1.0" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=2.18.2 <3.0.0" flutter: ">=3.3.0"