sjs/gh-XcodesOrg-XcodesApp
1
0
Fork 0
mirror of https://github.com/XcodesOrg/XcodesApp.git synced 2026-03-25 08:55:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update code that validates security code response

Browse source
This commit is contained in:
Brandon Evans 2020-12-12 10:45:35 -07:00
parent 74f68076e0
commit 34d6f4feb4
No known key found for this signature in database
GPG key ID: D58A4B8DB64F8E93
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Xcodes/AppleAPI/Sources/AppleAPI/Client.swift
View file

@ -121,7 +121,17 @@ public class Client {
.flatMap { request in
Current.network.dataTask(with: request)
.mapError { $0 as Error }
// .validateSecurityCodeResponse()
.tryMap { (data, response) throws -> (Data, URLResponse) in
guard let urlResponse = response as? HTTPURLResponse else { return (data, response) }
switch urlResponse.statusCode {
case 200..<300:
return (data, urlResponse)
case 401:
throw AuthenticationError.incorrectSecurityCode
case let code:
throw AuthenticationError.badStatusCode(code, data, urlResponse)
}
}
.flatMap { (data, response) -> AnyPublisher<AuthenticationState, Error> in
self.updateSession(serviceKey: sessionData.serviceKey, sessionID: sessionData.sessionID, scnt: sessionData.scnt)
}
@ -171,6 +181,7 @@ public enum AuthenticationError: Swift.Error, LocalizedError, Equatable {
case appleIDAndPrivacyAcknowledgementRequired
case accountUsesTwoStepAuthentication
case accountUsesUnknownAuthenticationKind(String?)
case badStatusCode(Int, Data, HTTPURLResponse)
public var errorDescription: String? {
switch self {
@ -228,25 +239,6 @@ public enum TwoFactorOption: Equatable {
case smsPendingChoice
}
public extension Publisher where Output == (data: Data, response: URLResponse) {
func validateSecurityCodeResponse() -> AnyPublisher<Output, Failure> {
self.eraseToAnyPublisher()
// validate()
// .recover { error -> AnyPublisher<Output, Swift.Error> in
// switch error {
// case PMKHTTPError.badStatusCode(let code, _, _):
// if code == 401 {
// throw Client.Error.incorrectSecurityCode
// } else {
// throw error
// }
// default:
// throw error
// }
// }
}
}
public struct AuthOptionsResponse: Equatable, Decodable {
public let trustedPhoneNumbers: [TrustedPhoneNumber]?
public let trustedDevices: [TrustedDevice]?