Let a session decide if is valid or not

rootstrap · Jan 27, 2023 · 6b1ca16 · 6b1ca16
1 parent 6311f2e
commit 6b1ca16
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/ios-base/Common/Models/Session.swift b/ios-base/Common/Models/Session.swift
@@ -15,6 +15,8 @@ struct Session: Codable {
   var accessToken: String?
   var expiry: Date?
 
+  var isValid: Bool { [uid, accessToken, client].allSatisfy { $0 != nil } }
+
   private enum CodingKeys: String, CodingKey {
     case uid
     case client

diff --git a/ios-base/Managers/SessionManager.swift b/ios-base/Managers/SessionManager.swift
@@ -39,11 +39,7 @@ internal class SessionManager: CurrentUserSessionProvider {
     userDefaults.removeObject(forKey: "ios-base-session")
   }
 
-  var validSession: Bool {
-    if let session = currentSession, let uid = session.uid,
-       let tkn = session.accessToken, let client = session.client {
-      return !uid.isEmpty && !tkn.isEmpty && !client.isEmpty
-    }
-    return false
+  static var isSessionValid: Bool {
+    currentSession?.isValid ?? false
   }
 }
diff --git a/ios-base/Navigators/AppNavigator.swift b/ios-base/Navigators/AppNavigator.swift
@@ -10,7 +10,7 @@ import Foundation
 
 internal class AppNavigator: BaseNavigator {
 
-  static let shared = AppNavigator(isLoggedIn: SessionManager.shared.validSession)
+  static let shared = AppNavigator(isLoggedIn: SessionManager.shared.isSessionValid)
 
   init(isLoggedIn: Bool) {
     let initialRoute: Route = isLoggedIn

diff --git a/ios-base/Networking/Services/AuthenticationServices.swift b/ios-base/Networking/Services/AuthenticationServices.swift
@@ -171,6 +171,6 @@ internal class AuthenticationServices {
     UserDataManager.currentUser = user
     sessionManager.currentSession = Session(headers: headers)
 
-    return UserDataManager.currentUser != nil && sessionManager.validSession
+    return UserDataManager.currentUser != nil && sessionManager.isSessionValid
   }
 }
diff --git a/ios-baseUnitTests/Services/UserServiceUnitTests.swift b/ios-baseUnitTests/Services/UserServiceUnitTests.swift
@@ -77,7 +77,7 @@ class UserServiceUnitTests: XCTestCase {
       headers: unusableHeaders
     )
     XCTAssert(SessionManager.currentSession == nil)
-    XCTAssertFalse(SessionManager.validSession)
+    XCTAssertFalse(SessionManager.isSessionValid)
 
     // Testing case where should be session but not valid
     let wrongSessionHeaders = [
@@ -91,6 +91,6 @@ class UserServiceUnitTests: XCTestCase {
       headers: wrongSessionHeaders
     )
     XCTAssert(SessionManager.currentSession != nil)
-    XCTAssertFalse(SessionManager.validSession)
+    XCTAssertFalse(SessionManager.isSessionValid)
   }
 }