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

Fix custom transport client auth state #411

Merged
merged 3 commits into from
Mar 15, 2024
Merged

Fix custom transport client auth state #411

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ccd255
Don't assume that custom transport clients are authed. Allow custom t…
julianlocke Mar 10, 2024
b2cec67
Add id-only flavor of handle redirect url
julianlocke Mar 11, 2024
10e5632
Address PR feedback
julianlocke Mar 15, 2024
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
85 changes: 60 additions & 25 deletions Source/SwiftyDropbox/Shared/Handwritten/DropboxClientsManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,18 @@ public class DropboxClientsManager {
)
DropboxOAuthManager.sharedOAuthManager = oAuthManager

setUpAuthorizedClient(
transportClient: transportClient,
backgroundTransportClient: backgroundTransportClient,
sessionConfiguration: nil,
backgroundSessionConfiguration: nil,
oAuthManager: oAuthManager,
oauthSetupIntent: oauthSetupIntent,
requestsToReconnect: requestsToReconnect
)
if let token = token(for: oauthSetupIntent.userKind, using: oAuthManager) {
setUpAuthorizedClient(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be an error logged for no token?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually a valid state, the model here is that users should call the setup* function on every launch. Auth can be performed afterwards if needed.

token: token,
transportClient: transportClient,
backgroundTransportClient: backgroundTransportClient,
sessionConfiguration: nil,
backgroundSessionConfiguration: nil,
oAuthManager: oAuthManager,
oauthSetupIntent: oauthSetupIntent,
requestsToReconnect: requestsToReconnect
)
}

checkAccessibilityMigrationOneTime(oauthManager: oAuthManager)
}
Expand All @@ -83,15 +86,18 @@ public class DropboxClientsManager {
)
DropboxOAuthManager.sharedOAuthManager = oAuthManager

setUpAuthorizedClient(
transportClient: nil,
backgroundTransportClient: nil,
sessionConfiguration: sessionConfiguration,
backgroundSessionConfiguration: backgroundSessionConfiguration,
oAuthManager: oAuthManager,
oauthSetupIntent: oauthSetupIntent,
requestsToReconnect: requestsToReconnect
)
if let token = token(for: oauthSetupIntent.userKind, using: oAuthManager) {
setUpAuthorizedClient(
token: token,
transportClient: nil,
backgroundTransportClient: nil,
sessionConfiguration: sessionConfiguration,
backgroundSessionConfiguration: backgroundSessionConfiguration,
oAuthManager: oAuthManager,
oauthSetupIntent: oauthSetupIntent,
requestsToReconnect: requestsToReconnect
)
}

checkAccessibilityMigrationOneTime(oauthManager: oAuthManager)
}
Expand All @@ -106,6 +112,7 @@ public class DropboxClientsManager {
}

private static func setUpAuthorizedClient(
token: DropboxAccessToken,
transportClient: DropboxTransportClient?,
backgroundTransportClient: DropboxTransportClient?,
sessionConfiguration: NetworkSessionConfiguration?,
Expand All @@ -114,8 +121,6 @@ public class DropboxClientsManager {
oauthSetupIntent: OAuthSetupContext,
requestsToReconnect: RequestsToReconnect?
) {
let token = token(for: oauthSetupIntent.userKind, using: oAuthManager)

if oauthSetupIntent.isTeam {
setupAuthorizedTeamClient(token, transportClient: transportClient, sessionConfiguration: sessionConfiguration)
} else {
Expand All @@ -136,33 +141,34 @@ public class DropboxClientsManager {
}
}

public static func reauthorizeClient(_ tokenUid: String, sessionConfiguration: NetworkSessionConfiguration? = nil) {
public static func reauthorizeClient(_ tokenUid: String, transportClient: DropboxTransportClient? = nil, sessionConfiguration: NetworkSessionConfiguration? = nil) {
precondition(DropboxOAuthManager.sharedOAuthManager != nil, "Call `DropboxClientsManager.setupWithAppKey` before calling this method")

if let token = DropboxOAuthManager.sharedOAuthManager.getAccessToken(tokenUid) {
setupAuthorizedClient(token, transportClient: nil, sessionConfiguration: sessionConfiguration)
setupAuthorizedClient(token, transportClient: transportClient, sessionConfiguration: sessionConfiguration)
}
checkAccessibilityMigrationOneTime(oauthManager: DropboxOAuthManager.sharedOAuthManager)
}

public static func reauthorizeBackgroundClient(
_ tokenUid: String,
transportClient: DropboxTransportClient? = nil,
sessionConfiguration: NetworkSessionConfiguration? = nil,
requestsToReconnect: @escaping RequestsToReconnect
) {
precondition(DropboxOAuthManager.sharedOAuthManager != nil, "Call `DropboxClientsManager.setupWithAppKey` before calling this method")

if let token = DropboxOAuthManager.sharedOAuthManager.getAccessToken(tokenUid) {
setupAuthorizedBackgroundClient(token, transportClient: nil, sessionConfiguration: sessionConfiguration, requestsToReconnect: requestsToReconnect)
setupAuthorizedBackgroundClient(token, transportClient: transportClient, sessionConfiguration: sessionConfiguration, requestsToReconnect: requestsToReconnect)
}
checkAccessibilityMigrationOneTime(oauthManager: DropboxOAuthManager.sharedOAuthManager)
}

public static func reauthorizeTeamClient(_ tokenUid: String, sessionConfiguration: NetworkSessionConfiguration? = nil) {
public static func reauthorizeTeamClient(_ tokenUid: String, transportClient: DropboxTransportClient? = nil, sessionConfiguration: NetworkSessionConfiguration? = nil) {
precondition(DropboxOAuthManager.sharedOAuthManager != nil, "Call `DropboxClientsManager.setupWithAppKey` before calling this method")

if let token = DropboxOAuthManager.sharedOAuthManager.getAccessToken(tokenUid) {
setupAuthorizedTeamClient(token, transportClient: nil, sessionConfiguration: sessionConfiguration)
setupAuthorizedTeamClient(token, transportClient: transportClient, sessionConfiguration: sessionConfiguration)
}
checkAccessibilityMigrationOneTime(oauthManager: DropboxOAuthManager.sharedOAuthManager)
}
Expand Down Expand Up @@ -355,6 +361,35 @@ public class DropboxClientsManager {
})
}

/// Handle a redirect and automatically initialize the client and save the token.
///
/// - parameters:
/// - url: The URL to attempt to handle.
/// - backgroundSessionIdentifier: The URLSession identifier to use for the background client
/// - sharedContainerIdentifier: The URLSessionConfiguration shared container identifier to use for the background client
/// - completion: The callback closure to receive auth result.
/// - returns: Whether the redirect URL can be handled.
///
@discardableResult
public static func handleRedirectURL(
_ url: URL,
backgroundSessionIdentifier: String,
sharedContainerIdentifier: String? = nil,
completion: @escaping DropboxOAuthCompletion
) -> Bool {
let backgroundNetworkSessionConfiguration = NetworkSessionConfiguration.background(
withIdentifier: backgroundSessionIdentifier,
sharedContainerIdentifier: sharedContainerIdentifier
)
return handleRedirectURL(
url,
includeBackgroundClient: true,
backgroundSessionConfiguration: backgroundNetworkSessionConfiguration,
completion: completion
)
}


/// Handle a redirect and automatically initialize the client and save the token.
///
/// - parameters:
Expand Down
Loading