COVIDSafe code from version 1.14 (#27)

This commit is contained in:
COVIDSafe Support 2020-11-09 16:51:00 -08:00 committed by GitHub
parent 3ea83834f5
commit cf93ea43c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 370 additions and 141 deletions

View file

@ -7,20 +7,19 @@
import Foundation
import Alamofire
import KeychainSwift
class MessageAPI {
class MessageAPI: CovidSafeAuthenticatedAPI {
static let keyLastApiUpdate = "keyLastApiUpdate"
static let keyLastVersionChecked = "keyLastVersionChecked"
static func getMessagesIfNeeded(completion: @escaping (MessageResponse?, MessageAPIError?) -> Void) {
static func getMessagesIfNeeded(completion: @escaping (MessageResponse?, CovidSafeAPIError?) -> Void) {
if shouldGetMessages() {
getMessages(completion: completion)
}
}
static func getMessages(completion: @escaping (MessageResponse?, MessageAPIError?) -> Void) {
static func getMessages(completion: @escaping (MessageResponse?, CovidSafeAPIError?) -> Void) {
guard let token = UserDefaults.standard.string(forKey: "deviceTokenForAPN") else {
completion(nil, .RequestError)
return
@ -82,20 +81,16 @@ class MessageAPI {
}
private static func getMessages(msgRequest: MessageRequest,
completion: @escaping (MessageResponse?, MessageAPIError?) -> Void) {
let keychain = KeychainSwift()
completion: @escaping (MessageResponse?, CovidSafeAPIError?) -> Void) {
guard let apiHost = PlistHelper.getvalueFromInfoPlist(withKey: "API_Host", plistName: "CovidSafe-config") else {
completion(nil, .RequestError)
return
}
guard let token = keychain.get("JWT_TOKEN") else {
completion(nil, .RequestError)
guard let headers = try? authenticatedHeaders() else {
completion(nil, .TokenExpiredError)
return
}
let headers: HTTPHeaders = [
"Authorization": "Bearer \(token)"
]
let preferredLanguages = Locale.preferredLanguages.count > 5 ? Locale.preferredLanguages[0...5].joined(separator: ",") : Locale.preferredLanguages.joined(separator: ",")
@ -138,11 +133,19 @@ class MessageAPI {
completion(nil, .UnknownError)
return
}
if (statusCode == 200) {
completion(nil, .ResponseError)
return
}
if statusCode == 401, let respData = response.data {
completion(nil, processUnauthorizedError(respData))
return
}
if (statusCode >= 400 && statusCode < 500) {
completion(nil, .RequestError)
return
}
completion(nil, .ServerError)
}
@ -183,10 +186,3 @@ struct Message: Decodable {
case destination
}
}
enum MessageAPIError: Error {
case RequestError
case ResponseError
case ServerError
case UnknownError
}