chore: addressed review comments

auth0 · Jul 5, 2024 · 9acf0da · 9acf0da
1 parent 2479461
commit 9acf0da
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/Auth0/MobileWebAuth.swift b/Auth0/MobileWebAuth.swift
@@ -22,9 +22,8 @@ extension ASUserAgent: ASWebAuthenticationPresentationContextProviding {
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         if let windowScene = UIApplication.shared()?.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene {
             return windowScene.windows.last(where: \.isKeyWindow) ?? ASPresentationAnchor()
-        } else {
-            return ASPresentationAnchor()
         }
+        return ASPresentationAnchor()
     }
 #endif
 

diff --git a/Auth0Tests/CredentialsManagerSpec.swift b/Auth0Tests/CredentialsManagerSpec.swift
@@ -497,10 +497,6 @@ class CredentialsManagerSpec: QuickSpec {
 
             context("renewal") {
 
-                beforeEach {
-
-                }
-
                 it("should yield new credentials without refresh token rotation") {
                     credentials = Credentials(accessToken: AccessToken, tokenType: TokenType, idToken: IdToken, refreshToken: RefreshToken, expiresIn: Date(timeIntervalSinceNow: -ExpiresIn))
                     _ = credentialsManager.store(credentials: credentials)
@@ -1197,7 +1193,7 @@ class CredentialsManagerSpec: QuickSpec {
                     let key = "foo"
                     let value = "bar"
                     let credentialsManager = credentialsManager!
-                    NetworkStub.addStub(condition: { $0.isToken(Domain) && $0.hasAtLeast(["refresh_token": RefreshToken, key: value])}, response: authResponse(accessToken: NewAccessToken, idToken: NewIdToken, refreshToken: NewRefreshToken, expiresIn: ExpiresIn))
+                    NetworkStub.addStub(condition: { $0.isToken(Domain) && $0.hasAtLeast(["refresh_token": RefreshToken, key: value]) && $0.hasHeader(key, value: value)}, response: authResponse(accessToken: NewAccessToken, idToken: NewIdToken, refreshToken: NewRefreshToken, expiresIn: ExpiresIn))
                     credentials = Credentials(accessToken: AccessToken, tokenType: TokenType, idToken: IdToken, refreshToken: RefreshToken, expiresIn: Date(timeIntervalSinceNow: -ExpiresIn))
                     _ = credentialsManager.store(credentials: credentials)
                     waitUntil(timeout: Timeout) { done in

diff --git a/Auth0Tests/IDTokenValidatorBaseSpec.swift b/Auth0Tests/IDTokenValidatorBaseSpec.swift
@@ -12,8 +12,8 @@ class IDTokenValidatorBaseSpec: QuickSpec {
     static let organization = "abc1234"
 
     // Can't override the initWithInvocation: initializer, because NSInvocation is not available in Swift
-    static var authentication = Auth0.authentication(clientId: clientId, domain: domain)
-    static var validatorContext = IDTokenValidatorContext(issuer: URL.httpsURL(from: domain).absoluteString,
+    static let authentication = Auth0.authentication(clientId: clientId, domain: domain)
+    static let validatorContext = IDTokenValidatorContext(issuer: URL.httpsURL(from: domain).absoluteString,
                                                         audience: clientId,
                                                         jwksRequest: authentication.jwks(),
                                                         leeway: leeway,

diff --git a/Auth0Tests/NetworkStub.swift b/Auth0Tests/NetworkStub.swift
@@ -12,7 +12,7 @@ typealias RequestCondition = (URLRequest) -> Bool
 typealias RequestResponse = (URLRequest) -> (Data?, URLResponse?, Error?)
 
 struct NetworkStub {
-    static var stubs: [(condition: RequestCondition, response: RequestResponse)] = []
+    static private(set) var stubs: [(condition: RequestCondition, response: RequestResponse)] = []
 
     static func addStub(condition: @escaping RequestCondition, response: @escaping RequestResponse) {
         stubs.append((condition, response))

diff --git a/Auth0Tests/Responses.swift b/Auth0Tests/Responses.swift
@@ -40,7 +40,7 @@ func catchAllResponse() -> RequestResponse {
 func apiSuccessResponse(json: [AnyHashable: Any] = [:]) -> RequestResponse {
     return { request in
         let data = try! JSONSerialization.data(withJSONObject: json, options: [])
-        let response = HTTPURLResponse(url: request.url!, statusCode: APISuccessStatusCode, httpVersion: nil, headerFields: APIResponseHeaders)
+        let response = HTTPURLResponse(url: request.url!, statusCode: APISuccessStatusCode, httpVersion: nil, headerFields: APIResponseHeaders)!
         return (data, response, nil)
     }
 }