SDK-1884: resolved reviews.

Author: osho-20

bin/accessibility-automation/cypress/index.js

@@ -17,30 +17,12 @@ const performModifiedScan = (originalFn, Subject, stateType, ...args) => {
     }
     function runCutomizedCommand() {
         if (!Subject) {
-            let orgS1, orgS2, cypressCommandSubject;
-            if((orgS2 = (orgS1 = cy).subject) !==null && orgS2 !== void 0){
-                cypressCommandSubject = orgS2.call(orgS1);
-            }
-            else{
-                cypressCommandSubject = null;
-            }
-            customChaining.then(()=> cypressCommandSubject).then(() => {originalFn(...args)});
-        }
-        else {
-            let orgSC1, orgSC2, timeO1, cypressCommandChain, setTimeout;
-            if((timeO1 = args.find(arg => arg !== null && arg !== void 0 ? arg.timeout : null)) !== null && timeO1 !== void 0) {
-                setTimeout = timeO1.timeout;
-            }
-            else {
-                setTimeout = null;
-            }
-            if((orgSC1 = (orgSC2 = cy).subjectChain) !== null && orgSC1 !== void 0){
-                cypressCommandChain = orgSC1.call(orgSC2);
-            }
-            else {
-                cypressCommandChain = null;
-            }
-            customChaining.performScanSubjectQuery(cypressCommandChain, setTimeout).then({timeout: 30000}, (newSubject) => originalFn(...changeSub(args, stateType, newSubject)));
+            let cypressCommandSubject = (cy.subject?.call(cy)) ?? null;
+            customChaining.then(() => cypressCommandSubject).then(() => { originalFn(...args); });
+        } else {
+            let setTimeout = args.find(arg => arg?.timeout)?.timeout ?? null;
+            let cypressCommandChain = (cy.subjectChain?.call(cy)) ?? null;
+            customChaining.performScanSubjectQuery(cypressCommandChain, setTimeout).then({ timeout: 30000 }, newSubject => originalFn(...changeSub(args, stateType, newSubject)));
         }
     }
     runCutomizedCommand(); 

bin/accessibility-automation/plugin/index.js

@@ -32,7 +32,7 @@ const browserstackAccessibility = (on, config) => {
         }
         if (browser_validation) {
           const ally_path = path.dirname(process.env.ACCESSIBILITY_EXTENSION_PATH)
-          const {_, payload} = decodeJWTToken(process.env.ACCESSIBILITY_AUTH);
+          const payload = decodeJWTToken(process.env.ACCESSIBILITY_AUTH);
           launchOptions.extensions.push(ally_path);
           if(!utils.isUndefined(payload) && !utils.isUndefined(payload.a11y_core_config) && payload.a11y_core_config.domForge === true) {
             launchOptions.args.push("--auto-open-devtools-for-tabs");

bin/helpers/utils.js

@@ -1788,11 +1788,10 @@ exports.decodeJWTToken = (token) => {
     if (parts.length < 2) {
       throw new Error('Invalid JWT token');
     }
-    const header = JSON.parse(base64UrlDecode(parts[0]));
     const payload = JSON.parse(base64UrlDecode(parts[1]));
-    return { header, payload };
+    return payload
   } catch (error) {
     logger.err(error.message);
-    return {undefined, undefined};
+    return undefined;
   }
 }