bdy 1.17.21-dev → 1.17.22-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.17.21-dev",
+  "version": "1.17.22-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/command/login.js

@@ -33,37 +33,6 @@ const OAUTH_CLIENT_APP_SCOPES = [
     'TUNNEL_MANAGE',
     'UNIT_TEST_MANAGE',
 ];
-function normalizeBaseUrl(url) {
-    let normalized = url.trim();
-    normalized = normalized.replace(/^https?:\/\//i, '');
-    normalized = normalized.replace(/\/+$/, '');
-    return normalized;
-}
-async function selectRegion() {
-    output_1.default.normal(texts_1.TXT_LOGIN_SELECT_REGION);
-    const index = await output_1.default.inputMenu([
-        'US (default)',
-        'EU',
-        'Asia',
-        'On-premises',
-    ]);
-    if (index === 0)
-        return utils_1.REST_API_REGION.US;
-    if (index === 1)
-        return utils_1.REST_API_REGION.EU;
-    if (index === 2)
-        return utils_1.REST_API_REGION.AS;
-    return utils_1.REST_API_REGION.ONPREM;
-}
-async function restApiBaseUrl() {
-    output_1.default.normal(texts_1.TXT_LOGIN_ENTER_BASE_URL);
-    const str = await output_1.default.inputString();
-    const normalized = normalizeBaseUrl(str);
-    if (!normalized) {
-        output_1.default.exitError(texts_1.ERR_LOGIN_INVALID_BASE_URL);
-    }
-    return `${normalized}/api`;
-}
 async function oauthServer(api, clientId, clientSecret) {
     return new Promise((resolve, reject) => {
         const s = node_http_1.default.createServer(async (req, res) => {
@@ -182,11 +151,11 @@ commandLogin.action(async (options) => {
         region = input_1.default.restApiRegion(region);
     }
     else {
-        region = await selectRegion();
+        region = await output_1.default.selectRegion();
     }
     if (!api) {
         if (region === utils_1.REST_API_REGION.ONPREM) {
-            api = await restApiBaseUrl();
+            api = await output_1.default.inputApiBaseUrl();
         }
         else if (region === utils_1.REST_API_REGION.AS) {
             api = utils_1.REST_API_ENDPOINT.AS;

package/distTs/src/command/package/docker/login.js

@@ -8,8 +8,11 @@ const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
 const commandPackageDockerLogin = (0, utils_1.newCommand)('login', texts_1.DESC_COMMAND_PACKAGE_DOCKER_LOGIN);
-commandPackageDockerLogin.action(async () => {
-    const client = input_1.default.restApiTokenClient();
+commandPackageDockerLogin.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
+commandPackageDockerLogin.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
+commandPackageDockerLogin.option('--region <region>', texts_1.OPTION_REST_API_REGION);
+commandPackageDockerLogin.action(async (options) => {
+    const client = input_1.default.restApiTokenClient(false, options.api, options.region, options.token);
     await client.getInvoker();
     const host = (0, utils_1.getDockerRegistryHostByApiBaseUrl)(client.baseUrl);
     const output = await (0, utils_1.execLocally)(`docker login ${host} -u buddy -p "${client.token}"`);

package/distTs/src/input.js

@@ -302,8 +302,8 @@ class Input {
         }
         return type;
     }
-    static restApiToken(allowNoToken = false) {
-        let t = process.env.BUDDY_TOKEN;
+    static restApiToken(allowNoToken = false, token = '') {
+        let t = token || process.env.BUDDY_TOKEN;
         let rf = '';
         let cid = '';
         let cs = '';
@@ -326,9 +326,9 @@ class Input {
             clientToken: ct,
         };
     }
-    static restApiTokenClient(allowNoToken = false) {
-        const baseUrl = this.restApiBaseUrl();
-        const { token: t, refreshToken, clientId, clientToken, clientSecret, } = this.restApiToken(allowNoToken);
+    static restApiTokenClient(allowNoToken = false, api = '', region = '', token = '') {
+        const baseUrl = this.restApiBaseUrl(api, region);
+        const { token: t, refreshToken, clientId, clientToken, clientSecret, } = this.restApiToken(allowNoToken, token);
         return new client_1.default(baseUrl, t, refreshToken, clientId, clientSecret, clientToken);
     }
     static packageType(type) {
@@ -424,12 +424,12 @@ class Input {
             output_1.default.exitError(texts_1.ERR_REST_API_REGION);
         }
     }
-    static restApiBaseUrl() {
-        let u = process.env.BUDDY_API_ENDPOINT;
+    static restApiBaseUrl(api = '', region = '') {
+        let u = api || process.env.BUDDY_API_ENDPOINT;
         if (!u)
             u = cfg_1.default.getBaseUrl();
         if (!u) {
-            const r = process.env.BUDDY_REGION;
+            const r = region || process.env.BUDDY_REGION;
             if (r?.toLowerCase() === utils_1.REST_API_REGION.EU) {
                 u = utils_1.REST_API_ENDPOINT.EU;
             }

package/distTs/src/output.js

@@ -12,6 +12,7 @@ const tunnels_1 = __importDefault(require("./tunnel/output/noninteractive/config
 const texts_1 = require("./texts");
 const tunnels_2 = __importDefault(require("./tunnel/output/noninteractive/agent/tunnels"));
 const context_1 = require("./visualTest/context");
+const utils_1 = require("./utils");
 const terminal = termkit_no_lazy_require_1.default.terminal;
 class Output {
     static s;
@@ -257,6 +258,32 @@ class Output {
             index += 1;
         return projects[index - 1].name;
     }
+    static async inputApiBaseUrl() {
+        Output.normal(texts_1.TXT_LOGIN_ENTER_BASE_URL);
+        const str = await Output.inputString();
+        let normalized = str.trim().replace(/^https?:\/\//i, '');
+        normalized = normalized.replace(/\/+$/, '');
+        if (!normalized) {
+            Output.exitError(texts_1.ERR_LOGIN_INVALID_BASE_URL);
+        }
+        return `${normalized}/api`;
+    }
+    static async selectRegion() {
+        Output.normal(texts_1.TXT_LOGIN_SELECT_REGION);
+        const index = await Output.inputMenu([
+            'US (default)',
+            'EU',
+            'Asia',
+            'On-premises',
+        ]);
+        if (index === 0)
+            return utils_1.REST_API_REGION.US;
+        if (index === 1)
+            return utils_1.REST_API_REGION.EU;
+        if (index === 2)
+            return utils_1.REST_API_REGION.AS;
+        return utils_1.REST_API_REGION.ONPREM;
+    }
     static exitError(err) {
         this.killSpinner();
         terminal.fullscreen(false);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.17.21-dev",
+  "version": "1.17.22-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {