diff --git a/.gitignore b/.gitignore index 4008035476..5f23dc1a9a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ node_modules/ package-lock.json yarn.lock index.android.bundle* -shared/test/test_credentials.json \ No newline at end of file +shared/test/test_credentials.json +.vscode/ diff --git a/libs/SalesforceSDK/res/values/bootconfig.xml b/libs/SalesforceSDK/res/values/bootconfig.xml index 984faeb549..2ec0afe133 100644 --- a/libs/SalesforceSDK/res/values/bootconfig.xml +++ b/libs/SalesforceSDK/res/values/bootconfig.xml @@ -5,7 +5,5 @@ 3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw testsfdc:///mobilesdk/detect/oauth/done - api - web \ No newline at end of file diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt index fea5257a8e..e86d68ab3a 100644 --- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt +++ b/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 { diff --git a/libs/test/MobileSyncTest/res/values/bootconfig.xml b/libs/test/MobileSyncTest/res/values/bootconfig.xml index f34828a027..cbf72325a0 100644 --- a/libs/test/MobileSyncTest/res/values/bootconfig.xml +++ b/libs/test/MobileSyncTest/res/values/bootconfig.xml @@ -3,10 +3,4 @@ __CONSUMER_KEY__ __REDIRECT_URI__ - - api - web - - com.salesforce.androidsdk.mobilesynctest.login - UTF-8 \ No newline at end of file diff --git a/libs/test/MobileSyncTest/res/values/strings.xml b/libs/test/MobileSyncTest/res/values/strings.xml index 23c380555f..6fca3af50d 100644 --- a/libs/test/MobileSyncTest/res/values/strings.xml +++ b/libs/test/MobileSyncTest/res/values/strings.xml @@ -1,6 +1,7 @@ Hello World! + com.salesforce.androidsdk.mobilesynctest.login MobileSyncTest com.salesforce.androidsdk.mobilesync.tests diff --git a/libs/test/SalesforceAnalyticsTest/res/values/bootconfig.xml b/libs/test/SalesforceAnalyticsTest/res/values/bootconfig.xml index 64e7a57b51..8daa44499f 100644 --- a/libs/test/SalesforceAnalyticsTest/res/values/bootconfig.xml +++ b/libs/test/SalesforceAnalyticsTest/res/values/bootconfig.xml @@ -3,10 +3,4 @@ __CONSUMER_KEY__ __REDIRECT_URI__ - - api - web - - com.salesforce.androidsdk.analytics.login - UTF-8 diff --git a/libs/test/SalesforceAnalyticsTest/res/values/strings.xml b/libs/test/SalesforceAnalyticsTest/res/values/strings.xml index 00a9b75746..b933f1dd25 100644 --- a/libs/test/SalesforceAnalyticsTest/res/values/strings.xml +++ b/libs/test/SalesforceAnalyticsTest/res/values/strings.xml @@ -1,6 +1,7 @@ Hello World! + com.salesforce.androidsdk.analytics.login SalesforceAnalyticsTest com.salesforce.androidsdk.analytics.tests diff --git a/libs/test/SalesforceReactTest/res/values/bootconfig.xml b/libs/test/SalesforceReactTest/res/values/bootconfig.xml new file mode 100644 index 0000000000..8daa44499f --- /dev/null +++ b/libs/test/SalesforceReactTest/res/values/bootconfig.xml @@ -0,0 +1,6 @@ + + + + __CONSUMER_KEY__ + __REDIRECT_URI__ + diff --git a/libs/test/SalesforceReactTest/res/values/strings.xml b/libs/test/SalesforceReactTest/res/values/strings.xml index 9e166d7b45..e2f1b21f47 100644 --- a/libs/test/SalesforceReactTest/res/values/strings.xml +++ b/libs/test/SalesforceReactTest/res/values/strings.xml @@ -1,6 +1,7 @@ Hello World! + com.salesforce.androidsdk.salesforcereact.login ReactNativeTest com.salesforce.androidsdk.reactnative.tests diff --git a/libs/test/SalesforceSDKTest/res/values/bootconfig.xml b/libs/test/SalesforceSDKTest/res/values/bootconfig.xml index ffdb2be39c..49de659f57 100644 --- a/libs/test/SalesforceSDKTest/res/values/bootconfig.xml +++ b/libs/test/SalesforceSDKTest/res/values/bootconfig.xml @@ -8,6 +8,4 @@ web openid - com.salesforce.androidsdk.salesforcesdktest.login - UTF-8 diff --git a/libs/test/SalesforceSDKTest/res/values/strings.xml b/libs/test/SalesforceSDKTest/res/values/strings.xml index 25c68061c2..fb7dea0e4d 100644 --- a/libs/test/SalesforceSDKTest/res/values/strings.xml +++ b/libs/test/SalesforceSDKTest/res/values/strings.xml @@ -1,6 +1,7 @@ Hello World! + com.salesforce.androidsdk.salesforcesdktest.login SalesforceSDKTest com.salesforce.androidsdk.tests diff --git a/libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/config/BootConfigTest.kt b/libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/config/BootConfigTest.kt index 0f27f7aed8..a601fe5bd5 100644 --- a/libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/config/BootConfigTest.kt +++ b/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 diff --git a/libs/test/SmartStoreTest/res/values/bootconfig.xml b/libs/test/SmartStoreTest/res/values/bootconfig.xml index b467b5d4b6..8daa44499f 100644 --- a/libs/test/SmartStoreTest/res/values/bootconfig.xml +++ b/libs/test/SmartStoreTest/res/values/bootconfig.xml @@ -3,10 +3,4 @@ __CONSUMER_KEY__ __REDIRECT_URI__ - - api - web - - com.salesforce.androidsdk.smartstoretest.login - UTF-8 diff --git a/libs/test/SmartStoreTest/res/values/strings.xml b/libs/test/SmartStoreTest/res/values/strings.xml index 8e16012312..f518f562cd 100644 --- a/libs/test/SmartStoreTest/res/values/strings.xml +++ b/libs/test/SmartStoreTest/res/values/strings.xml @@ -1,6 +1,7 @@ Hello World! + com.salesforce.androidsdk.smartstoretest.login SmartStoreTest com.salesforce.androidsdk.smartstore.tests diff --git a/native/NativeSampleApps/ConfiguredApp/res/values/bootconfig.xml b/native/NativeSampleApps/ConfiguredApp/res/values/bootconfig.xml index 984faeb549..86ebbf9fad 100644 --- a/native/NativeSampleApps/ConfiguredApp/res/values/bootconfig.xml +++ b/native/NativeSampleApps/ConfiguredApp/res/values/bootconfig.xml @@ -4,8 +4,4 @@ 3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw testsfdc:///mobilesdk/detect/oauth/done - - api - web - \ No newline at end of file diff --git a/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml b/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml index 984faeb549..86ebbf9fad 100644 --- a/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml +++ b/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml @@ -4,8 +4,4 @@ 3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw testsfdc:///mobilesdk/detect/oauth/done - - api - web - \ No newline at end of file