Changing Type in Session Init just to avoid inside conversion

rootstrap · Feb 23, 2022 · f07c246 · f07c246
1 parent dccf2e9
commit f07c246
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/ios-base/Common/Models/Session.swift b/ios-base/Common/Models/Session.swift
@@ -14,7 +14,9 @@ struct Session: Codable {
   var accessToken: String?
   var expiry: Date?
 
-  var isValid: Bool { [uid, accessToken, client].allSatisfy { $0 != nil } }
+  var isValid: Bool {
+    [uid, accessToken, client].allSatisfy { !($0 ?? "").isEmpty }
+  }
 
   private enum CodingKeys: String, CodingKey {
     case uid
@@ -33,18 +35,15 @@ struct Session: Codable {
     self.expiry = expires
   }
 
-  init?(headers: [String: Any]) {
-    var loweredHeaders = headers
-    loweredHeaders.lowercaseKeys()
-    guard let stringHeaders = loweredHeaders as? [String: String] else {
-      return nil
-    }
-    if let expiryString = stringHeaders[APIClient.HTTPHeader.expiry.rawValue],
+  init?(headers: [String: String]) {
+    var loweredKeysHeaders = headers
+    loweredKeysHeaders.lowercaseKeys()
+    if let expiryString = loweredKeysHeaders[APIClient.HTTPHeader.expiry.rawValue],
       let expiryNumber = Double(expiryString) {
       expiry = Date(timeIntervalSince1970: expiryNumber)
     }
-    uid = stringHeaders[APIClient.HTTPHeader.uid.rawValue]
-    client = stringHeaders[APIClient.HTTPHeader.client.rawValue]
-    accessToken = stringHeaders[APIClient.HTTPHeader.token.rawValue]
+    uid = loweredKeysHeaders[APIClient.HTTPHeader.uid.rawValue]
+    client = loweredKeysHeaders[APIClient.HTTPHeader.client.rawValue]
+    accessToken = loweredKeysHeaders[APIClient.HTTPHeader.token.rawValue]
   }
 }
diff --git a/ios-base/Networking/Services/AuthenticationServices.swift b/ios-base/Networking/Services/AuthenticationServices.swift
@@ -151,7 +151,7 @@ class AuthenticationServices {
     UserDataManager.currentUser = User(
       dictionary: response["user"] as? [String: Any] ?? [:]
     )
-    if let headers = headers as? [String: Any] {
+    if let headers = headers as? [String: String] {
       SessionManager.currentSession = Session(headers: headers)
     }
   }