Merge pull request 'feature/oauth' (#38) from feature/oauth into main

Reviewed-on: #38

covas_mobile/android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+flutter.compileSdkVersion=35

covas_mobile/lib/classes/MyDrawer.dart

@@ -9,7 +9,7 @@ import 'alert.dart';
 
 import '../variable/globals.dart' as globals;
 
-import '../main.dart';
+import '../pages/LoginDemo.dart';
 
 class MyDrawer extends StatelessWidget with ShowAlertDialog {
   Future<void> logout(BuildContext context) async {
@@ -24,43 +24,41 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
           "Content-Type": "application/json",
           HttpHeaders.cookieHeader: "access_token=${accessToken}"
         });
+
         print("Status code logout ${response.statusCode}");
 
         if (response.statusCode == 200) {
-          await prefs.setString("access_token", ""); // Clear the token
+          await prefs.remove("access_token"); // Correctly remove the token
-          Navigator.pushReplacement(
+          Navigator.pushAndRemoveUntil(
-              context, MaterialPageRoute(builder: (_) => LoginDemo()));
+            context,
+            MaterialPageRoute(builder: (_) => LoginDemo()),
+            (route) => false, // Remove all previous routes
+          );
         } else {
+          String errorMessage;
           switch (response.statusCode) {
             case 400:
-              print("Bad Request: Please check your input.");
+              errorMessage = "Bad Request: Please check your input.";
-              showAlertDialog(
-                  context, "Bad Request", "Please check your input.");
               break;
             case 401:
-              print("Unauthorized: Invalid credentials.");
+              errorMessage = "Unauthorized: Invalid credentials.";
-              showAlertDialog(context, "Unauthorized", "Invalid credentials.");
               break;
             case 403:
-              print("Forbidden: You don't have permission.");
+              errorMessage = "Forbidden: You don't have permission.";
-              showAlertDialog(context, "Forbidden",
-                  "You don't have permission to access this.");
               break;
             case 404:
-              print("Not Found: The resource was not found.");
+              errorMessage = "Not Found: The resource was not found.";
-              showAlertDialog(
-                  context, "Not Found", "The resource was not found.");
               break;
             case 500:
-              print("Server Error: Something went wrong on the server.");
+              errorMessage =
-              showAlertDialog(context, "Server Error",
+                  "Server Error: Something went wrong on the server.";
-                  "Something went wrong on the server.");
               break;
             default:
-              print("Unexpected Error: ${response.statusCode}");
+              errorMessage = "Unexpected Error: ${response.statusCode}";
-              showAlertDialog(context, "Error", "Unexpected Error occurred.");
               break;
           }
+          print(errorMessage);
+          showAlertDialog(context, "Error", errorMessage);
         }
       } catch (e) {
         print("Error: $e");
@@ -68,7 +66,7 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
             context, "Error", "An error occurred. Please try again.");
       }
     } else {
-      showAlertDialog(context, "Error", "Token invalide.");
+      showAlertDialog(context, "Error", "Invalid token.");
     }
   }
 

covas_mobile/lib/classes/auth_service.dart

@@ -0,0 +1,96 @@
+import 'dart:convert';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:http/http.dart' as http;
+import '../variable/globals.dart' as globals;
+import 'dart:io';
+
+class AuthService {
+  // Login with username and password
+  Future<bool> login(String username, String password) async {
+    final url = Uri.parse("${globals.api}/token");
+
+    try {
+      final response = await http.post(
+        url,
+        headers: {
+          'accept': 'application/json',
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body: {
+          "username": username,
+          "password": password,
+        },
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        final prefs = await SharedPreferences.getInstance();
+        final cookies = response.headers["set-cookie"]?.split(";") ?? [];
+
+        for (final cookie in cookies) {
+          final cookieParts = cookie.split(",");
+          for (final part in cookieParts) {
+            final keyValue = part.split("=");
+            if (keyValue.length == 2 && keyValue[0] == "access_token") {
+              prefs.setString("access_token", keyValue[1]);
+            }
+          }
+        }
+        return true;
+      } else {
+        return false;
+      }
+    } catch (e) {
+      print("Login error: $e");
+      return false;
+    }
+  }
+
+  // Logout
+  Future<void> logout() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove("access_token");
+  }
+
+  Future<bool> isLoggedIn() async {
+    final prefs = await SharedPreferences.getInstance();
+    final accessToken = prefs.getString("access_token");
+
+    if (accessToken == null || accessToken.isEmpty) {
+      print("No access token found.");
+      return false;
+    }
+
+    print("Checking token validity...");
+    var url = Uri.parse("${globals.api}/token");
+
+    try {
+      final response = await http.get(
+        url,
+        headers: {
+          HttpHeaders.cookieHeader: "access_token=$accessToken",
+          "Content-Type": "application/json",
+        },
+      );
+
+      if (response.statusCode == 200) {
+        print("Token is valid.");
+        return true;
+      } else {
+        print("Token is invalid. Status code: ${response.statusCode}");
+        await prefs.remove("access_token"); // Clear invalid token
+        return false;
+      }
+    } catch (e) {
+      print("Error while checking token: $e");
+      return false;
+    }
+  }
+
+  // Get stored access token
+  Future<String?> getAccessToken() async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getString("access_token");
+  }
+
+  // Login with Google
+}

