Skip to content

Commit f07c246

Browse files
committed
Changing Type in Session Init just to avoid inside conversion
1 parent dccf2e9 commit f07c246

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

ios-base/Common/Models/Session.swift

+10-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ struct Session: Codable {
1414
var accessToken: String?
1515
var expiry: Date?
1616

17-
var isValid: Bool { [uid, accessToken, client].allSatisfy { $0 != nil } }
17+
var isValid: Bool {
18+
[uid, accessToken, client].allSatisfy { !($0 ?? "").isEmpty }
19+
}
1820

1921
private enum CodingKeys: String, CodingKey {
2022
case uid
@@ -33,18 +35,15 @@ struct Session: Codable {
3335
self.expiry = expires
3436
}
3537

36-
init?(headers: [String: Any]) {
37-
var loweredHeaders = headers
38-
loweredHeaders.lowercaseKeys()
39-
guard let stringHeaders = loweredHeaders as? [String: String] else {
40-
return nil
41-
}
42-
if let expiryString = stringHeaders[APIClient.HTTPHeader.expiry.rawValue],
38+
init?(headers: [String: String]) {
39+
var loweredKeysHeaders = headers
40+
loweredKeysHeaders.lowercaseKeys()
41+
if let expiryString = loweredKeysHeaders[APIClient.HTTPHeader.expiry.rawValue],
4342
let expiryNumber = Double(expiryString) {
4443
expiry = Date(timeIntervalSince1970: expiryNumber)
4544
}
46-
uid = stringHeaders[APIClient.HTTPHeader.uid.rawValue]
47-
client = stringHeaders[APIClient.HTTPHeader.client.rawValue]
48-
accessToken = stringHeaders[APIClient.HTTPHeader.token.rawValue]
45+
uid = loweredKeysHeaders[APIClient.HTTPHeader.uid.rawValue]
46+
client = loweredKeysHeaders[APIClient.HTTPHeader.client.rawValue]
47+
accessToken = loweredKeysHeaders[APIClient.HTTPHeader.token.rawValue]
4948
}
5049
}

ios-base/Networking/Services/AuthenticationServices.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class AuthenticationServices {
151151
UserDataManager.currentUser = User(
152152
dictionary: response["user"] as? [String: Any] ?? [:]
153153
)
154-
if let headers = headers as? [String: Any] {
154+
if let headers = headers as? [String: String] {
155155
SessionManager.currentSession = Session(headers: headers)
156156
}
157157
}

0 commit comments

Comments
 (0)