Merge pull request forcedotcom#3946 from wmathurin/dyn_consumer_key

Allow consumer key to be defined at runtime by application

Author: wmathurin

.github/DangerFiles/TestOrchestrator.rb

@@ -10,6 +10,7 @@
 SCHEMES = ['SalesforceSDKCommon', 'SalesforceAnalytics', 'SalesforceSDKCore', 'SmartStore', 'MobileSync']
 
 modifed_libs = Set[]
+
 for file in (git.modified_files + git.added_files);
     scheme = file.split("libs/").last.split("/").first
     if SCHEMES.include?(scheme) 

.github/workflows/nightly.yaml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        app: [RestAPIExplorer, MobileSyncExplorer]
+        app: [RestAPIExplorer, MobileSyncExplorer, AuthFlowTester]
         ios: [^26, ^18, ^17]
         include:
           - ios: ^26

.github/workflows/pr.yaml

@@ -120,7 +120,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        app: [RestAPIExplorer, MobileSyncExplorer]
+        app: [RestAPIExplorer, MobileSyncExplorer, AuthFlowTester]
         ios: [^26, ^18]
         include:
           - ios: ^26

SalesforceMobileSDK.xcworkspace/contents.xcworkspacedata

@@ -266,7 +266,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B716A3E3218F6EEA009D407F"
+               BlueprintIdentifier = "F27137B928405BB8003B3D69"
                BuildableName = "SalesforceSDKCommonTestApp.app"
                BlueprintName = "SalesforceSDKCommonTestApp"
                ReferencedContainer = "container:libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj">

SalesforceMobileSDK.xcworkspace/xcshareddata/xcschemes/Everything.xcscheme

@@ -266,7 +266,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B716A3E3218F6EEA009D407F"
+               BlueprintIdentifier = "F27137B928405BB8003B3D69"
                BuildableName = "SalesforceSDKCommonTestApp.app"
                BlueprintName = "SalesforceSDKCommonTestApp"
                ReferencedContainer = "container:libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj">

SalesforceMobileSDK.xcworkspace/xcshareddata/xcschemes/UnitTests.xcscheme

@@ -203,6 +203,19 @@ NS_SWIFT_NAME(SalesforceManager)
  */
 @property (nonatomic, copy) SFSDKUserAgentCreationBlock userAgentString NS_SWIFT_NAME(userAgentGenerator);
 
+/**
+ Block to dynamically select the app config at runtime based on login host.
+ 
+ NB: SFUserAccountManager stores the consumer key, callback URL, etc. in its shared
+ instance, backed by shared prefs and initialized from the static boot config.
+ Previously, the app always used these shared instance values for login.
+ Now, the app can inject alternate values instead — in that case, the shared
+ instance and prefs are left untouched (not read or overwritten).
+ The consumer key and related values used for login are saved in the user
+ account credentials (as before) and therefore used later for token refresh.
+ */
+ @property (nonatomic, copy, nullable) SFSDKAppConfigRuntimeSelectorBlock appConfigRuntimeSelectorBlock NS_SWIFT_NAME(bootConfigRuntimeSelector);
+
 /** Use this flag to indicate if the APP will be an identity provider. When enabled this flag allows this application to perform authentication on behalf of another app.
  */
 @property (nonatomic,assign) BOOL isIdentityProvider NS_SWIFT_NAME(isIdentityProvider);
@@ -310,6 +323,17 @@ NS_SWIFT_NAME(SalesforceManager)
  */
 - (id <SFBiometricAuthenticationManager>)biometricAuthenticationManager;
 