covas_mobile/lib/main.dart

@@ -1,25 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:http/http.dart' as http;
-import 'dart:convert';
-
-import 'classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-
+import 'pages/LoginDemo.dart';
-import 'dart:io';
-
-//import 'MyHomePage.dart';
-import 'pages/ListItemMenu.dart';
-import 'pages/AddProfile.dart';
-import 'pages/ForgotPassword.dart';
-import 'classes/alert.dart';
-
-import 'variable/globals.dart' as globals;
-import 'package:permission_handler/permission_handler.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await MobileAds.instance.initialize();
+
   runApp(MyApp());
 }
 
@@ -32,249 +18,3 @@ class MyApp extends StatelessWidget {
     );
   }
 }
-
-class LoginDemo extends StatefulWidget {
-  @override
-  _LoginDemoState createState() => _LoginDemoState();
-}
-
-class _LoginDemoState extends State<LoginDemo> with ShowAlertDialog {
-  BannerAd? _bannerAd;
-  TextEditingController inputPseudo = TextEditingController();
-  TextEditingController inputPassword = TextEditingController();
-  Future<void> _login(BuildContext context) async {
-    final url = Uri.parse("${globals.api}/token");
-    final pseudo = inputPseudo.text;
-    final password = inputPassword.text;
-
-    print("Attempting login");
-    if (pseudo.isEmpty || password.isEmpty) {
-      showAlertDialog(context, "Erreur", "Champ vide");
-      return;
-    }
-
-    print("Request URL: $url");
-    try {
-      final response = await http.post(
-        url,
-        headers: {
-          'accept': 'application/json',
-          'Content-Type': 'application/x-www-form-urlencoded',
-        },
-        body: {
-          "username": pseudo,
-          "password": password,
-        },
-      );
-
-      print("Response status code: ${response.statusCode}");
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        final prefs = await SharedPreferences.getInstance();
-        final cookies = response.headers["set-cookie"]?.split(";") ?? [];
-
-        for (final cookie in cookies) {
-          final cookieParts = cookie.split(",");
-          for (final part in cookieParts) {
-            final keyValue = part.split("=");
-            if (keyValue.length == 2 && keyValue[0] == "access_token") {
-              prefs.setString("access_token", keyValue[1]);
-            }
-          }
-        }
-
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (_) => ListItemMenu()),
-        );
-      } else {
-        _handleErrorResponse(context, response.statusCode);
-      }
-    } catch (e) {
-      showAlertDialog(context, "Erreur", e.toString());
-    }
-  }
-
-  void _handleErrorResponse(BuildContext context, int statusCode) {
-    final errorMessages = {
-      400: "Requête mal construite",
-      406: "Mot de passe incorrect",
-      404: "Utilisateur inconnu",
-      403: "Utilisateur désactivé",
-      410: "Token invalide",
-      500: "Problème interne du serveur",
-    };
-
-    final errorMessage =
-        errorMessages[statusCode] ?? "Problème d'authentification inconnu";
-    showAlertDialog(context, "Erreur serveur", errorMessage);
-  }
-
-  void start() async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    var access_token = prefs.getString("access_token") ?? "";
-    print("Get access token");
-
-    if (access_token.isNotEmpty) {
-      print("Appel HTTP");
-      var urlToken = Uri.parse("${globals.api}/token");
-
-      var responseToken = await http.get(urlToken,
-          headers: {HttpHeaders.cookieHeader: 'access_token: ${access_token}'});
-      print(responseToken.statusCode);
-      if (responseToken.statusCode == 200) {
-        print("route to item list");
-        Navigator.push(
-            context, MaterialPageRoute(builder: (_) => ListItemMenu()));
-      } else {
-        prefs.remove("access_token");
-      }
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    AdHelper.createBannerAd(() => setState(() {})).then((ad) {
-      setState(() {
-        _bannerAd = ad;
-      });
-    });
-
-    _checkLocationPermission();
-    start();
-  }
-
-  Future<void> _checkLocationPermission() async {
-    PermissionStatus status = await Permission.location.status;
-
-    if (status.isGranted) {
-      print("Location permission granted");
-    } else if (status.isDenied) {
-      print("Location permission denied");
-      _requestLocationPermission();
-    } else if (status.isPermanentlyDenied) {
-      print("Location permission permanently denied");
-      openAppSettings();
-    }
-  }
-
-  // Request location permission
-  Future<void> _requestLocationPermission() async {
-    PermissionStatus status = await Permission.location.request();
-
-    if (status.isGranted) {
-      print("Location permission granted");
-    } else if (status.isDenied) {
-      print("Location permission denied");
-    } else if (status.isPermanentlyDenied) {
-      print("Location permission permanently denied");
-      openAppSettings();
-    }
-  }
-
-  // Open app settings to allow user to grant permission manually
-  Future<void> _openAppSettings() async {
-    bool opened = await openAppSettings();
-    if (opened) {
-      print("App settings opened");
-    } else {
-      print("Failed to open app settings");
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.white,
-      appBar: AppBar(
-        title: Text("Login Page"),
-        backgroundColor: Colors.blue,
-        foregroundColor: Colors.white,
-      ),
-      body: SingleChildScrollView(
-        child: Column(
-          children: <Widget>[
-            _bannerAd == null
-                ? SizedBox.shrink()
-                : SizedBox(
-                    height: _bannerAd!.size.height.toDouble(),
-                    width: _bannerAd!.size.width.toDouble(),
-                    child: AdWidget(ad: _bannerAd!),
-                  ),
-            Padding(
-              padding: const EdgeInsets.only(top: 60.0),
-              child: Center(
-                child: Container(
-                    width: 200,
-                    height: 150,
-                    decoration: BoxDecoration(
-                        color: Colors.red,
-                        borderRadius: BorderRadius.circular(50.0)),
-                    child: Image.asset('./images/flutter.png')),
-              ),
-            ),
-            Padding(
-              //padding: const EdgeInsets.only(left:15.0,right: 15.0,top:0,bottom: 0),
-              padding: EdgeInsets.symmetric(horizontal: 15),
-              child: TextField(
-                controller: inputPseudo,
-                decoration: InputDecoration(
-                    border: OutlineInputBorder(),
-                    labelText: 'Pseudo',
-                    hintText: 'Enter pseudo existent'),
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(
-                  left: 15.0, right: 15.0, top: 15, bottom: 0),
-              //padding: EdgeInsets.symmetric(horizontal: 15),
-              child: TextField(
-                controller: inputPassword,
-                obscureText: true,
-                decoration: InputDecoration(
-                    border: OutlineInputBorder(),
-                    labelText: 'Password',
-                    hintText: 'Enter secure password'),
-              ),
-            ),
-            TextButton(
-              onPressed: () {
-                Navigator.push(context,
-                    MaterialPageRoute(builder: (_) => PasswordForgot()));
-              },
-              child: Text(
-                'Forgot Password',
-                style: TextStyle(color: Colors.blue, fontSize: 15),
-              ),
-            ),
-            Container(
-              height: 50,
-              width: 250,
-              decoration: BoxDecoration(
-                  color: Colors.blue, borderRadius: BorderRadius.circular(20)),
-              child: TextButton(
-                onPressed: () {
-                  _login(context);
-                },
-                child: Text(
-                  'Login',
-                  style: TextStyle(color: Colors.white, fontSize: 25),
-                ),
-              ),
-            ),
-            SizedBox(
-              height: 130,
-            ),
-            InkWell(
-                child: Text('New User? Create Account'),
-                onTap: () {
-                  Navigator.push(
-                      context, MaterialPageRoute(builder: (_) => AddProfile()));
-                }),
-          ],
-        ),
-      ),
-    );
-  }
-}

