Modified Authentication Part as per issue #101

AUTHORS.md

@@ -15,6 +15,7 @@
 - Ogundoyin Toluwani - <https://github.com/Tolu007>
 - Nenza Nurfirmansyah - <https://github.com/nenzan>
 - Florian Schmitz - <https://github.com/floodoo>
+- Aman Negi - <https://github.com/AmanNegi>
 - Sandi Milohanic - <https://github.com/sandimilohanic>
 
 ## Translators

lib/helpers/ui.dart

@@ -56,7 +56,15 @@ void showHttpExceptionErrorDialog(WgerHttpException exception, BuildContext cont
   final List<Widget> errorList = [];
   for (final key in exception.errors!.keys) {
     // Error headers
-    errorList.add(Text(key, style: const TextStyle(fontWeight: FontWeight.bold)));
+    // Ensure that the error heading first letter is capitalized.
+    final String errorHeaderMsg = key[0].toUpperCase() + key.substring(1, key.length);
+
+    errorList.add(
+      Text(
+        errorHeaderMsg,
+        style: const TextStyle(fontWeight: FontWeight.bold),
+      ),
+    );
 
     // Error messages
     if (exception.errors![key] is String) {
@@ -74,6 +82,7 @@ void showHttpExceptionErrorDialog(WgerHttpException exception, BuildContext cont
     builder: (ctx) => AlertDialog(
       title: Text(AppLocalizations.of(ctx).anErrorOccurred),
       content: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: [...errorList],
       ),
@@ -94,7 +103,7 @@ void showHttpExceptionErrorDialog(WgerHttpException exception, BuildContext cont
 }
 
 dynamic showDeleteDialog(BuildContext context, String confirmDeleteName, Log log, Exercise exercise,
-    Map<Exercise, List<Log>> _exerciseData) async {
+    Map<Exercise, List<Log>> exerciseData) async {
   final res = await showDialog(
       context: context,
       builder: (BuildContext contextDialog) {
@@ -113,7 +122,7 @@ dynamic showDeleteDialog(BuildContext context, String confirmDeleteName, Log log
                 style: TextStyle(color: Theme.of(context).errorColor),
               ),
               onPressed: () {
-                _exerciseData[exercise]!.removeWhere((el) => el.id == log.id);
+                exerciseData[exercise]!.removeWhere((el) => el.id == log.id);
                 Provider.of<WorkoutPlansProvider>(context, listen: false).deleteLog(
                   log,
                 );

lib/providers/auth.dart

@@ -98,7 +98,7 @@ class AuthProvider with ChangeNotifier {
   }
 
   /// Registers a new user
-  Future<void> register(
+  Future<Map<String, String>> register(
       {required String username,
       required String password,
       required String email,
@@ -124,14 +124,21 @@ class AuthProvider with ChangeNotifier {
         throw WgerHttpException(responseData);
       }
 
+      // If update is required don't log in user
+      final bool updateRequired = await applicationUpdateRequired();
+      if (updateRequired) {
+        return {'action': 'update'};
+      }
+
       login(username, password, serverUrl);
+      return {'action': 'proceed'};
     } catch (error) {
       rethrow;
     }
   }
 
   /// Authenticates a user
-  Future<void> login(String username, String password, String serverUrl) async {
+  Future<Map<String, String>> login(String username, String password, String serverUrl) async {
     await logout(shouldNotify: false);
 
     try {
@@ -149,6 +156,12 @@ class AuthProvider with ChangeNotifier {
         throw WgerHttpException(responseData);
       }
 
+      // If update is required don't log in user
+      final bool updateRequired = await applicationUpdateRequired();
+      if (updateRequired) {
+        return {'action': 'update'};
+      }
+
       // Log user in
       this.serverUrl = serverUrl;
       token = responseData['token'];
@@ -169,6 +182,7 @@ class AuthProvider with ChangeNotifier {
       await setApplicationVersion();
       prefs.setString('userData', userData);
       prefs.setString('lastServer', serverData);
+      return {'action': 'proceed'};
     } catch (error) {
       rethrow;
     }

lib/screens/auth_screen.dart

@@ -24,6 +24,7 @@ import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/misc.dart';
 import 'package:wger/helpers/ui.dart';
+import 'package:wger/screens/update_app_screen.dart';
 
 import '../providers/auth.dart';
 
@@ -139,19 +140,30 @@ class _AuthCardState extends State<AuthCard> {
 
     try {
       // Login existing user
+      late Map<String, String> res;
       if (_authMode == AuthMode.Login) {
-        await Provider.of<AuthProvider>(context, listen: false)
+        res = await Provider.of<AuthProvider>(context, listen: false)
             .login(_authData['username']!, _authData['password']!, _authData['serverUrl']!);
 
         // Register new user
       } else {
-        await Provider.of<AuthProvider>(context, listen: false).register(
+        res = await Provider.of<AuthProvider>(context, listen: false).register(
             username: _authData['username']!,
             password: _authData['password']!,
             email: _authData['email']!,
             serverUrl: _authData['serverUrl']!);
       }
 
+      // Check if update is required else continue normally
+      if (res.containsKey('action')) {
+        if (res['action'] == 'update' && mounted) {
+          Navigator.of(context).push(
+            MaterialPageRoute(builder: (context) => UpdateAppScreen()),
+          );
+          return;
+        }
+      }
+
       setState(() {
         _isLoading = false;
       });
@@ -161,10 +173,12 @@ class _AuthCardState extends State<AuthCard> {
         _isLoading = false;
       });
     } catch (error) {
-      showErrorDialog(error, context);
-      setState(() {
-        _isLoading = false;
-      });
+      if (mounted) {
+        showErrorDialog(error, context);
+        setState(() {
+          _isLoading = false;
+        });
+      }
     }
   }
 
@@ -221,7 +235,7 @@ class _AuthCardState extends State<AuthCard> {
                       }
                       return null;
                     },
-                    inputFormatters: [FilteringTextInputFormatter.deny(new RegExp(r"\s\b|\b\s"))],
+                    inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s'))],
                     onSaved: (value) {
                       _authData['username'] = value!;
                     },
@@ -349,23 +363,23 @@ class _AuthCardState extends State<AuthCard> {
                     ),
                   TextButton(
                     key: const Key('toggleActionButton'),
+                    onPressed: _switchAuthMode,
                     child: Text(
                       _authMode == AuthMode.Login
                           ? AppLocalizations.of(context).registerInstead.toUpperCase()
                           : AppLocalizations.of(context).loginInstead.toUpperCase(),
                     ),
-                    onPressed: _switchAuthMode,
                   ),
                   TextButton(
-                    child: Text(_hideCustomServer
-                        ? AppLocalizations.of(context).useCustomServer
-                        : AppLocalizations.of(context).useDefaultServer),
                     key: const Key('toggleCustomServerButton'),
                     onPressed: () {
                       setState(() {
                         _hideCustomServer = !_hideCustomServer;
                       });
                     },
+                    child: Text(_hideCustomServer
+                        ? AppLocalizations.of(context).useCustomServer
+                        : AppLocalizations.of(context).useDefaultServer),
                   ),
                 ],
               ),