0.19 account reauth (#793)

mlemgroup · Dec 4, 2023 · e5dbbda · e5dbbda
1 parent 71a9a9b
commit e5dbbda
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/Mlem/API/Models/APIErrorResponse.swift b/Mlem/API/Models/APIErrorResponse.swift
@@ -18,6 +18,13 @@ private let possibleCredentialErrors = [
     "couldnt_find_that_username_or_email"
 ]
 
+private let possibleAuthenticationErrors = [
+    "incorrect_password",
+    "password_incorrect",
+    "incorrect_login",
+    "not_logged_in"
+]
+
 private let possible2FAErrors = [
     "missing_totp_token",
     "incorrect_totp_token"
@@ -29,9 +36,8 @@ private let registrationErrors = [
 ]
 
 extension APIErrorResponse {
-    var isIncorrectLogin: Bool { possibleCredentialErrors.contains(error) }
     var requires2FA: Bool { possible2FAErrors.contains(error) }
-    var isNotLoggedIn: Bool { error == "not_logged_in" }
+    var isNotLoggedIn: Bool { possibleAuthenticationErrors.contains(error) }
     var userRegistrationPending: Bool { registrationErrors.contains(error) }
     var emailNotVerified: Bool { registrationErrors.contains(error) }
     var instanceIsPrivate: Bool { error == "instance_is_private" }

diff --git a/Mlem/ContentView.swift b/Mlem/ContentView.swift
@@ -28,6 +28,7 @@ struct ContentView: View {
     @GestureState private var isDetectingLongPress = false
 
     @State private var isPresentingAccountSwitcher: Bool = false
+    @State private var tokenRefreshAccount: SavedAccount?
 
     @AppStorage("showInboxUnreadBadge") var showInboxUnreadBadge: Bool = true
     @AppStorage("homeButtonExists") var homeButtonExists: Bool = false
@@ -97,10 +98,15 @@ struct ContentView: View {
             accountChanged()
         }
         .onReceive(errorHandler.$sessionExpired) { expired in
-            if expired, let account = appState.currentActiveAccount {
-                NotificationDisplayer.presentTokenRefreshFlow(for: account) { updatedAccount in
-                    appState.setActiveAccount(updatedAccount)
-                }
+            if expired {
+                tokenRefreshAccount = appState.currentActiveAccount
+            }
+        }
+        .sheet(item: $tokenRefreshAccount) {
+            errorHandler.clearExpiredSession()
+        } content: { account in
+            TokenRefreshView(account: account) { updatedAccount in
+                appState.setActiveAccount(updatedAccount)
             }
         }
         .alert(using: $errorAlert) { content in

diff --git a/Mlem/Error Handling/ErrorHandler.swift b/Mlem/Error Handling/ErrorHandler.swift
@@ -42,20 +42,19 @@ class ErrorHandler: ObservableObject {
         Task { @MainActor in
 
             if let clientError = error.underlyingError.base as? APIClientError {
-
                 if case .invalidSession = clientError {
                     sessionExpired = true
                     return
                 }
 
-                if error.title != nil && !InternetConnectionManager.isConnectedToNetwork() {
+                if error.title != nil, !InternetConnectionManager.isConnectedToNetwork() {
                     if showNoInternet {
                         await notifier.add(.noInternet)
                     }
                     return
                 }
 
-                if case .response(let apiError, _) = clientError {
+                if case let .response(apiError, _) = clientError {
                     await notifier.add(.failure(apiError.error))
                     return
                 }
@@ -68,6 +67,10 @@ class ErrorHandler: ObservableObject {
         }
     }
 
+    func clearExpiredSession() {
+        sessionExpired = false
+    }
+
     private func log(_ error: ContextualError, _ file: StaticString, _ function: StaticString, _ line: Int) {
         print("☠️ ERROR ☠️")
         print("🕵️ -> \(error.underlyingError.description)")

diff --git a/Mlem/Views/Shared/Accounts/Add Account View.swift b/Mlem/Views/Shared/Accounts/Add Account View.swift
@@ -379,6 +379,8 @@ struct AddSavedInstanceView: View {
             message = badCredentialsMessage
         case APIClientError.networking:
             message = "Please check your internet connection and try again"
+        case APIClientError.invalidSession:
+            message = badCredentialsMessage
         case let APIClientError.response(errorResponse, _) where errorResponse.requires2FA:
             message = ""
 
@@ -387,9 +389,6 @@ struct AddSavedInstanceView: View {
             }
 
             return
-        case let APIClientError.response(errorResponse, _) where errorResponse.isIncorrectLogin:
-            message = badCredentialsMessage
-
         case let APIClientError.response(errorResponse, _) where errorResponse.emailNotVerified:
             message = registrationError
 

diff --git a/Mlem/Views/Shared/TokenRefreshView.swift b/Mlem/Views/Shared/TokenRefreshView.swift
@@ -197,8 +197,7 @@ struct TokenRefreshView: View {
         } catch {
             HapticManager.shared.play(haptic: .failure, priority: .high)
 
-            if case let APIClientError.response(apiError, _) = error,
-               apiError.isIncorrectLogin {
+            if case APIClientError.invalidSession = error {
                 updateViewState(.incorrectLogin)
                 selectedField = .password
                 return