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

Jump to bottom

[update] updated restoration token plugin for support queue #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[update] updated restoration token plugin for support queue #29

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
66 changes: 39 additions & 27 deletions APIClient/Default/Plugins/Restoration/RestorationTokenPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class RestorationTokenPlugin: PluginType {
private var inProgress = false
private let credentialProvider: AccessCredentialsProvider
private let authErrorResolving: AuthErrorResolving

private var queue: [(Bool) -> Void] = []
/// - Parameters:
/// - credentialProvider: an access credentials provider that provides all required data to restore token; captured
/// - shouldHaltRequestsTillResolve: indicates whether APIClient should halt all passing requests in case one of them failed with `unathorized` error and restart them
Expand All @@ -44,43 +44,55 @@ public class RestorationTokenPlugin: PluginType {
}

public func canResolve(_ error: Error) -> Bool {
if authErrorResolving(error), inProgress == false {
if authErrorResolving(error) {
delegate?.reachUnauthorizedError()
return true
}
return false
return inProgress
}

public func resolve(_ error: Error, onResolved: @escaping (Bool) -> Void) {
guard authErrorResolving(error) else {
delegate?.failedToRestore()
onResolved(false)
return
}

guard credentialProvider.exchangeToken != nil && restorationResultProvider != nil else {
credentialProvider.invalidate()
delegate?.failedToRestore()
onResolved(false)
return
}

inProgress = true
restorationResultProvider? { [weak self] result in
self?.inProgress = false
if inProgress {
queue.append(onResolved)
} else {
guard authErrorResolving(error) else {
delegate?.failedToRestore()
onResolved(false)
queue.forEach { $0(false) }
queue.removeAll()
return
}

guard let value = result.value else {
self?.credentialProvider.invalidate()
self?.delegate?.failedToRestore()
guard credentialProvider.exchangeToken != nil && restorationResultProvider != nil else {
credentialProvider.invalidate()
delegate?.failedToRestore()
onResolved(false)
queue.forEach { $0(false) }
queue.removeAll()
return
}

inProgress = true
restorationResultProvider? { [weak self] result in
self?.inProgress = false

guard let value = result.value else {
self?.credentialProvider.invalidate()
self?.delegate?.failedToRestore()
onResolved(false)
self?.queue.forEach { $0(false) }
self?.queue.removeAll()
return
}

self?.credentialProvider.commitCredentialsUpdate { provider in
provider.accessToken = value.accessToken
provider.exchangeToken = value.exchangeToken
self?.delegate?.restored()
onResolved(true)
self?.credentialProvider.commitCredentialsUpdate { provider in
provider.accessToken = value.accessToken
provider.exchangeToken = value.exchangeToken
self?.delegate?.restored()
onResolved(true)
self?.queue.forEach { $0(true) }
self?.queue.removeAll()
}
}
}
}
Expand Down