Adding error case for when oidc flow is cancelled by user (okta#268)

moxionio · Jan 19, 2021 · 8227128 · 8227128
1 parent 1b890e6
commit 8227128
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Sources/OktaOidc/Common/Internal/Tasks/OktaOidcBrowserTask.swift b/Sources/OktaOidc/Common/Internal/Tasks/OktaOidcBrowserTask.swift
@@ -51,7 +51,14 @@ class OktaOidcBrowserTask: OktaOidcTask {
                 defer { self.userAgentSession = nil }
 
                 guard let authResponse = authorizationResponse else {
-                    return callback(nil, OktaOidcError.APIError("Authorization Error: \(error!.localizedDescription)"))
+                    guard let error = error else {
+                        return callback(nil, OktaOidcError.APIError("Authorization Error"))
+                    }
+                    if ((error as NSError).code == OKTErrorCode.userCanceledAuthorizationFlow.rawValue) {
+                        return callback(nil, OktaOidcError.userCancelledAuthorizationFlow)
+                    } else {
+                        return callback(nil, OktaOidcError.APIError("Authorization Error: \(error.localizedDescription)"))
+                    }
                 }
                 callback(authResponse, nil)
             }

diff --git a/Sources/OktaOidc/Common/OktaOidcError.swift b/Sources/OktaOidc/Common/OktaOidcError.swift
@@ -31,6 +31,7 @@ public enum OktaOidcError: Error {
     case parseFailure
     case missingIdToken
     case unexpectedAuthCodeResponse
+    case userCancelledAuthorizationFlow
     case unableToGetAuthCode
     case redirectServerError(String)
 }
@@ -75,6 +76,8 @@ extension OktaOidcError: LocalizedError {
             return NSLocalizedString("ID token needed to fulfill this operation.", comment: "")
         case .unexpectedAuthCodeResponse:
             return NSLocalizedString("Unexpected response format while retrieving authorization code.", comment: "")
+        case .userCancelledAuthorizationFlow:
+            return NSLocalizedString("User cancelled current session", comment: "")
         case .unableToGetAuthCode:
             return NSLocalizedString("Unable to get authorization code.", comment: "")
         case .redirectServerError(error: let error):