SDK-4415 Add changes to send extra details for app-accessibility session

lerna.json

@@ -3,7 +3,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "8.47.0",
+  "version": "8.47.1",
   "command": {
     "bootstrap": {
       "npmClientArgs": [

packages/wdio-browserstack-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/browserstack-service",
-  "version": "8.47.0",
+  "version": "8.47.1",
   "description": "WebdriverIO service for better Browserstack integration",
   "author": "Adam Bjerstedt <abjerstedt@gmail.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-browserstack-service",

packages/wdio-browserstack-service/src/cli/cliUtils.ts

@@ -174,7 +174,8 @@ export class CLIUtils {
             sdk_language: this.getSdkLanguage(),
         }
         if (!isNullOrEmpty(existingCliPath)) {
-            queryParams.cli_version = await this.runShellCommand(`${existingCliPath} version`)
+            const nullDevice = platform() === 'win32' ? 'NUL' : '/dev/null'
+            queryParams.cli_version = await this.runShellCommand(`${existingCliPath} version 2>${nullDevice}`)
         }
         const response = await this.requestToUpdateCLI(queryParams, config)
         if (nestedKeyValue(response, ['updated_cli_version'])) {

packages/wdio-browserstack-service/src/cli/modules/accessibilityModule.ts

@@ -31,6 +31,8 @@ export default class AccessibilityModule extends BaseModule {
     static MODULE_NAME = 'AccessibilityModule'
     accessibilityMap: Map<number, boolean>
     LOG_DISABLED_SHOWN: Map<number, boolean>
+    centralAuthA11yConfig: Record<string, unknown> = {}
+    centralAuthConfigFetched: boolean = false
 
     constructor(accessibilityConfig: Accessibility, isNonBstackA11y: boolean) {
         super()
@@ -245,7 +247,7 @@ export default class AccessibilityModule extends BaseModule {
                         'thBuildUuid': process.env.BROWSERSTACK_TESTHUB_UUID,
                         'thJwtToken': process.env.BROWSERSTACK_TESTHUB_JWT
                     }
-                    const driverExecuteParams = await this.getDriverExecuteParams()
+                    const driverExecuteParams = await this.getDriverExecuteParams('saveResults')
                     dataForExtension = { ...dataForExtension, ...driverExecuteParams }
 
                     // final scan and saving the results
@@ -307,13 +309,26 @@ export default class AccessibilityModule extends BaseModule {
             PERFORMANCE_SDK_EVENTS.A11Y_EVENTS.PERFORM_SCAN,
             async () => {
                 try {
+                    // Fetch central auth accessibility configuration
+                    const centralAuthConfig = await this.fetchCentralAuthA11yConfig('scan')
                     if (!this.accessibility) {
                         this.logger.debug('Not an Accessibility Automation session.')
                         return
                     }
                     if (this.isAppAccessibility) {
+                        // Get app accessibility params and merge with central auth config
+                        const appAccessibilityParams = _getParamsForAppAccessibility(commandName)
+
+                        // Merge with central auth config
+                        const mergedParams: Record<string, any> = { ...appAccessibilityParams, ...centralAuthConfig }
+
+                        // Use centralAuthToken if available
+                        if (centralAuthConfig.centralAuthToken) {
+                            // Set the auth header with the token value
+                            mergedParams.centralAuthHeader = centralAuthConfig.centralAuthToken
+                        }
                         const results: unknown = await (browser as WebdriverIO.Browser).execute(
-                            formatString(this.scriptInstance.performScan, JSON.stringify(_getParamsForAppAccessibility(commandName))) as string,
+                            formatString(this.scriptInstance.performScan, JSON.stringify(mergedParams)) as string,
                             {}
                         )
                         BStackLogger.debug(util.format(results as string))
@@ -399,10 +414,10 @@ export default class AccessibilityModule extends BaseModule {
         )()
     }
 
-    async getDriverExecuteParams() {
+    async getDriverExecuteParams(scriptName: string) {
         const payload: Omit<FetchDriverExecuteParamsEventRequest, 'binSessionId'> = {
             product: 'accessibility',
-            scriptName: 'saveResults'
+            scriptName: scriptName
         }
         const response: FetchDriverExecuteParamsEventResponse = await GrpcClient.getInstance().fetchDriverExecuteParamsEvent(payload)
         if (response.success) {
@@ -412,4 +427,25 @@ export default class AccessibilityModule extends BaseModule {
         return {}
     }
 
+    /**
+     * Fetch central auth accessibility configuration for the given script name.
+     * Returns cached config if already fetched, otherwise loads and caches it.
+     *
+     * @param scriptName - Name of the script to fetch config for
+     * @returns Configuration object, empty object if error occurs
+     */
+    async fetchCentralAuthA11yConfig(scriptName: string): Promise<Record<string, unknown>> {
+        try {
+            if (this.centralAuthConfigFetched) {
+                return this.centralAuthA11yConfig
+            }
+            this.centralAuthA11yConfig = await this.getDriverExecuteParams(scriptName)
+            this.centralAuthConfigFetched = true
+            return this.centralAuthA11yConfig
+        } catch (error) {
+            this.logger.error(`fetchCentralAuthA11yConfig: Failed to fetch driver execute params for ${scriptName}: ${util.format(error)}`)
+            return {}
+        }
+    }
+
 }