mirror-AU-COVIDSafe/mobile-ios
1
0
Fork 0
mirror of https://github.com/AU-COVIDSafe/mobile-ios.git synced 2025-04-19 13:05:21 +00:00
Code Issues Projects Releases Wiki Activity

COVIDSafe code from version 1.9 (#18)

Browse source
This commit is contained in:
COVIDSafe Support 2020-08-03 16:01:39 +10:00 • committed by GitHub
parent 2257c542ed
commit 3b1d8fa3f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 4217 additions and 3998 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CovidSafe/API/GetTempIdAPI.swift
View file

@ -11,6 +11,8 @@ import KeychainSwift
class GetTempIdAPI {
private static let apiVersion = 2
static func getTempId(completion: @escaping (String?, Int?, Swift.Error?) -> Void) {
let keychain = KeychainSwift()
guard let apiHost = PlistHelper.getvalueFromInfoPlist(withKey: "API_Host", plistName: "CovidSafe-config") else {
@ -24,9 +26,12 @@ class GetTempIdAPI {
let headers: HTTPHeaders = [
"Authorization": "Bearer \(token)"
]
let params = [
"version" : apiVersion
]
CovidNetworking.shared.session.request("\(apiHost)/getTempId",
method: .get,
encoding: JSONEncoding.default,
parameters: params,
headers: headers,
interceptor: CovidRequestRetrier(retries: 3)).validate().responseDecodable(of: TempIdResponse.self) { (response) in
switch response.result {

45
CovidSafe/API/MessageAPI.swift
View file

@ -13,15 +13,35 @@ class MessageAPI {
static let keyLastApiUpdate = "keyLastApiUpdate"
static func getMessagesIfNeeded(completion: @escaping (MessageResponse?, Swift.Error?) -> Void) {
if shouldGetMessages() {
guard let token = UserDefaults.standard.string(forKey: "deviceTokenForAPN") else {
return
}
// Make API call to get messages
let messageRequest = MessageRequest(remotePushToken: token)
getMessages(msgRequest: messageRequest, completion: completion)
//Get relevat encounter data
guard let persistentContainer =
EncounterDB.shared.persistentContainer else {
return
}
let managedContext = persistentContainer.viewContext
guard let encounterLastWeekRequest = Encounter.fetchEncountersInLast(days: 7) else {
return
}
do {
//fetch last week encounters count
let weekEncounters = try managedContext.count(for: encounterLastWeekRequest)
let healthcheck = (BluetraceManager.shared.isBluetoothOn() &&
BluetraceManager.shared.isBluetoothAuthorized() &&
weekEncounters > 0 ? healthCheckParamValue.OK : healthCheckParamValue.POSSIBLE_ERROR)
// Make API call to get messages
let messageRequest = MessageRequest(remotePushToken: token, healthcheck: healthcheck)
getMessages(msgRequest: messageRequest, completion: completion)
} catch let error as NSError {
DLog("Could not fetch encounter(s) from db. \(error), \(error.userInfo)")
}
}
}
@ -44,10 +64,10 @@ class MessageAPI {
return shouldGetMessages
}
static func getMessages(msgRequest: MessageRequest,
private static func getMessages(msgRequest: MessageRequest,
completion: @escaping (MessageResponse?, Swift.Error?) -> Void) {
let keychain = KeychainSwift()
guard let apiHost = PlistHelper.getvalueFromInfoPlist(withKey: "API_Host", plistName: "CovidCare-config") else {
guard let apiHost = PlistHelper.getvalueFromInfoPlist(withKey: "API_Host", plistName: "CovidSafe-config") else {
return
}
@ -59,8 +79,10 @@ class MessageAPI {
"Authorization": "Bearer \(token)"
]
var params = [
"os" : "ios-\(UIDevice.current.systemVersion)"
var params: [String : Any] = [
"os" : "ios-\(UIDevice.current.systemVersion)",
"healthcheck" : msgRequest.healthcheck.rawValue,
"preferredLanguages": Locale.preferredLanguages
]
if let buildString = Bundle.main.version {
@ -91,8 +113,15 @@ class MessageAPI {
}
}
enum healthCheckParamValue: String {
case OK = "OK"
case POSSIBLE_ERROR = "POSSIBLE_ERROR"
case ERROR = "ERROR"
}
struct MessageRequest {
var remotePushToken: String?
var healthcheck: healthCheckParamValue
}
struct MessageResponse: Decodable {