Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

Save user+client in Prefs and only background-fetch them on startup

Browse Source
This commit is contained in:
Mike Schwörer
2024-06-17 22:53:03 +02:00
parent c8bc7665f7
commit 5b8a1e86e0
4 changed files with 121 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
flutter/lib/state/app_auth.dart
View File

@@ -1,8 +1,11 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:simplecloudnotifier/api/api_client.dart';
import 'package:simplecloudnotifier/api/api_exception.dart';
import 'package:simplecloudnotifier/models/client.dart';
import 'package:simplecloudnotifier/models/user.dart';
import 'package:simplecloudnotifier/state/application_log.dart';
import 'package:simplecloudnotifier/state/globals.dart';
import 'package:simplecloudnotifier/state/token_source.dart';
@@ -12,9 +15,9 @@ class AppAuth extends ChangeNotifier implements TokenSource {
String? _tokenAdmin;
String? _tokenSend;
User? _user;
Client? _client;
DateTime? _clientQueryTime;
(User, DateTime)? _user;
(Client, DateTime)? _client;
String? get userID => _userID;
String? get tokenAdmin => _tokenAdmin;
@@ -35,17 +38,21 @@ class AppAuth extends ChangeNotifier implements TokenSource {
}
void set(User user, Client client, String tokenAdmin, String tokenSend) {
_client = client;
_user = user;
_client = (client, DateTime.now());
_user = (user, DateTime.now());
_userID = user.userID;
_clientID = client.clientID;
_tokenAdmin = tokenAdmin;
_tokenSend = tokenSend;
notifyListeners();
}
void setClientAndClientID(Client client) {
_client = client;
_client = (client, DateTime.now());
_clientID = client.clientID;
notifyListeners();
}
@@ -83,6 +90,33 @@ class AppAuth extends ChangeNotifier implements TokenSource {
_client = null;
_user = null;
final userjson = Globals().sharedPrefs.getString('auth.user.obj');
final userqdate = Globals().sharedPrefs.getString('auth.user.qdate');
final clientjson = Globals().sharedPrefs.getString('auth.client.obj');
final clientqdate = Globals().sharedPrefs.getString('auth.client.qdate');
if (userjson != null && userqdate != null) {
try {
final ts = DateTime.parse(userqdate);
final obj = User.fromJson(jsonDecode(userjson) as Map<String, dynamic>);
_user = (obj, ts);
} catch (exc, trace) {
ApplicationLog.error('failed to parse user object from shared-prefs (auth.user.obj): ' + exc.toString(), additional: 'Data:\n${userjson}\nQDate:\n${userqdate}', trace: trace);
_user = null;
}
}
if (clientjson != null && clientqdate != null) {
try {
final ts = DateTime.parse(clientqdate);
final obj = Client.fromJson(jsonDecode(clientjson) as Map<String, dynamic>);
_client = (obj, ts);
} catch (exc, trace) {
ApplicationLog.error('failed to parse user object from shared-prefs (auth.client.obj): ' + exc.toString(), additional: 'Data:\n${clientjson}\nQDate:\n${clientqdate}', trace: trace);
_client = null;
}
}
notifyListeners();
}
@@ -94,6 +128,10 @@ class AppAuth extends ChangeNotifier implements TokenSource {
await Globals().sharedPrefs.remove('auth.tokensend');
await Globals().sharedPrefs.setString('auth.cdate', "");
await Globals().sharedPrefs.setString('auth.mdate', DateTime.now().toIso8601String());
await Globals().sharedPrefs.remove('auth.user.obj');
await Globals().sharedPrefs.remove('auth.user.qdate');
await Globals().sharedPrefs.remove('auth.client.obj');
await Globals().sharedPrefs.remove('auth.client.qdate');
} else {
await Globals().sharedPrefs.setString('auth.userid', _userID!);
await Globals().sharedPrefs.setString('auth.clientid', _clientID!);
@@ -101,14 +139,34 @@ class AppAuth extends ChangeNotifier implements TokenSource {
await Globals().sharedPrefs.setString('auth.tokensend', _tokenSend!);
if (Globals().sharedPrefs.getString('auth.cdate') == null) await Globals().sharedPrefs.setString('auth.cdate', DateTime.now().toIso8601String());
await Globals().sharedPrefs.setString('auth.mdate', DateTime.now().toIso8601String());
if (_user != null) {
await Globals().sharedPrefs.setString('auth.user.obj', jsonEncode(_user!.$1.toJson()));
await Globals().sharedPrefs.setString('auth.user.qdate', _user!.$2.toIso8601String());
} else {
await Globals().sharedPrefs.remove('auth.user.obj');
await Globals().sharedPrefs.remove('auth.user.qdate');
}
if (_client != null) {
await Globals().sharedPrefs.setString('auth.client.obj', jsonEncode(_client!.$1.toJson()));
await Globals().sharedPrefs.setString('auth.client.qdate', _client!.$2.toIso8601String());
} else {
await Globals().sharedPrefs.remove('auth.client.obj');
await Globals().sharedPrefs.remove('auth.client.qdate');
}
}
Globals().sharedPrefs.setString('auth.mdate', DateTime.now().toIso8601String());
}
Future<User> loadUser({bool force = false}) async {
if (!force && _user != null && _user!.userID == _userID) {
return _user!;
Future<User> loadUser({bool force = false, Duration? forceIfOlder = null}) async {
if (forceIfOlder != null && _user != null && _user!.$2.difference(DateTime.now()) > forceIfOlder) {
force = true;
}
if (!force && _user != null && _user!.$1.userID == _userID) {
return _user!.$1;
}
if (_userID == null || _tokenAdmin == null) {
@@ -117,7 +175,7 @@ class AppAuth extends ChangeNotifier implements TokenSource {
final user = await APIClient.getUser(this, _userID!);
_user = user;
_user = (user, DateTime.now());
await save();
@@ -125,12 +183,12 @@ class AppAuth extends ChangeNotifier implements TokenSource {
}
Future<Client?> loadClient({bool force = false, Duration? forceIfOlder = null}) async {
if (forceIfOlder != null && _clientQueryTime != null && _clientQueryTime!.difference(DateTime.now()) > forceIfOlder) {
if (forceIfOlder != null && _client != null && _client!.$2.difference(DateTime.now()) > forceIfOlder) {
force = true;
}
if (!force && _client != null && _client!.clientID == _clientID) {
return _client!;
if (!force && _client != null && _client!.$1.clientID == _clientID) {
return _client!.$1;
}
if (_clientID == null || _tokenAdmin == null) {
@@ -140,7 +198,7 @@ class AppAuth extends ChangeNotifier implements TokenSource {
try {
final client = await APIClient.getClient(this, _clientID!);
_client = client;
_client = (client, DateTime.now());
await save();