Cleaning up bootconfig.xml (and strings.xml)

.gitignore

@@ -19,4 +19,5 @@ node_modules/
 package-lock.json
 yarn.lock
 index.android.bundle*
-shared/test/test_credentials.json
+shared/test/test_credentials.json
+.vscode/

libs/SalesforceSDK/res/values/bootconfig.xml

@@ -5,7 +5,5 @@
     <string name="remoteAccessConsumerKey">3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw</string>
     <string name="oauthRedirectURI">testsfdc:///mobilesdk/detect/oauth/done</string>
     <string-array name="oauthScopes">
-        <item>api</item>
-        <item>web</item>
     </string-array>
 </resources>

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -1322,6 +1322,7 @@ open class SalesforceSDKManager protected constructor(
             "IDP Enabled", "$isIDPLoginFlowEnabled",
             "Identity Provider", "$isIdentityProvider",
             "Current User", usersToString(userAccountManager.cachedCurrentUser),
+            "Scopes", (userAccountManager.cachedCurrentUser).scope,
             "Access Token Expiration", accessTokenExpiration(),
             "Authenticated Users", usersToString(userAccountManager.authenticatedUsers)
         ).apply {

libs/test/MobileSyncTest/res/values/bootconfig.xml

@@ -3,10 +3,4 @@
 <resources>
     <string name="remoteAccessConsumerKey">__CONSUMER_KEY__</string>
     <string name="oauthRedirectURI">__REDIRECT_URI__</string>
-    <string-array name="oauthScopes">
-        <item>api</item>
-        <item>web</item>
-    </string-array>
-    <string name="account_type">com.salesforce.androidsdk.mobilesynctest.login</string>
-    <string name="encoding">UTF-8</string>
 </resources>

libs/test/MobileSyncTest/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="hello">Hello World!</string>
+    <string name="account_type">com.salesforce.androidsdk.mobilesynctest.login</string>
     <string name="app_name">MobileSyncTest</string>
     <string name="app_package">com.salesforce.androidsdk.mobilesync.tests</string>
 </resources>

libs/test/SalesforceAnalyticsTest/res/values/bootconfig.xml

@@ -3,10 +3,4 @@
 <resources>
     <string name="remoteAccessConsumerKey">__CONSUMER_KEY__</string>
     <string name="oauthRedirectURI">__REDIRECT_URI__</string>
-    <string-array name="oauthScopes">
-        <item>api</item>
-        <item>web</item>
-    </string-array>
-    <string name="account_type">com.salesforce.androidsdk.analytics.login</string>
-    <string name="encoding">UTF-8</string>
 </resources>

libs/test/SalesforceAnalyticsTest/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="hello">Hello World!</string>
+    <string name="account_type">com.salesforce.androidsdk.analytics.login</string>
     <string name="app_name">SalesforceAnalyticsTest</string>
     <string name="app_package">com.salesforce.androidsdk.analytics.tests</string>
 </resources>

libs/test/SalesforceReactTest/res/values/bootconfig.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <string name="remoteAccessConsumerKey">__CONSUMER_KEY__</string>
+    <string name="oauthRedirectURI">__REDIRECT_URI__</string>
+</resources>

libs/test/SalesforceReactTest/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="hello">Hello World!</string>
+    <string name="account_type">com.salesforce.androidsdk.salesforcereact.login</string>
     <string name="app_name">ReactNativeTest</string>
     <string name="app_package">com.salesforce.androidsdk.reactnative.tests</string>
 </resources>

libs/test/SalesforceSDKTest/res/values/bootconfig.xml

@@ -8,6 +8,4 @@
         <item>web</item>
         <item>openid</item>
     </string-array>
-    <string name="account_type">com.salesforce.androidsdk.salesforcesdktest.login</string>
-    <string name="encoding">UTF-8</string>
 </resources>

libs/test/SalesforceSDKTest/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="hello">Hello World!</string>
+    <string name="account_type">com.salesforce.androidsdk.salesforcesdktest.login</string>
     <string name="app_name">SalesforceSDKTest</string>
     <string name="app_package">com.salesforce.androidsdk.tests</string>
 </resources>

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/config/BootConfigTest.kt

@@ -36,7 +36,13 @@ import io.mockk.every
 import io.mockk.mockk
 import org.json.JSONException
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -143,6 +149,7 @@ class BootConfigTest {
         assertNotNull("Boot config should not be null.", config)
         assertNotNull("OAuth scopes should not be null when specified in XML.", config.oauthScopes)
         assertTrue("OAuth scopes should have at least one scope.", config.oauthScopes!!.isNotEmpty())
+        assertArrayEquals("Incorrect OAuth scopes.", arrayOf("api", "web", "openid"), config.oauthScopes)
     }
 
     @Test

libs/test/SmartStoreTest/res/values/bootconfig.xml

@@ -3,10 +3,4 @@
 <resources>
     <string name="remoteAccessConsumerKey">__CONSUMER_KEY__</string>
     <string name="oauthRedirectURI">__REDIRECT_URI__</string>
-    <string-array name="oauthScopes">
-        <item>api</item>
-        <item>web</item>
-    </string-array>
-    <string name="account_type">com.salesforce.androidsdk.smartstoretest.login</string>
-    <string name="encoding">UTF-8</string>
 </resources>

libs/test/SmartStoreTest/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="hello">Hello World!</string>
+    <string name="account_type">com.salesforce.androidsdk.smartstoretest.login</string>
     <string name="app_name">SmartStoreTest</string>
     <string name="app_package">com.salesforce.androidsdk.smartstore.tests</string>
 </resources>

native/NativeSampleApps/ConfiguredApp/res/values/bootconfig.xml

@@ -4,8 +4,4 @@
     <!-- Mobile SDK Sample App (cs1.mobilesdk.ee.org) -->
     <string name="remoteAccessConsumerKey">3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw</string>
     <string name="oauthRedirectURI">testsfdc:///mobilesdk/detect/oauth/done</string>
-    <string-array name="oauthScopes">
-        <item>api</item>
-        <item>web</item>
-    </string-array>
 </resources>

native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml

@@ -4,8 +4,4 @@
     <!-- Mobile SDK Sample App (cs1.mobilesdk.ee.org) -->
     <string name="remoteAccessConsumerKey">3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw</string>
     <string name="oauthRedirectURI">testsfdc:///mobilesdk/detect/oauth/done</string>
-    <string-array name="oauthScopes">
-        <item>api</item>
-        <item>web</item>
-    </string-array>
 </resources>