Remember credentials

Author: ReightI

l10n/app_en.arb

@@ -77,6 +77,7 @@
     "login_communityParameters": "Community Parameters",
     "login_serverParameters": "Piwigo Parameters",
     "login_connectionChanged": "Connection Changed!",
+    "login_rememberCredentials": "Remember credentials",
     "loginHTTP_title": "HTTP Credentials",
     "loginHTTP_message": "Basic access authentification is required by the Piwigo server:",
     "loginHTTP_enable": "Enable HTTP Basic",

l10n/app_fr.arb

@@ -48,6 +48,7 @@
     "login_communityParameters": "Paramètres Community",
     "login_serverParameters": "Paramètres Piwigo",
     "login_connectionChanged": "Connexion Modifiée !",
+    "login_rememberCredentials": "Mémoriser les identifiants",
     "loginHTTP_title": "Identification HTTP",
     "loginHTTP_message": "L'authentification HTTP est requise par le serveur Piwigo:",
     "loginHTTP_enable": "Activer HTTP Basic",

lib/api/api_client.dart

@@ -24,7 +24,7 @@ class ApiClient {
   }
 
   static bool piwigoSSLBypass(X509Certificate cert, String host, int port) {
-    if (appPreferences.getBool(Preferences.enableSSLKey) ?? false) {
+    if (Preferences.getEnableSSL) {
       return true;
     }
     return false;

lib/api/api_interceptor.dart

@@ -8,18 +8,18 @@ import 'package:piwigo_ng/app.dart';
 import 'package:piwigo_ng/components/snackbars.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 class ApiInterceptor extends Interceptor {
   @override
   void onRequest(
-      RequestOptions options, RequestInterceptorHandler handler) async {
+    RequestOptions options,
+    RequestInterceptorHandler handler,
+  ) async {
     print("[${options.method}] ${options.queryParameters['method']}");
     FlutterSecureStorage secureStorage = const FlutterSecureStorage();
-    SharedPreferences prefs = await SharedPreferences.getInstance();
     options.baseUrl =
         (await secureStorage.read(key: Preferences.serverUrlKey))!;
-    if (prefs.getBool(Preferences.enableBasicAuthKey) ?? false) {
+    if (Preferences.getEnableBasicAuth) {
       String? username =
           appPreferences.getString(Preferences.basicUsernameKey) ??
               await secureStorage.read(key: Preferences.usernameKey);
@@ -34,14 +34,20 @@ class ApiInterceptor extends Interceptor {
   }
 
   @override
-  void onResponse(Response response, ResponseInterceptorHandler handler) async {
+  void onResponse(
+    Response response,
+    ResponseInterceptorHandler handler,
+  ) async {
     debugPrint(
         "[${response.statusCode}] ${response.requestOptions.queryParameters['method']}");
     return super.onResponse(response, handler);
   }
 
   @override
-  void onError(DioError err, ErrorInterceptorHandler handler) async {
+  void onError(
+    DioError err,
+    ErrorInterceptorHandler handler,
+  ) async {
     debugPrint(
         "[${err.response?.statusCode}] ${err.requestOptions.queryParameters['method']}");
     debugPrint('${err.error}\n${err.stackTrace}');

lib/services/preferences_service.dart

@@ -23,8 +23,26 @@ class Preferences {
   static const String accountUsernameKey = 'ACCOUNT_USERNAME';
   static const String userStatusKey = 'USER_STATUS';
 
+  static const String rememberCredentialsKey = 'REMEMBER_CREDENTIALS';
+
+  static bool get getRememberCredentials {
+    return appPreferences.getBool(rememberCredentialsKey) ??
+        Settings.defaultRememberCredentials;
+  }
+
   static const String enableSSLKey = 'ENABLE_SSL';
+
+  static bool get getEnableSSL {
+    return appPreferences.getBool(enableSSLKey) ?? Settings.defaultEnableSSL;
+  }
+
   static const String enableBasicAuthKey = 'ENABLE_BASIC_AUTH';
+
+  static bool get getEnableBasicAuth {
+    return appPreferences.getBool(enableBasicAuthKey) ??
+        Settings.defaultEnableHTTPBasic;
+  }
+
   static const String basicUsernameKey = 'BASIC_USERNAME';
   static const String basicPasswordKey = 'BASIC_PASSWORD';
 

lib/utils/settings.dart

@@ -104,6 +104,9 @@ class Settings {
   static const bool defaultDeleteAfterUpload = false;
   static const bool defaultWifiUpload = true;
   static const bool defaultShowThumbnailTitle = false;
+  static const bool defaultRememberCredentials = true;
+  static const bool defaultEnableSSL = false;
+  static const bool defaultEnableHTTPBasic = false;
   static const int defaultImageRowCount = 4;
   static const int minImageRowCount = 1; // Settings slider min range
   static const int maxImageRowCount = 6; // Settings slider max range

lib/views/authentication/login_form_view.dart

@@ -55,11 +55,13 @@ class _LoginFormViewState extends State<LoginFormView> {
     List<String> urlFields = url.split('://');
     _isSecured = urlFields.first == 'https';
     _url = urlFields.last.substring(0, urlFields.last.lastIndexOf('/'));
-    _username = await storage.read(key: 'SERVER_USERNAME') ?? '';
-    _password = await storage.read(key: 'SERVER_PASSWORD') ?? '';
     _urlController.text = _url;
-    _usernameController.text = _username;
-    _passwordController.text = _password;
+    if (Preferences.getRememberCredentials) {
+      _username = await storage.read(key: 'SERVER_USERNAME') ?? '';
+      _password = await storage.read(key: 'SERVER_PASSWORD') ?? '';
+      _usernameController.text = _username;
+      _passwordController.text = _password;
+    }
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       if (mounted) {
         bool isError = !_urlValidator(url);

lib/views/authentication/login_settings_page.dart

@@ -17,15 +17,17 @@ class _LoginSettingsPageState extends State<LoginSettingsPage> {
   late String _basicAuthPassword;
   late bool _sslEnabled;
   late bool _basiAuth;
+  late bool _rememberCredentials;
 
   @override
   void initState() {
     _basicAuthUsername =
         appPreferences.getString(Preferences.basicUsernameKey) ?? '';
     _basicAuthPassword =
         appPreferences.getString(Preferences.basicPasswordKey) ?? '';
-    _sslEnabled = appPreferences.getBool(Preferences.enableSSLKey) ?? false;
-    _basiAuth = appPreferences.getBool(Preferences.enableBasicAuthKey) ?? false;
+    _sslEnabled = Preferences.getEnableSSL;
+    _basiAuth = Preferences.getEnableBasicAuth;
+    _rememberCredentials = Preferences.getRememberCredentials;
     super.initState();
   }
 
@@ -45,6 +47,21 @@ class _LoginSettingsPageState extends State<LoginSettingsPage> {
           vertical: 8.0,
         ),
         children: [
+          SettingsSection(
+            children: [
+              SettingsSectionItemSwitch(
+                title: appStrings.login_rememberCredentials,
+                value: _rememberCredentials,
+                onChanged: (value) => setState(() {
+                  _rememberCredentials = value;
+                  appPreferences.setBool(
+                    Preferences.rememberCredentialsKey,
+                    value,
+                  );
+                }),
+              ),
+            ],
+          ),
           SettingsSection(
             title: appStrings.loginCert_title,
             children: [