covas_mobile/lib/pages/AddProfile.dart

@@ -5,7 +5,7 @@ import 'package:intl/intl.dart';
 import 'dart:convert';
 import 'dart:io';
 
-import '../main.dart';
+import '../pages/LoginDemo.dart';
 
 import '../classes/alert.dart';
 

covas_mobile/lib/pages/EditProfile.dart

@@ -8,7 +8,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import '../classes/MyDrawer.dart';
-import '../main.dart';
+import '../pages/LoginDemo.dart';
 
 import '../classes/alert.dart';
 import '../classes/eventAdded.dart';

covas_mobile/lib/pages/LoginDemo.dart

@@ -0,0 +1,145 @@
+import 'package:flutter/material.dart';
+import 'package:google_mobile_ads/google_mobile_ads.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:permission_handler/permission_handler.dart';
+import '../classes/auth_service.dart';
+import '../pages/ListItemMenu.dart';
+import '../pages/AddProfile.dart';
+import '../pages/ForgotPassword.dart';
+import '../classes/alert.dart';
+import '../classes/ad_helper.dart';
+
+class LoginDemo extends StatefulWidget {
+  @override
+  _LoginDemoState createState() => _LoginDemoState();
+}
+
+class _LoginDemoState extends State<LoginDemo> with ShowAlertDialog {
+  BannerAd? _bannerAd;
+  TextEditingController inputPseudo = TextEditingController();
+  TextEditingController inputPassword = TextEditingController();
+  final AuthService _authService = AuthService();
+
+  Future<void> _login(BuildContext context) async {
+    final pseudo = inputPseudo.text;
+    final password = inputPassword.text;
+
+    if (pseudo.isEmpty || password.isEmpty) {
+      showAlertDialog(context, "Erreur", "Champ vide");
+      return;
+    }
+
+    bool success = await _authService.login(pseudo, password);
+
+    if (success) {
+      Navigator.push(
+          context, MaterialPageRoute(builder: (_) => ListItemMenu()));
+    } else {
+      showAlertDialog(context, "Erreur", "Échec de l'authentification");
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    AdHelper.createBannerAd(() => setState(() {})).then((ad) {
+      setState(() {
+        _bannerAd = ad;
+      });
+    });
+
+    _checkLocationPermission();
+    _checkLoginStatus();
+  }
+
+  Future<void> _checkLoginStatus() async {
+    bool loggedIn = await _authService.isLoggedIn();
+    print("logged status : ${loggedIn}");
+    if (loggedIn) {
+      Navigator.push(
+          context, MaterialPageRoute(builder: (_) => ListItemMenu()));
+    }
+  }
+
+  Future<void> _checkLocationPermission() async {
+    PermissionStatus status = await Permission.location.status;
+    if (!status.isGranted) {
+      await Permission.location.request();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        title: Text("Login Page"),
+        backgroundColor: Colors.blue,
+        foregroundColor: Colors.white,
+      ),
+      body: SingleChildScrollView(
+        child: Column(
+          children: <Widget>[
+            _bannerAd == null
+                ? SizedBox.shrink()
+                : SizedBox(
+                    height: _bannerAd!.size.height.toDouble(),
+                    width: _bannerAd!.size.width.toDouble(),
+                    child: AdWidget(ad: _bannerAd!),
+                  ),
+            Padding(
+              padding: EdgeInsets.symmetric(horizontal: 15),
+              child: TextField(
+                controller: inputPseudo,
+                decoration: InputDecoration(
+                  border: OutlineInputBorder(),
+                  labelText: 'Pseudo',
+                  hintText: 'Enter pseudo existant',
+                ),
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.symmetric(horizontal: 15, vertical: 15),
+              child: TextField(
+                controller: inputPassword,
+                obscureText: true,
+                decoration: InputDecoration(
+                  border: OutlineInputBorder(),
+                  labelText: 'Password',
+                  hintText: 'Enter secure password',
+                ),
+              ),
+            ),
+            TextButton(
+              onPressed: () {
+                Navigator.push(context,
+                    MaterialPageRoute(builder: (_) => PasswordForgot()));
+              },
+              child: Text('Forgot Password',
+                  style: TextStyle(color: Colors.blue, fontSize: 15)),
+            ),
+            Container(
+              height: 50,
+              width: 250,
+              decoration: BoxDecoration(
+                  color: Colors.blue, borderRadius: BorderRadius.circular(20)),
+              child: TextButton(
+                onPressed: () => _login(context),
+                child: Text('Login',
+                    style: TextStyle(color: Colors.white, fontSize: 25)),
+              ),
+            ),
+            SizedBox(height: 130),
+            InkWell(
+              child: Text('New User? Create Account'),
+              onTap: () {
+                Navigator.push(
+                    context, MaterialPageRoute(builder: (_) => AddProfile()));
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

covas_mobile/pubspec.lock

@@ -913,10 +913,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "7310de7efa4e6df8b3d2ff14aef3f290bc00b43363f2d0028845e6de46507fc9"
+      sha256: d183aa3d0fbc1f4d0715ce06c5a44cad636598c3340ae8d359fbc61b4016fb60
       url: "https://pub.dev"
     source: hosted
-    version: "3.18.1"
+    version: "3.18.3"
   xdg_directories:
     dependency: transitive
     description: