From 521f609707db70bec4e000c45b17288c54216bd6 Mon Sep 17 00:00:00 2001 From: Kima Date: Thu, 14 Nov 2024 17:12:38 +0100 Subject: [PATCH] forgot to push lol --- refilc/lib/api/providers/sync.dart | 25 +++++++++++++++++++++++-- refilc/lib/app.dart | 2 +- refilc/lib/models/user.dart | 5 +++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/refilc/lib/api/providers/sync.dart b/refilc/lib/api/providers/sync.dart index 81fca47..7f832d7 100644 --- a/refilc/lib/api/providers/sync.dart +++ b/refilc/lib/api/providers/sync.dart @@ -29,7 +29,7 @@ import 'liveactivity/platform_channel.dart'; // Mutex bool lock = false; -Future syncAll(BuildContext context) { +Future syncAll(BuildContext context) async { if (lock) return Future.value(); // Lock lock = true; @@ -62,7 +62,28 @@ Future syncAll(BuildContext context) { // print(user.user?.accessTokenExpire); // print('${user.user?.accessToken ?? "no token"} - ACCESS TOKEN'); - if (user.user == null) return; + // user.user!.accessToken = ""; + if (user.user == null) { + Navigator.of(context).pushNamedAndRemoveUntil("login", (_) => false); + + lock = false; + return Future.value(); + } + + if (user.user!.accessToken.replaceAll(" ", "") == "") { + String uid = user.user!.id; + + user.removeUser(uid); + await Provider.of(context, listen: false) + .store + .removeUser(uid); + + Navigator.of(context).pushNamedAndRemoveUntil("login", (_) => false); + + lock = false; + return; + } + if (user.user!.accessTokenExpire.isBefore(DateTime.now())) { String authRes = await Provider.of(context, listen: false) .refreshLogin() ?? diff --git a/refilc/lib/app.dart b/refilc/lib/app.dart index 7a94f25..abf6158 100644 --- a/refilc/lib/app.dart +++ b/refilc/lib/app.dart @@ -237,7 +237,7 @@ class App extends StatelessWidget { }, onGenerateRoute: (settings) => rootNavigator(settings), initialRoute: - user.getUsers().isNotEmpty ? "navigation" : "login", + (user.getUsers().isNotEmpty) ? "navigation" : "login", ); }, ); diff --git a/refilc/lib/models/user.dart b/refilc/lib/models/user.dart index eab3624..e4fca5d 100644 --- a/refilc/lib/models/user.dart +++ b/refilc/lib/models/user.dart @@ -70,8 +70,9 @@ class User { picture: map["picture"] ?? "", gradeStreak: map["grade_streak"] ?? 0, accessToken: map["access_token"] ?? "", - accessTokenExpire: DateTime.parse( - map["access_token_expire"] ?? DateTime.now().toIso8601String()), + accessTokenExpire: DateTime.parse(map["access_token_expire"] != "" + ? map["access_token_expire"] + : DateTime.now().toIso8601String()), refreshToken: map["refresh_token"] ?? "", ); }