Properly handle UI Test Config. (#2827)

* Fix PR and Nightly workflows after reusable-workflow rename.

* Move UI Test Config to shared/test.

* Add users section to ui_test_config.json.sample.

Author: brandonpage

.github/workflows/reusable-ui-workflow.yaml

@@ -10,9 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
-      CI_USER_USERNAME: ${{ secrets.CI_USER_USERNAME }}
-      CI_USER_PASSWORD: ${{ secrets.CI_USER_PASSWORD }}
-      TEST_CONFIG: ${{ secrets.UI_TEST_CONFIG }}
     steps:
       - uses: actions/checkout@v4
         if: ${{ inputs.is_pr }}
@@ -27,10 +24,11 @@ jobs:
       - name: Install Dependencies
         env:
           TEST_CREDENTIALS: ${{ secrets.TEST_CREDENTIALS }}
+          UI_TEST_CONFIG: ${{ secrets.UI_TEST_CONFIG }}
         run: |
           ./install.sh
           echo $TEST_CREDENTIALS > ./shared/test/test_credentials.json
-          echo $TEST_CONFIG > ./native/NativeSampleApps/AuthFlowTester/src/main/assets/test_config.json
+          echo $UI_TEST_CONFIG > ./shared/test/ui_test_config.json
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
@@ -69,6 +67,8 @@ jobs:
           PR_API_VERSION: "35"
           FULL_API_RANGE: "28 29 30 31 32 33 34 35 36"
           IS_PR: ${{ inputs.is_pr }}
+          CI_USER_USERNAME: ${{ secrets.CI_USER_USERNAME }}
+          CI_USER_PASSWORD: ${{ secrets.CI_USER_PASSWORD }}
         run: |
           LEVELS_TO_TEST=$FULL_API_RANGE
           RETRIES=0

.gitignore

@@ -20,5 +20,6 @@ package-lock.json
 yarn.lock
 index.android.bundle*
 shared/test/test_credentials.json
-.vscode/
-test_config.json
+shared/test/ui_test_config.json
+native/NativeSampleApps/AuthFlowTester/src/main/assets/
+.vscode/

native/NativeSampleApps/AuthFlowTester/build.gradle.kts

@@ -80,6 +80,9 @@ android {
     }
 
     sourceSets {
+        getByName("main") {
+            assets.srcDirs("${rootDir}/shared/test")
+        }
         getByName("androidTest") {
             java.srcDirs(
                 "src/androidTest/java",

native/NativeSampleApps/AuthFlowTester/src/main/java/com/salesforce/samples/authflowtester/AuthFlowTesterApplication.kt

@@ -56,7 +56,7 @@ class AuthFlowTesterApplication : Application() {
                 var oauthConfig: OAuthConfig? = null
                 val jsonConfig = ResourceReaderHelper.readAssetFile(
                     /* ctx = */ this@AuthFlowTesterApplication,
-                    /* assetFilePath = */ "test_config.json",
+                    /* assetFilePath = */ "ui_test_config.json",
                 )
 
                 if (jsonConfig != null) {
@@ -92,4 +92,4 @@ class AuthFlowTesterApplication : Application() {
             }
         }
     }
-}
+}

shared/test/ui_test_config.json.sample

@@ -0,0 +1,17 @@
+{
+    "loginHost": "__INSERT_LOGIN_URL__",
+    "apps": [
+        {
+            "name": "__INSERT_APP_NAME__",
+            "consumerKey": "__INSERT_CONSUMER_KEY__",
+            "redirectUri": "__INSERT_REDIRECT_URI__",
+            "scopes": "__INSERT_SCOPES__"
+        }
+    ],
+    "users": [
+        {
+            "username": "__INSERT_USERNAME__",
+            "password": "__INSERT_PASSWORD__"
+        }
+    ]
+}