+/**
+ * Asynchronously retrieves the app config (aka boot config) for the specified login host.
+ *
+ * If an appConfigRuntimeSelectorBlock is set, it will be invoked to select the appropriate config.
+ * If the block is not set or returns nil, the default appConfig will be returned.
+ *
+ * @param loginHost The selected login host
+ * @param callback The callback invoked with the selected app config
+ */
+- (void)appConfigForLoginHost:(nullable NSString *)loginHost callback:(nonnull void (^)(SFSDKAppConfig * _Nullable))callback NS_SWIFT_NAME(bootConfig(forLoginHost:callback:));
+
 /**
  * Creates the NativeLoginManager instance.
  *

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h

@@ -915,6 +915,19 @@ - (void)biometricAuthenticationFlowDidComplete:(NSNotification *)notification {
     return [SFScreenLockManagerInternal shared];
 }
 
+#pragma mark - Runtime App Config (aka Bootconfig) Override
+
+- (void) appConfigForLoginHost:(nullable NSString *)loginHost callback:(nonnull void (^)(SFSDKAppConfig * _Nullable))callback {
+    if (self.appConfigRuntimeSelectorBlock) {
+        self.appConfigRuntimeSelectorBlock(loginHost, ^(SFSDKAppConfig *config) {
+            // Fall back to default appConfig if the selector block returns nil
+            callback(config ?: self.appConfig);
+        });
+    } else {
+        callback(self.appConfig);
+    }
+}
+
 #pragma mark - Native Login
 
 - (id <SFNativeLoginManager>)useNativeLoginWithConsumerKey:(nonnull NSString *)consumerKey
@@ -965,7 +978,7 @@ - (void)biometricAuthenticationFlowDidComplete:(NSNotification *)notification {
 
     return nativeLogin;
 }
-
+    
 @end
 
 NSString *SFAppTypeGetDescription(SFAppType appType){

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m

@@ -30,12 +30,12 @@ import Foundation
 
 /// Struct representing a JWT Header
 public struct JwtHeader: Codable {
-    let algorithm: String?
-    let type: String?
-    let keyId: String?
-    let tokenType: String?
-    let tenantKey: String?
-    let version: String?
+    public let algorithm: String?
+    public let type: String?
+    public let keyId: String?
+    public let tokenType: String?
+    public let tenantKey: String?
+    public let version: String?
 
     enum CodingKeys: String, CodingKey {
         case algorithm = "alg"
@@ -49,13 +49,13 @@ public struct JwtHeader: Codable {
 
 /// Struct representing a JWT Payload
 public struct JwtPayload: Codable {
-    let audience: [String]?
-    let expirationTime: Int?
-    let issuer: String?
-    let notBeforeTime: Int?
-    let subject: String?
-    let scopes: String?
-    let clientId: String?
+    public let audience: [String]?
+    public let expirationTime: Int?
+    public let issuer: String?
+    public let notBeforeTime: Int?
+    public let subject: String?
+    public let scopes: String?
+    public let clientId: String?
 
     enum CodingKeys: String, CodingKey {
         case audience = "aud"
@@ -71,9 +71,9 @@ public struct JwtPayload: Codable {
 /// Class representing a JWT Access Token
 @objc(SFSDKJwtAccessToken)
 public class JwtAccessToken : NSObject {
-    let rawJwt: String
-    let header: JwtHeader
-    let payload: JwtPayload
+    public let rawJwt: String
+    public let header: JwtHeader
+    public let payload: JwtPayload
 
     /// Initializer to parse and decode the JWT string
     @objc public init(jwt: String) throws {
@@ -116,7 +116,7 @@ public class JwtAccessToken : NSObject {
     }
 
     /// Helper method to decode Base64 URL-encoded strings
-    private static func decodeBase64Url(_ string: String) throws -> String {
+    public static func decodeBase64Url(_ string: String) throws -> String {
         var base64 = string
             .replacingOccurrences(of: "-", with: "+")
             .replacingOccurrences(of: "_", with: "/")
@@ -133,7 +133,7 @@ public class JwtAccessToken : NSObject {
     }
 
     /// Custom errors for JWT decoding
-    enum JwtError: Error {
+    public enum JwtError: Error {
         case invalidFormat
         case invalidBase64
     }

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/JwtAccessToken.swift

@@ -39,6 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSString *redirectUri;
 @property (nonatomic, readonly) NSString *loginHost;
 @property (nonatomic, readonly) NSString *communityUrl;
+@property (nonatomic, readonly) NSString *username;
+@property (nonatomic, readonly) NSString *displayName;
 
 @end