Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xcode 16 Support #316

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Xcode 16 Support #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Sources/UberAuth/Authorize/AuthorizationCodeAuthProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,9 @@ public final class AuthorizationCodeAuthProvider: AuthProviding {
}

DispatchQueue.main.async {
self.applicationLauncher.open(
self.applicationLauncher.launch(
url,
options: [:],
completionHandler: { opened in
completion: { opened in
completion?(opened)
}
)
Expand Down
11 changes: 9 additions & 2 deletions Sources/UberCore/ApplicationLauncher.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ import UIKit
/// @mockable
public protocol ApplicationLaunching {

func open(_ url: URL, options: [UIApplication.OpenExternalURLOptionsKey: Any], completionHandler: ((Bool) -> Void)?)
func launch(_ url: URL, completion: ((Bool) -> ())?)
}

extension UIApplication: ApplicationLaunching {}
extension UIApplication: ApplicationLaunching {

public func launch(_ url: URL, completion: ((Bool) -> ())?) {
open(url, options: [:]) {
completion?($0)
}
}
}
12 changes: 6 additions & 6 deletions examples/UberSDK/UberSDKTests/Mocks/Mocks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ public class ApplicationLaunchingMock: ApplicationLaunching {
public init() { }


public private(set) var openCallCount = 0
public var openHandler: ((URL, [UIApplication.OpenExternalURLOptionsKey: Any], ((Bool) -> Void)?) -> ())?
public func open(_ url: URL, options: [UIApplication.OpenExternalURLOptionsKey: Any], completionHandler: ((Bool) -> Void)?) {
openCallCount += 1
if let openHandler = openHandler {
openHandler(url, options, completionHandler)
public private(set) var launchCallCount = 0
public var launchHandler: ((URL, ((Bool) -> ())?) -> ())?
public func launch(_ url: URL, completion: ((Bool) -> ())?) {
launchCallCount += 1
if let launchHandler = launchHandler {
launchHandler(url, completion)
}

}
Expand Down
26 changes: 13 additions & 13 deletions examples/UberSDK/UberSDKTests/UberAuth/AuthorizationCodeAuthProviderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
}

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, completion in
applicationLauncher.launchHandler = { _, completion in
completion?(true)
}

Expand Down Expand Up @@ -114,7 +114,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
}

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, completion in
applicationLauncher.launchHandler = { _, completion in
completion?(true)
}

Expand Down Expand Up @@ -156,7 +156,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
let promptString = prompt.stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { url, _, completion in
applicationLauncher.launchHandler = { url, completion in
XCTAssertTrue(url.query()!.contains("prompt=\(promptString)"))
expectation.fulfill()
completion?(true)
Expand Down Expand Up @@ -190,7 +190,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
let promptString = prompt.stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { url, _, completion in
applicationLauncher.launchHandler = { url, completion in
XCTAssertTrue(url.query()!.contains("prompt=\(promptString)"))
expectation.fulfill()
completion?(true)
Expand Down Expand Up @@ -334,7 +334,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
let expectation = XCTestExpectation()

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, completion in
applicationLauncher.launchHandler = { _, completion in
expectation.fulfill()
completion?(true)
}
Expand All @@ -360,7 +360,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
func test_executeNativeLogin_noDestinations_triggersInAppLogin() {

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, _ in }
applicationLauncher.launchHandler = { _, _ in }

configurationProvider.isInstalledHandler = { _, _ in
false
Expand All @@ -385,7 +385,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
func test_executeNativeLogin_noOpens_triggersInAppLogin() {

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, completion in
applicationLauncher.launchHandler = { _, completion in
completion?(false)
}

Expand Down Expand Up @@ -423,7 +423,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
func test_executeNativeLogin_noTokenExchange_doesNotIncludeCodeChallenge() {

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { url, _, completion in
applicationLauncher.launchHandler = { url, completion in
XCTAssertFalse(url.absoluteString.contains("code_challenge"))
XCTAssertFalse(url.absoluteString.contains("code_challenge_method"))
completion?(false)
Expand All @@ -448,7 +448,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
applicationLauncher: applicationLauncher
)

XCTAssertEqual(applicationLauncher.openCallCount, 0)
XCTAssertEqual(applicationLauncher.launchCallCount, 0)

provider.execute(
authDestination: .native(appPriority: [.eats]),
Expand All @@ -458,7 +458,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {

wait(for: [expectation], timeout: 0.2)

XCTAssertEqual(applicationLauncher.openCallCount, 1)
XCTAssertEqual(applicationLauncher.launchCallCount, 1)
}

func test_handleResponse_true_callsResponseParser() {
Expand Down Expand Up @@ -588,7 +588,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
}

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, completion in
applicationLauncher.launchHandler = { _, completion in
completion?(true)
}

Expand Down Expand Up @@ -626,7 +626,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
}

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, completion in
applicationLauncher.launchHandler = { _, completion in
completion?(true)
}

Expand Down Expand Up @@ -671,7 +671,7 @@ final class AuthorizationCodeAuthProviderTests: XCTestCase {
}

let applicationLauncher = ApplicationLaunchingMock()
applicationLauncher.openHandler = { _, _, completion in
applicationLauncher.launchHandler = { _, completion in
completion?(true)
}

Expand Down
Loading