Merge pull request #3981 from wmathurin/consumer_key_in_env

Removing consumer key from sample apps

Author: wmathurin

.gitignore

@@ -5,6 +5,7 @@ project.xcworkspace
 artifacts
 node_modules
 shared/test/test_credentials.json
+bootconfig.plist
 /SalesforceMobileSDK.xcworkspace/xcshareddata/SalesforceMobileSDK.xccheckout
 /SalesforceMobileSDK.xcworkspace/xcshareddata/SalesforceMobileSDK.xcscmblueprint
 /SalesforceMobileSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

install.sh

@@ -6,6 +6,9 @@
 # Run this script before working with the SalesforceMobileSDK Xcode workspace.
 #
 
+# Run from repo root so relative paths work regardless of invocation directory
+cd "$(dirname "$0")"
+
 # Check for iOS SDK minimum version
 IOS_MIN_VERSION_NUM=170
 IOS_MIN_VERSION_STR="iOS 17.0"
@@ -45,3 +48,31 @@ if [ ! -f "shared/test/test_credentials.json" ]
 then
     cp shared/test/test_credentials.json.sample shared/test/test_credentials.json
 fi
+
+# Create bootconfig.plist from shared sample
+BOOTCONFIG_SAMPLE="shared/bootconfig.plist.sample"
+BOOTCONFIG_PATHS=(
+    "native/SampleApps/AuthFlowTester/AuthFlowTester/Supporting Files/bootconfig.plist"
+    "native/SampleApps/RestAPIExplorer/RestAPIExplorer/bootconfig.plist"
+    "native/SampleApps/MobileSyncExplorer/MobileSyncExplorer/bootconfig.plist"
+)
+for bootconfig in "${BOOTCONFIG_PATHS[@]}"; do
+    mkdir -p "$(dirname "$bootconfig")"
+    cp "$BOOTCONFIG_SAMPLE" "$bootconfig"
+    
+    # Substitute env vars if set
+    if [ -n "${MSDK_IOS_REMOTE_ACCESS_CONSUMER_KEY:-}" ]; then
+        gsed -i "s|__CONSUMER_KEY__|${MSDK_IOS_REMOTE_ACCESS_CONSUMER_KEY}|g" "$bootconfig"
+    fi
+    if [ -n "${MSDK_IOS_REMOTE_ACCESS_CALLBACK_URL:-}" ]; then
+        gsed -i "s|__REDIRECT_URI__|${MSDK_IOS_REMOTE_ACCESS_CALLBACK_URL}|g" "$bootconfig"
+    fi
+done
+
+if [ -z "${MSDK_IOS_REMOTE_ACCESS_CONSUMER_KEY:-}" ] || [ -z "${MSDK_IOS_REMOTE_ACCESS_CALLBACK_URL:-}" ]; then
+    echo ""
+    echo "Note: MSDK_IOS_REMOTE_ACCESS_CONSUMER_KEY and/or MSDK_IOS_REMOTE_ACCESS_CALLBACK_URL are not set."
+    echo "To run the sample applications, define these environment variables or manually provide"
+    echo "a bootconfig.plist (with remoteAccessConsumerKey and oauthRedirectURI) in each sample app."
+    echo ""
+fi

native/SampleApps/MobileSyncExplorer/MobileSyncExplorer/bootconfig.plist

@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>remoteAccessConsumerKey</key>
-	<string>3MVG9SemV5D80oBcXZ2EUzbcJwzJCe2n4LaHH_Z2JSpIJqJ1MzFK_XRlHrupqNdeus8.NRonkpx0sAAWKzfK8</string>
+	<string>__CONSUMER_KEY__</string>
 	<key>oauthRedirectURI</key>
-	<string>testeropaque://mobilesdk/done</string>
+	<string>__REDIRECT_URI__</string>
 	<key>shouldAuthenticate</key>
 	<true/>
 </dict>

native/SampleApps/RestAPIExplorer/RestAPIExplorer/bootconfig.plist

@@ -1,17 +1,17 @@
 {
 
- "access_token":"__NOT_REQUIRED__",
+"access_token":"__NOT_REQUIRED__",
 
 "test_client_id":"__INSERT_REMOTE_ACCESS_CLIENT_KEY_HERE__",
 
-"test_login_domain":"test.salesforce.com",
+"test_login_domain":"__INSERT_LOGIN_URL_HERE__",
 
 "test_redirect_uri":"__INSERT_REMOTE_ACCESS_CALLBACK_URL_HERE__",
 
 "refresh_token":"__INSERT_TOKEN_HERE__",
 
-"instance_url":"https://cs1.salesforce.com",
+"instance_url":"__INSERT_INSTANCE_URL_HERE__",
 
-"identity_url":"https://test.salesforce.com"
+"identity_url":"__INSERT_IDENTITY_URL_HERE__"
 
 }