bdy 1.16.21-dev → 1.16.22-dev

package/distTs/src/command/sandbox/stop.js

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const commandSandboxStop = (0, utils_1.newCommand)('stop', texts_1.DESC_COMMAND_SANDBOX_STOP);
 commandSandboxStop.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxStop.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
@@ -18,11 +17,10 @@ commandSandboxStop.option('--wait', texts_1.OPTION_SANDBOX_WAIT);
 commandSandboxStop.option('--wait-timeout <seconds>', texts_1.OPTION_SANDBOX_WAIT_TIMEOUT, '300');
 commandSandboxStop.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxStop.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

package/distTs/src/command/whoami.js

@@ -27,13 +27,17 @@ const tryGetEmail = async (client) => {
 const commandWhoami = (0, utils_1.newCommand)('whoami', texts_1.DESC_COMMAND_WHOAMI);
 commandWhoami.action(async () => {
     const token = cfg_1.default.getApiToken();
+    const refreshToken = cfg_1.default.getApiRefreshApiToken();
+    const clientId = cfg_1.default.getApiClientId();
+    const clientSecret = cfg_1.default.getApiClientSecret();
+    const clientToken = cfg_1.default.getApiClientToken();
     const workspace = cfg_1.default.getWorkspace();
     const project = cfg_1.default.getProject();
     const baseUrl = input_1.default.restApiBaseUrl();
     if (!token) {
         output_1.default.exitError(texts_1.ERR_WHOAMI_LOGOUT);
     }
-    const client = new client_1.default(baseUrl, token);
+    const client = new client_1.default(baseUrl, token, refreshToken, clientId, clientSecret, clientToken);
     const user = await client.getInvoker();
     if (!user) {
         output_1.default.exitError(texts_1.ERR_WHOAMI_LOGOUT);

package/distTs/src/command/workspace/list.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
-const client_1 = __importDefault(require("../../api/client"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
@@ -14,9 +13,8 @@ commandWorkspaceList.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
 commandWorkspaceList.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandWorkspaceList.alias('ls');
 commandWorkspaceList.action(async (options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const response = await client.getWorkspaces();
     if (!response.workspaces || response.workspaces.length === 0) {
         output_1.default.normal('No workspaces found.');

package/distTs/src/command/workspace/set.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
-const client_1 = __importDefault(require("../../api/client"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
@@ -16,9 +15,8 @@ commandWorkspaceSet.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandWorkspaceSet.argument('[workspace]', texts_1.ARG_COMMAND_WORKSPACE);
 commandWorkspaceSet.action(async (workspaceDomain, options) => {
     output_1.default.handleSignals();
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const response = await client.getWorkspaces();
     if (!response.workspaces || response.workspaces.length === 0) {
         output_1.default.exitError(texts_1.ERR_LOGIN_NO_WORKSPACES);

package/distTs/src/input.js

@@ -47,6 +47,7 @@ const texts_1 = require("./texts");
 const tunnel_1 = require("./types/tunnel");
 const node_path_1 = __importStar(require("node:path"));
 const cfg_1 = __importDefault(require("./tunnel/cfg"));
+const client_1 = __importDefault(require("./api/client"));
 class Input {
     static timeout(timeout) {
         const t = parseInt(timeout, 10);
@@ -300,14 +301,27 @@ class Input {
     }
     static restApiToken(token) {
         let t = process.env.BUDDY_TOKEN;
+        let rf = '';
+        let cid = '';
+        let cs = '';
+        let ct = '';
         if (token)
             t = token;
-        if (!t)
+        if (!t) {
             t = cfg_1.default.getApiToken();
+            rf = cfg_1.default.getApiRefreshApiToken();
+            cid = cfg_1.default.getApiClientId();
+            cs = cfg_1.default.getApiClientSecret();
+            ct = cfg_1.default.getApiClientToken();
+        }
         if (!t) {
             output_1.default.exitError(texts_1.ERR_REST_API_TOKEN);
         }
-        return t;
+        return { token: t, refreshToken: rf, clientId: cid, clientSecret: cs, clientToken: ct };
+    }
+    static restApiTokenClient(baseUrl, token) {
+        const { token: t, refreshToken, clientId, clientToken, clientSecret } = this.restApiToken(token);
+        return new client_1.default(baseUrl, t, refreshToken, clientId, clientSecret, clientToken);
     }
     static pipelineRunPriority(priority) {
         if (!priority)

package/distTs/src/tunnel/cfg.js

@@ -30,7 +30,7 @@ class Cfg {
             throw new Error((0, texts_1.ERR_CANT_CREATE_DIR_IN_HOME)('.bdy'));
         }
         try {
-            (0, fs_1.chmodSync)(this.dir, 0o777);
+            (0, fs_1.chmodSync)(this.dir, 0o700);
         }
         catch {
             // do nothing
@@ -44,7 +44,7 @@ class Cfg {
             throw new Error((0, texts_1.ERR_CANT_CREATE_DIR_IN_HOME)('.bdy/cfg.json'));
         }
         try {
-            (0, fs_1.chmodSync)(this.file, 0o666);
+            (0, fs_1.chmodSync)(this.file, 0o600);
         }
         catch {
             // do nothing
@@ -172,14 +172,23 @@ class Cfg {
             this.json.apiToken = token;
         this.save();
     }
-    setApiClient(clientId, clientSecret) {
-        if (!clientId || !clientSecret) {
+    setApiRefreshToken(token) {
+        if (!token)
+            delete this.json.apiRefreshToken;
+        else
+            this.json.apiRefreshToken = token;
+        this.save();
+    }
+    setApiClient(clientId, clientSecret, clientToken) {
+        if (!clientId || !clientSecret || !clientToken) {
             delete this.json.apiClientId;
             delete this.json.apiClientSecret;
+            delete this.json.apiClientToken;
         }
         else {
             this.json.apiClientId = clientId;
             this.json.apiClientSecret = clientSecret;
+            this.json.apiClientToken = clientToken;
         }
         this.save();
     }
@@ -203,12 +212,18 @@ class Cfg {
     getApiToken() {
         return this.json.apiToken || '';
     }
+    getApiRefreshApiToken() {
+        return this.json.apiRefreshToken || '';
+    }
     getApiClientId() {
         return this.json.apiClientId || '';
     }
     getApiClientSecret() {
         return this.json.apiClientSecret || '';
     }
+    getApiClientToken() {
+        return this.json.apiClientToken || '';
+    }
     getTokenHost() {
         const token = this.getToken();
         if (!token) {
@@ -251,6 +266,10 @@ class Cfg {
     }
     clearLogin() {
         delete this.json.apiToken;
+        delete this.json.apiRefreshToken;
+        delete this.json.apiClientId;
+        delete this.json.apiClientSecret;
+        delete this.json.apiClientToken;
         delete this.json.workspace;
         delete this.json.project;
         delete this.json.baseUrl;
@@ -297,7 +316,7 @@ class Cfg {
             throw new Error((0, texts_1.ERR_CANT_CREATE_DIR_IN_HOME)('.bdy/cfg.json'));
         }
         try {
-            (0, fs_1.chmodSync)(this.file, 0o666);
+            (0, fs_1.chmodSync)(this.file, 0o600);
         }
         catch {
             // do nothing

package/distTs/src/visualTest/server.js

@@ -37,6 +37,7 @@ async function getParseDom() {
 function prepareSnapshotPlugin(data) {
     try {
         const validatedData = schemas_1.snapshotSchema.parse(data);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { version, ...snapshot } = validatedData;
         const cookies = snapshot.cookies.map((cookie) => {
             if (cookie.domain) {

package/package.json

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