From 1460f2aa4e24e15d275422c5b3be8479aaae29e1 Mon Sep 17 00:00:00 2001
From: BalazsManus <contact@balazsmanus.hu>
Date: Sat, 15 Feb 2025 13:37:05 +0100
Subject: [PATCH] merge #144

---
 refilc/lib/api/providers/sync.dart      | 28 ++++++++++++-------------
 refilc_kreta_api/lib/client/client.dart | 13 +++++++++---
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/refilc/lib/api/providers/sync.dart b/refilc/lib/api/providers/sync.dart
index 7f832d7..7820b59 100644
--- a/refilc/lib/api/providers/sync.dart
+++ b/refilc/lib/api/providers/sync.dart
@@ -84,20 +84,20 @@ Future<void> syncAll(BuildContext context) async {
         return;
       }
 
-      if (user.user!.accessTokenExpire.isBefore(DateTime.now())) {
-        String authRes = await Provider.of<KretaClient>(context, listen: false)
-                .refreshLogin() ??
-            '';
-        if (authRes != 'success') {
-          if (kDebugMode) print('ERROR: failed to refresh login');
-          lock = false;
-          return Future.value();
-        } else {
-          if (kDebugMode) print('INFO: access token refreshed');
-        }
-      } else {
-        if (kDebugMode) print('INFO: access token is not expired');
-      }
+      //if (user.user!.accessTokenExpire.isBefore(DateTime.now())) {
+      //  String authRes = await Provider.of<KretaClient>(context, listen: false)
+      //          .refreshLogin() ??
+      //      '';
+      //  if (authRes != 'success') {
+      //    if (kDebugMode) print('ERROR: failed to refresh login');
+       //   lock = false;
+       //   return Future.value();
+       // } else {
+       //   if (kDebugMode) print('INFO: access token refreshed');
+       // }
+      //} else {
+      //  if (kDebugMode) print('INFO: access token is not expired');
+      //}
     }()),
 
     syncStatus(Provider.of<GradeProvider>(context, listen: false).fetch()),
diff --git a/refilc_kreta_api/lib/client/client.dart b/refilc_kreta_api/lib/client/client.dart
index e383ac1..0c6ebc4 100644
--- a/refilc_kreta_api/lib/client/client.dart
+++ b/refilc_kreta_api/lib/client/client.dart
@@ -91,7 +91,7 @@ class KretaClient {
           headerMap.remove("authorization");
           print("DEBUG: 401 error, refreshing login");
           print("DEBUG: 401 error, URL: $url");
-          // await refreshLogin();
+          await refreshLogin();
         } else {
           break;
         }
@@ -160,7 +160,7 @@ class KretaClient {
 
         res = await client.post(Uri.parse(url), headers: headerMap, body: body);
         if (res.statusCode == 401) {
-          // await refreshLogin();
+          await refreshLogin();
           headerMap.remove("authorization");
         } else {
           break;
@@ -234,7 +234,7 @@ class KretaClient {
 
         if (res.statusCode == 401) {
           headerMap.remove("authorization");
-          // await refreshLogin();
+          await refreshLogin();
         } else {
           break;
         }
@@ -277,6 +277,13 @@ class KretaClient {
     print("REFRESH TOKEN BELOW");
     print(refreshToken);
 
+    print(loginUser.accessTokenExpire);
+    print(DateTime.now().toIso8601String());
+
+    if (!DateTime.now().isAfter(loginUser.accessTokenExpire)) {
+      return 'success';
+    }
+
     if (refreshToken != null) {
       // print("REFRESHING LOGIN");
       Map? res = await postAPI(KretaAPI.login,