Refine error handling for Box, GoogleDrive, and revert log in Dropbox…

… provider
cryptomator · Oct 15, 2024 · 9e5ae76 · 9e5ae76
1 parent 0c1a348
commit 9e5ae76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Sources/CryptomatorCloudAccess/Box/BoxCloudProvider.swift b/Sources/CryptomatorCloudAccess/Box/BoxCloudProvider.swift
@@ -579,7 +579,7 @@ public class BoxCloudProvider: CloudProvider {
 
 	private func convertStandardError(_ error: Error) -> Error {
 		switch error {
-		case let error as BoxAPIError where error.responseInfo.statusCode == 401 || error.description.contains("Invalid refresh token"):
+		case let error as BoxAPIError where (error.responseInfo.statusCode == 400 && error.responseInfo.rawBody?.contains("invalid_grant") == true) || error.responseInfo.statusCode == 401:
 			return CloudProviderError.unauthorized
 		case let error as BoxAPIError where error.responseInfo.statusCode == 404:
 			return CloudProviderError.itemNotFound

diff --git a/Sources/CryptomatorCloudAccess/Dropbox/DropboxCloudProvider.swift b/Sources/CryptomatorCloudAccess/Dropbox/DropboxCloudProvider.swift
@@ -191,7 +191,7 @@ public class DropboxCloudProvider: CloudProvider {
 					return
 				}
 				if let networkError = networkError {
-					CloudAccessDDLogDebug("DropboxCloudProvider: fetchItemMetadata failed with networkError: \(networkError)")
+					CloudAccessDDLogDebug("DropboxCloudProvider: fetchItemMetadata(at: \(cloudPath.path)) failed with networkError: \(networkError)")
 					reject(self.convertRequestError(networkError)) 
 					return
 				}

diff --git a/Sources/CryptomatorCloudAccess/GoogleDrive/GoogleDriveCloudProvider.swift b/Sources/CryptomatorCloudAccess/GoogleDrive/GoogleDriveCloudProvider.swift
@@ -533,7 +533,7 @@ public class GoogleDriveCloudProvider: CloudProvider {
 					CloudAccessDDLogDebug("GoogleDriveCloudProvider: executeQuery(\(query.requestID)) failed with error: \(error)")
 					if error.domain == NSURLErrorDomain, error.code == NSURLErrorNotConnectedToInternet || error.code == NSURLErrorCannotConnectToHost || error.code == NSURLErrorNetworkConnectionLost || error.code == NSURLErrorDNSLookupFailed || error.code == NSURLErrorResourceUnavailable || error.code == NSURLErrorInternationalRoamingOff {
 						reject(CloudProviderError.noInternetConnection)
-					} else if ((error.domain == kGTLRErrorObjectDomain && (error.code == 401 || error.code == 403)) || (error.domain == OIDOAuthTokenErrorDomain && error.code == -10)) {
+					} else if ((error.domain == kGTLRErrorObjectDomain && (error.code == 401 || error.code == 403)) || (error.domain == OIDOAuthTokenErrorDomain && error.code == OIDErrorCodeOAuth.invalidGrant.rawValue)) {
 						reject(CloudProviderError.unauthorized)
 					} else if error.domain == kGTLRErrorObjectDomain, error.code == 404 {
 						reject(CloudProviderError.itemNotFound)