@W-16362973: [iOS] Add QR Code Login Support in MSDK (Introduce `isQr…

…CodeLoginEnabled`. Functional P.O.C.)
forcedotcom · Sep 20, 2024 · 65f19ee · 65f19ee
1 parent f965c51
commit 65f19ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h
@@ -225,6 +225,9 @@ NS_SWIFT_NAME(SalesforceManager)
  */
 @property (nonatomic, assign) BOOL isLoginWebviewInspectable;
 
+/*** Indicates if login via QR Code and UI bridge API is enabled */
+@property (nonatomic, assign) BOOL isQrCodeLoginEnabled;
+
 /** The type of cache used for the shared URL cache, defaults to kSFURLCacheTypeEncrypted.
 */
 @property (nonatomic, assign) SFURLCacheType URLCacheType;

diff --git a/...SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController+QrCodeLogin.swift b/...SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController+QrCodeLogin.swift
@@ -51,11 +51,12 @@ public extension SalesforceLoginViewController {
     ) {
         print("Login With Frontdoor Bridge URL: '\(frontdoorBridgeUrlString)'/'\(String(describing: pkceCodeVerifier))'.")
 
-        // TODO: W-16171402: Integrate With Existing Login Logic And Resolve Use Of PKCE Code Verifier. ECJ20240912
-
         guard let frontdoorBridgeUrl = URL(string: frontdoorBridgeUrlString) else { return }
         guard let webView = oauthView as? WKWebView else { return }
-        webView.load(URLRequest(url: frontdoorBridgeUrl))
+
+        DispatchQueue.main.async {
+            webView.load(URLRequest(url: frontdoorBridgeUrl))
+        }
     }
 
     // MARK: QR Code Login Via UI Bridge API Private Implementation

diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m
@@ -772,7 +772,7 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
     NSURL *url = navigationAction.request.URL;
     NSString *requestUrl = [url absoluteString];
     if ([self isRedirectURL:requestUrl]) {
-        if ([[SalesforceSDKManager sharedManager] useWebServerAuthentication]) {
+        if ([[SalesforceSDKManager sharedManager] useWebServerAuthentication] && ![[SalesforceSDKManager sharedManager] isQrCodeLoginEnabled]) {
             [self handleWebServerResponse:url];
         } else {
             [self handleUserAgentResponse:url];