Merge pull request #3766 from bbirman/idp-config

Move off of deprecated openURL method

Author: bbirman

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKIDPAuthHelper.m

@@ -63,8 +63,9 @@ + (void)invokeIDPApp:(SFSDKAuthSession *)session completion:(void (^)(BOOL))comp
 
     NSURL *url = [command requestURL];
     dispatch_async(dispatch_get_main_queue(), ^{
-        BOOL launched  = [SFApplicationHelper openURL:url];
-        completionBlock(launched);
+        [SFApplicationHelper openURL:url options:@{} completionHandler:^(BOOL success) {
+            completionBlock(success);
+        }];
     });
 }
 
@@ -95,8 +96,9 @@ + (void)invokeSPApp:(NSURL *)url completion:(void (^)(BOOL))completionBlock {
             [authWindow dismissWindow];
             [[[SFSDKWindowManager sharedManager] mainWindow:nil] presentWindow];
         }];
-        BOOL launched  = [SFApplicationHelper openURL:url];
-        completionBlock(launched);
+        [SFApplicationHelper openURL:url options:@{} completionHandler:^(BOOL success) {
+            completionBlock(success);
+        }];
     });
 }
 
@@ -111,12 +113,15 @@ + (void)invokeSPAppWithError:(SFOAuthCredentials *)spAppCredentials error:(NSErr
             [authWindow dismissWindow];
             [[[SFSDKWindowManager sharedManager] mainWindow:nil] presentWindow];
         }];
-        BOOL launched  = [SFApplicationHelper openURL:url];
-        if (!launched) {
-            [SFSDKCoreLogger e:[self class] format:@"Could not launch spAPP to handle error %@",[error description]];
-        }
-        [[SFUserAccountManager sharedInstance] stopCurrentAuthentication:^(BOOL result) {
-            [SFSDKCoreLogger d:[self class] format:@"Completed idp authentication with error, %@",error];
+        
+        [SFApplicationHelper openURL:url options:@{} completionHandler:^(BOOL success) {
+            if (!success) {
+                [SFSDKCoreLogger e:[self class] format:@"Could not launch spAPP to handle error %@", [error description]];
+            }
+            
+            [[SFUserAccountManager sharedInstance] stopCurrentAuthentication:^(BOOL result) {
+                [SFSDKCoreLogger d:[self class] format:@"Completed idp authentication with error, %@", error];
+            }];
         }];
     });
 }

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/URLHandlers/SFSDKStartURLHandler.m

@@ -38,10 +38,11 @@ - (BOOL)canHandleRequest:(NSURL *)url options:(NSDictionary *)options {
 - (BOOL)processRequest:(NSURL *)url options:(NSDictionary *)options {
     if (url) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            BOOL success = [SFApplicationHelper openURL:url];
-            if (!success) {
-                 [SFSDKCoreLogger d:[self class] format:@"Could not launch  %@", url];
-            }
+            [SFApplicationHelper openURL:url options:options completionHandler:^(BOOL success) {
+                if (!success) {
+                     [SFSDKCoreLogger d:[self class] format:@"Could not launch  %@", url];
+                }
+            }];
         });
     }
     return NO;

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFApplicationHelper.h

@@ -23,6 +23,7 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <SalesforceSDKCore/SalesforceSDKConstants.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -43,7 +44,9 @@ NS_ASSUME_NONNULL_BEGIN
  @param url The URL to be opened.
  @return YES if the URL is successfully opened.
  */
-+ (BOOL)openURL:(NSURL*)url;
++ (BOOL)openURL:(NSURL*)url SFSDK_DEPRECATED(12.2, 13.0, "Use openURL:options:completionHandler: instead.");
+
++ (void)openURL:(NSURL*)url options:(NSDictionary<UIApplicationOpenExternalURLOptionsKey, id> *)options completionHandler:(void (^ __nullable)(BOOL success))completion;
 
 @end
 

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFApplicationHelper.m

@@ -51,4 +51,19 @@ + (BOOL)openURL:(NSURL*)url {
     return success;
 }
 
++ (void)openURL:(NSURL*)url options:(NSDictionary<UIApplicationOpenExternalURLOptionsKey, id> *)options completionHandler:(void (^ __nullable)(BOOL success))completion {
+    UIApplication *app = [self sharedApplication];
+    
+    if (app) {
+        SEL selector = @selector(openURL:options:completionHandler:);
+        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[app class] instanceMethodSignatureForSelector:selector]];
+        [invocation setTarget:app];
+        [invocation setSelector:selector];
+        [invocation setArgument:&url atIndex:2];
+        [invocation setArgument:&options atIndex:3];
+        [invocation setArgument:&completion atIndex:4];
+        [invocation invoke];
+    }
+}
+
 @end

native/SampleApps/RestAPIExplorer/RestAPIExplorer/AppDelegate.swift

@@ -44,7 +44,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         SalesforceManager.shared.appDisplayName = "Rest API Explorer"
         UserAccountManager.shared.navigationPolicyForAction = { webView, action in
             if let url = action.request.url, url.absoluteString == "https://www.salesforce.com/us/company/privacy" {
-                SFApplicationHelper.open(url)
+                SFApplicationHelper.open(url, options: [:], completionHandler: nil)
                 return .cancel
             }
             return .allow