fix: rename TestingBot key and secret to username and accessKey (#1401)

appium · Mar 22, 2024 · 03558f6 · 03558f6
1 parent dd61f61
commit 03558f6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/app/renderer/actions/Session.js b/app/renderer/actions/Session.js
@@ -422,13 +422,12 @@ export function newSession(caps, attachSessId = null) {
         if (!desiredCapabilities['tb:options']) {
           desiredCapabilities['tb:options'] = {};
         }
-        desiredCapabilities['tb:options'].key = session.server.testingbot.key || process.env.TB_KEY;
-        desiredCapabilities['tb:options'].secret =
-          session.server.testingbot.secret || process.env.TB_SECRET;
-        if (
-          !(session.server.testingbot.key || process.env.TB_KEY) ||
-          !(session.server.testingbot.secret || process.env.TB_SECRET)
-        ) {
+        username = session.server.testingbot.username || process.env.TB_KEY;
+        accessKey = session.server.testingbot.accessKey || process.env.TB_SECRET;
+        desiredCapabilities['tb:options'].key = username;
+        desiredCapabilities['tb:options'].secret = accessKey;
+        desiredCapabilities['tb:options'].source = 'appiumdesktop';
+        if (!username || !accessKey) {
           showError(new Error(i18n.t('testingbotCredentialsRequired')));
           return false;
         }

diff --git a/app/renderer/components/Session/ServerTabTestingbot.js b/app/renderer/components/Session/ServerTabTestingbot.js
@@ -3,14 +3,14 @@ import React from 'react';
 
 import {INPUT} from '../AntdTypes';
 
-const testingbotKeyPlaceholder = (t) => {
+const testingbotUsernamePlaceholder = (t) => {
   if (process.env.TB_KEY) {
     return t('usingDataFoundIn', {environmentVariable: 'TB_KEY'});
   }
   return t('yourUsername');
 };
 
-const testingbotSecretPlaceholder = (t) => {
+const testingbotAccessKeyPlaceholder = (t) => {
   if (process.env.TB_SECRET) {
     return t('usingDataFoundIn', {environmentVariable: 'TB_SECRET'});
   }
@@ -24,10 +24,10 @@ const ServerTabTestingbot = ({server, setServerParam, t}) => (
         <Form.Item>
           <Input
             id="testingbotKey"
-            placeholder={testingbotKeyPlaceholder(t)}
+            placeholder={testingbotUsernamePlaceholder(t)}
             addonBefore={t('TestingBot Key')}
-            value={server.testingbot.key}
-            onChange={(e) => setServerParam('key', e.target.value)}
+            value={server.testingbot.username}
+            onChange={(e) => setServerParam('username', e.target.value)}
           />
         </Form.Item>
       </Col>
@@ -36,10 +36,10 @@ const ServerTabTestingbot = ({server, setServerParam, t}) => (
           <Input
             id="testingbotSecret"
             type={INPUT.PASSWORD}
-            placeholder={testingbotSecretPlaceholder(t)}
+            placeholder={testingbotAccessKeyPlaceholder(t)}
             addonBefore={t('TestingBot Secret')}
-            value={server.testingbot.secret}
-            onChange={(e) => setServerParam('secret', e.target.value)}
+            value={server.testingbot.accessKey}
+            onChange={(e) => setServerParam('accessKey', e.target.value)}
           />
         </Form.Item>
       </Col>