Make it refresh token if it says it's expired. Add highlight to curre…

…nt day in timetable view.
itsnotrin · Dec 11, 2024 · b6cb628 · b6cb628
1 parent 8a2274d
commit b6cb628
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/BetterClasscharts/MainTabView.swift b/BetterClasscharts/MainTabView.swift
@@ -236,6 +236,10 @@ struct TimetableView: View {
                                     Group {
                                         if isCurrentDay(day) {
                                             Theme.surfaceColor(for: appTheme, colorScheme: colorScheme)
+                                                .overlay(
+                                                    RoundedRectangle(cornerRadius: 12)
+                                                        .stroke(Color.purple, lineWidth: 3)
+                                                )
                                         } else {
                                             selectedDay == day ? Theme.accentColor(for: appTheme) : Theme.surfaceColor(for: appTheme, colorScheme: colorScheme)
                                         }

diff --git a/BetterClasscharts/StudentClient.swift b/BetterClasscharts/StudentClient.swift
@@ -263,22 +263,25 @@ class StudentClient {
         request: @escaping (@escaping (Result<T, Error>) -> Void) -> Void
     ) {
         request { result in
-            if case .failure(let error) = result,
-               let networkError = error as? NetworkError,
-               networkError == .sessionExpired {
-                // Session expired, refresh and retry once
-                checkAndRefreshSession { refreshResult in
-                    switch refreshResult {
-                    case .success:
-                        // Token refreshed, retry the original request
-                        request(completion)
-                    case .failure(let refreshError):
-                        // Token refresh failed, return the error
-                        completion(.failure(refreshError))
+            if case .failure(let error) = result {
+                if let networkError = error as? NetworkError,
+                   (networkError == .sessionExpired || networkError == .missingUserData) {
+                    // Session expired or missing user data, refresh and retry once
+                    checkAndRefreshSession { refreshResult in
+                        switch refreshResult {
+                        case .success:
+                            // Token refreshed, retry the original request
+                            request(completion)
+                        case .failure(let refreshError):
+                            // Token refresh failed, return the error
+                            completion(.failure(refreshError))
+                        }
                     }
+                } else {
+                    // Not a session expiration or second attempt, return the result
+                    completion(result)
                 }
             } else {
-                // Not a session expiration or second attempt, return the result
                 completion(result)
             }
         }