npm - bdy - Versions diffs - 1.16.14-dev → 1.16.16-dev - Mend

bdy 1.16.14-dev → 1.16.16-dev

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/distTs/package.json +2 -1
package/distTs/src/api/client.js +37 -6
package/distTs/src/command/login.js +103 -46
package/distTs/src/command/whoami.js +31 -0
package/distTs/src/index.js +2 -0
package/distTs/src/texts.js +10 -3
package/distTs/src/tunnel/cfg.js +17 -0
package/distTs/src/tunnel/server/http1.js +11 -6
package/distTs/src/tunnel/server/http2.js +14 -6
package/package.json +2 -1

package/distTs/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.16.14-dev",
+  "version": "1.16.16-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -31,6 +31,7 @@
     "eventsource": "4.0.0",
     "fastify": "4.28.1",
     "fdir": "6.5.0",
+    "open": "11.0.0",
     "fflate": "0.8.2",
     "human-id": "^4.1.3",
     "isbinaryfile": "5.0.2",

package/distTs/src/api/client.js CHANGED Viewed

@@ -21,18 +21,24 @@ class ApiClient {
             },
         });
     }
-    async request(method, path, body, parseResponseBody = false, rawResponseBody = false) {
-        const headers = {
-            authorization: `Bearer ${this.token}`,
-        };
+    async request(method, path, body, parseResponseBody = false, rawResponseBody = false, httpUrlEncoded = false) {
+        const headers = {};
+        if (this.token)
+            headers.authorization = `Bearer ${this.token}`;
         let bodyParsed = undefined;
         if (body) {
             if (body instanceof undici_1.FormData) {
                 bodyParsed = body;
             }
             else {
-                headers['content-type'] = 'application/json; charset=utf-8';
-                bodyParsed = JSON.stringify(body);
+                if (httpUrlEncoded) {
+                    headers['content-type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+                    bodyParsed = new URLSearchParams(body).toString();
+                }
+                else {
+                    headers['content-type'] = 'application/json; charset=utf-8';
+                    bodyParsed = JSON.stringify(body);
+                }
             }
         }
         const opts = {
@@ -138,6 +144,9 @@ class ApiClient {
     async getPipelineRun(workspace, project, pipelineId, executionId) {
         return await this.request('GET', `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/pipelines/${encodeURIComponent(pipelineId)}/executions/${encodeURIComponent(executionId)}`, null, true);
     }
+    async getInvoker() {
+        return await this.request('GET', '/user', null, true);
+    }
     async postPipelineRun(workspace, project, pipelineId, body) {
         return await this.request('POST', `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/pipelines/${encodeURIComponent(pipelineId)}/executions`, body, true);
     }
@@ -169,6 +178,28 @@ class ApiClient {
     async stopSandbox(workspace, sandboxId) {
         return await this.request('POST', `/workspaces/${encodeURIComponent(workspace)}/sandboxes/${encodeURIComponent(sandboxId)}/stop`, {}, true);
     }
+    async registerApp(name, redirectUrl) {
+        return await this.request('POST', '/auth/register', {
+            redirect_uris: [redirectUrl],
+            client_name: name,
+            grant_types: ['authorization_code', 'refresh_token'],
+            response_types: ['code'],
+            token_endpoint_auth_method: "client_secret_basic",
+            token_expires_in: 3600
+        }, true);
+    }
+    async getApp(clientId) {
+        return await this.request('GET', `/auth/register/${encodeURIComponent(clientId)}`, null, true);
+    }
+    async exchangeAppToken(code, clientId, clientSecret, redirectUrl) {
+        return await this.request('POST', '/oauth2/token', {
+            grant_type: 'authorization_code',
+            code,
+            client_id: clientId,
+            client_secret: clientSecret,
+            redirect_uri: redirectUrl
+        }, true, false, true);
+    }
     async restartSandbox(workspace, sandboxId) {
         return await this.request('POST', `/workspaces/${encodeURIComponent(workspace)}/sandboxes/${encodeURIComponent(sandboxId)}/restart`, {}, true);
     }

package/distTs/src/command/login.js CHANGED Viewed

@@ -6,21 +6,15 @@ 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 node_http_1 = __importDefault(require("node:http"));
+const open_1 = __importDefault(require("open"));
 const texts_1 = require("../texts");
 const utils_1 = require("../utils");
 const input_1 = __importDefault(require("../input"));
-function getSecurityUrl(region, baseUrl) {
-    switch (region) {
-        case utils_1.REST_API_REGION.US:
-            return 'https://app.buddy.works/security';
-        case utils_1.REST_API_REGION.EU:
-            return 'https://eu.buddy.works/security';
-        case utils_1.REST_API_REGION.AS:
-            return 'https://asia.buddy.works/security';
-        default:
-            return `https://${baseUrl}/security`;
-    }
-}
+const OAUTH_CLIENT_APP_PORT = 7596;
+const OAUTH_CLIENT_APP_HOST = 'localhost';
+const OAUTH_CLIENT_APP_REDIRECT_URL = `http://localhost:${OAUTH_CLIENT_APP_PORT}`;
+const OAUTH_CLIENT_APP_SCOPES = 'WORKSPACE USER_INFO EXECUTION_MANAGE SANDBOX_MANAGE';
 function normalizeBaseUrl(url) {
     let normalized = url.trim();
     normalized = normalized.replace(/^https?:\/\//i, '');
@@ -52,10 +46,96 @@ async function restApiBaseUrl() {
     }
     return `${normalized}/api`;
 }
-async function inputToken(region, baseUrl) {
-    const securityUrl = getSecurityUrl(region, baseUrl);
-    output_1.default.normal((0, texts_1.TXT_LOGIN_ENTER_TOKEN)(securityUrl));
-    return await output_1.default.inputString();
+async function oauthServer(api, clientId, clientSecret) {
+    return new Promise((resolve, reject) => {
+        const s = node_http_1.default.createServer(async (req, res) => {
+            const url = new URL(req.url || '', `http://${OAUTH_CLIENT_APP_HOST}`);
+            const urlCode = url.searchParams.get('code');
+            if (!urlCode) {
+                res.end(texts_1.ERR_LOGIN_HTTP_FAILED);
+                s.close();
+                reject(new Error(texts_1.ERR_LOGIN_HTTP_FAILED));
+                return;
+            }
+            const client = new client_1.default(new URL(`https://${api}`));
+            try {
+                const response = await client.exchangeAppToken(urlCode, clientId, clientSecret, OAUTH_CLIENT_APP_REDIRECT_URL);
+                res.end(texts_1.ERR_LOGIN_HTTP_SUCCESS);
+                s.close();
+                resolve(response.access_token);
+            }
+            catch {
+                res.end(texts_1.ERR_LOGIN_HTTP_FAILED);
+                s.close();
+                reject(new Error(texts_1.ERR_LOGIN_HTTP_FAILED));
+                return;
+            }
+        });
+        s.on('error', () => {
+            s.close();
+            reject(texts_1.ERR_LOGIN_HTTP_SERVER_PORT_TAKEN);
+        });
+        s.listen(OAUTH_CLIENT_APP_PORT, OAUTH_CLIENT_APP_HOST);
+        (0, open_1.default)(`https://${api}/oauth2/authorize?type=web_server&client_id=${encodeURIComponent(clientId)}&redirect_uri=${encodeURIComponent(OAUTH_CLIENT_APP_REDIRECT_URL)}&response_type=code&scope=${encodeURIComponent(OAUTH_CLIENT_APP_SCOPES)}`);
+    });
+}
+async function getOrCreateApp(api) {
+    const client = new client_1.default(new URL(`https://${api}`));
+    let clientId = cfg_1.default.getApiClientId();
+    let clientSecret = cfg_1.default.getApiClientSecret();
+    if (clientId && clientSecret) {
+        try {
+            await client.getApp(clientId);
+        }
+        catch {
+            clientId = null;
+            clientSecret = null;
+        }
+    }
+    if (!clientId || !clientSecret) {
+        const app = await client.registerApp('bdy cli app', OAUTH_CLIENT_APP_REDIRECT_URL);
+        clientId = app.client_id;
+        clientSecret = app.client_secret;
+        cfg_1.default.setApiClient(clientId, clientSecret);
+    }
+    return {
+        clientId,
+        clientSecret,
+    };
+}
+async function authorizeOAuth(api) {
+    const { clientId, clientSecret } = await getOrCreateApp(api);
+    return await oauthServer(api, clientId, clientSecret);
+}
+async function authorizeToken(api, token, workspace, project) {
+    const client = new client_1.default(new URL(`https://${api}`), token);
+    const w = await client.getWorkspaces();
+    if (!w.workspaces?.length) {
+        output_1.default.exitError(texts_1.ERR_LOGIN_NO_WORKSPACES);
+    }
+    if (workspace) {
+        const found = w.workspaces.find((w) => w.domain === workspace);
+        if (!found) {
+            output_1.default.exitError(texts_1.ERR_LOGIN_NO_WORKSPACE_FOUND);
+        }
+    }
+    else {
+        workspace = await output_1.default.selectWorkspace(w.workspaces);
+    }
+    cfg_1.default.setApiToken(token);
+    cfg_1.default.setWorkspace(workspace);
+    const p = await client.getProjects(workspace);
+    if (project) {
+        const found = p.projects.find((p) => p.name === project);
+        if (!found) {
+            output_1.default.exitError(texts_1.ERR_LOGIN_NO_PROJECT_FOUND);
+        }
+    }
+    else {
+        project = await output_1.default.selectProject(p.projects);
+    }
+    cfg_1.default.setProject(project);
+    output_1.default.exitSuccess(texts_1.TXT_LOGIN_SUCCESS);
 }
 const commandLogin = (0, utils_1.newCommand)('login', texts_1.DESC_COMMAND_LOGIN);
 commandLogin.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -68,9 +148,9 @@ commandLogin.action(async (options) => {
     cfg_1.default.clearLogin();
     let api = options.api || process.env.BUDDY_API_ENDPOINT;
     let region = options.region || process.env.BUDDY_REGION;
-    let token = options.token || process.env.BUDDY_TOKEN;
-    let workspace = options.workspace || process.env.BUDDY_WORKSPACE;
-    let project = options.project || process.env.BUDDY_PROJECT;
+    const token = options.token || process.env.BUDDY_TOKEN;
+    const workspace = options.workspace || process.env.BUDDY_WORKSPACE;
+    const project = options.project || process.env.BUDDY_PROJECT;
     if (api) {
         region = utils_1.REST_API_REGION.ONPREM;
     }
@@ -96,35 +176,12 @@ commandLogin.action(async (options) => {
     }
     cfg_1.default.setBaseUrl(api);
     if (!token) {
-        token = await inputToken(region, api);
-    }
-    const client = new client_1.default(new URL(`https://${api}`), token);
-    const w = await client.getWorkspaces();
-    if (!w.workspaces?.length) {
-        output_1.default.exitError(texts_1.ERR_LOGIN_NO_WORKSPACES);
-    }
-    if (workspace) {
-        const found = w.workspaces.find((w) => w.domain === workspace);
-        if (!found) {
-            output_1.default.exitError(texts_1.ERR_LOGIN_NO_WORKSPACE_FOUND);
-        }
+        output_1.default.normal(texts_1.TXT_LOGIN_OAUTH);
+        const token = await authorizeOAuth(api);
+        await authorizeToken(api, token, workspace, project);
     }
     else {
-        workspace = await output_1.default.selectWorkspace(w.workspaces);
+        await authorizeToken(api, token, workspace, project);
     }
-    cfg_1.default.setApiToken(token);
-    cfg_1.default.setWorkspace(workspace);
-    const p = await client.getProjects(workspace);
-    if (project) {
-        const found = p.projects.find((p) => p.name === project);
-        if (!found) {
-            output_1.default.exitError(texts_1.ERR_LOGIN_NO_PROJECT_FOUND);
-        }
-    }
-    else {
-        project = await output_1.default.selectProject(p.projects);
-    }
-    cfg_1.default.setProject(project);
-    output_1.default.exitSuccess(texts_1.TXT_LOGIN_SUCCESS);
 });
 exports.default = commandLogin;

package/distTs/src/command/whoami.js ADDED Viewed

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../utils");
+const texts_1 = require("../texts");
+const cfg_1 = __importDefault(require("../tunnel/cfg"));
+const output_1 = __importDefault(require("../output"));
+const input_1 = __importDefault(require("../input"));
+const client_1 = __importDefault(require("../api/client"));
+const commandWhoami = (0, utils_1.newCommand)('whoami', texts_1.DESC_COMMAND_WHOAMI);
+commandWhoami.action(async () => {
+    const token = cfg_1.default.getApiToken();
+    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 user = await client.getInvoker();
+    if (!user) {
+        output_1.default.exitError(texts_1.ERR_WHOAMI_LOGOUT);
+    }
+    output_1.default.normal(user.name);
+    output_1.default.normal(`Workspace: ${!workspace ? texts_1.TXT_WHOAMI_NO_WORKSPACE : workspace}`);
+    output_1.default.normal(`Project: ${!project ? texts_1.TXT_WHOAMI_NO_PROJECT : project}`);
+    output_1.default.exitNormal();
+});
+exports.default = commandWhoami;

package/distTs/src/index.js CHANGED Viewed

@@ -20,6 +20,7 @@ const login_1 = __importDefault(require("./command/login"));
 const logout_1 = __importDefault(require("./command/logout"));
 const workspace_1 = __importDefault(require("./command/workspace"));
 const project_1 = __importDefault(require("./command/project"));
+const whoami_1 = __importDefault(require("./command/whoami"));
 stream_1.default.setDefaultHighWaterMark(false, 67108864);
 process.title = 'bdy';
 process.on('uncaughtException', (err) => {
@@ -40,6 +41,7 @@ program.addCommand(ut_1.default);
 program.addCommand(pipeline_1.default);
 program.addCommand(sandbox_1.default);
 program.addCommand(login_1.default);
+program.addCommand(whoami_1.default);
 program.addCommand(logout_1.default);
 program.addCommand(workspace_1.default);
 program.addCommand(project_1.default);

package/distTs/src/texts.js CHANGED Viewed

@@ -9,7 +9,7 @@ exports.LOG_SOCKET_DISCONNECTED = exports.LOG_SOCKET_CONNECTED = exports.LOG_AGE
 exports.DEBUG_AUTO_SCROLL = exports.DEBUG_RESOURCE_SCRAPPING_URL = exports.DEBUG_SNAPSHOT_PROCESSING = exports.DEBUG_SNAPSHOTS_PROCESSING = exports.DEBUG_EXEC_COMMAND = exports.DEBUG_EXEC_TEST_COMMAND = exports.LOG_INSTALLED_BROWSER = exports.LOG_SESSION_LINK = exports.LOG_SENDING_DATA = exports.LOG_SENDING_REQUEST = exports.LOG_PROCESSING_SNAPSHOTS = exports.LOG_RUNNING_EXEC_COMMAND = exports.LOG_TUNNEL_SSH_STREAM = exports.LOG_TUNNEL_TLS_AGENT_STREAM = exports.LOG_TUNNEL_TLS_REGION_STREAM = exports.LOG_TUNNEL_TLS_TARGET_STREAM = exports.LOG_TUNNEL_HTTP2_STREAM = exports.LOG_TUNNEL_HTTP1_STREAM = exports.LOG_TUNNEL_TCP_STREAM = exports.LOG_TUNNEL_HTTP_WRONG_USER_AGENTS = exports.LOG_TUNNEL_HTTP_CIRCUIT_BREAKER_OPEN = exports.LOG_TUNNEL_HTTP_RATE_LIMIT = exports.LOG_TUNNEL_HTTP_WRON_AUTH = exports.LOG_TUNNEL_IDENTIFIED = exports.LOG_TUNNEL_DISCONNECTED = exports.LOG_TUNNEL_FAILED = exports.LOG_TUNNEL_CONNECTED = exports.LOG_AGENT_STARTED = exports.LOG_AGENT_SERVER_STARTED = exports.LOG_ERROR_STARTING_AGENT_SERVER = exports.LOG_SSH_CONNECTION = exports.LOG_WRONG_STREAM = exports.LOG_DETECTED_STREAM = exports.LOG_HTTP2_REQUEST = exports.LOG_HTTP2_CONNECTION = exports.LOG_HTTP1_REQUEST = exports.LOG_HTTP1_CONNECTION = exports.LOG_ERROR = exports.LOG_STOPPING_TUNNEL = exports.LOG_STARTING_TUNNEL = exports.LOG_ENABLING_AGENT_TARGET = exports.LOG_DISABLING_AGENT_TARGET = exports.LOG_REMOVING_TUNNEL = exports.LOG_TUNNEL_REGISTERED = exports.LOG_ERROR_WHILE_REFRESHING_AGENT = exports.LOG_REGISTERING_TUNNEL = exports.LOG_GETTING_AGENT = exports.LOG_UNREGISTERING_AGENT = exports.LOG_REGION_DETECTED = exports.LOG_AGENT_REGISTERED = void 0;
 exports.TXT_SANDBOX_STOPPED = exports.TXT_SANDBOX_STARTED = exports.TXT_SANDBOX_DESTROYED = exports.TXT_SANDBOX_CREATED = exports.TXT_SANDBOX_CREATING = exports.OPTION_SANDBOX_COMMAND_LAST = exports.OPTION_SANDBOX_WAIT_TIMEOUT = exports.OPTION_SANDBOX_WAIT = exports.OPTION_SANDBOX_WAIT_APP = exports.OPTION_SANDBOX_WAIT_CONFIGURED = exports.OPTION_SANDBOX_WAIT_RUNNING = exports.ERR_SANDBOX_STOP_FAILED = exports.ERR_SANDBOX_NO_COMMANDS = exports.ERR_SANDBOX_RUNNING_FAILED = exports.ERR_SANDBOX_STOP_TIMEOUT = exports.ERR_SANDBOX_SNAPSHOT_TIMEOUT = exports.ERR_SANDBOX_RUNNING_TIMEOUT = exports.ERR_SANDBOX_APP_TIMEOUT = exports.ERR_SANDBOX_SETUP_TIMEOUT = exports.ERR_SANDBOX_APP_FAILED = exports.ERR_SANDBOX_SETUP_FAILED = exports.ERR_SANDBOX_INVALID_RUNTIME = exports.ERR_SANDBOX_INVALID_RESOURCES = exports.ERR_SANDBOX_NOT_FOUND = exports.OPTION_SANDBOX_COMMAND = exports.OPTION_SANDBOX_DETACHED = exports.OPTION_SANDBOX_RUNTIME = exports.OPTION_SANDBOX_APP_TYPE = exports.OPTION_SANDBOX_APP_DIR = exports.OPTION_SANDBOX_RUN_COMMAND = exports.OPTION_SANDBOX_TAGS = exports.OPTION_SANDBOX_INSTALL_COMMANDS = exports.OPTION_SANDBOX_RESOURCES = exports.OPTION_SANDBOX_OS = exports.OPTION_SANDBOX_NAME = exports.OPTION_SANDBOX_IDENTIFIER = exports.DESC_COMMAND_SANDBOX_EXEC = exports.DESC_COMMAND_SANDBOX_STATUS = exports.DESC_COMMAND_SANDBOX_RESTART = exports.DESC_COMMAND_SANDBOX_STOP = exports.DESC_COMMAND_SANDBOX_START = exports.DESC_COMMAND_SANDBOX_DESTROY = exports.DESC_COMMAND_SANDBOX_GET = exports.DESC_COMMAND_SANDBOX_LIST = exports.DESC_COMMAND_SANDBOX_CREATE = exports.DESC_COMMAND_SANDBOX = exports.DEBUG_WAIT_FOR_IDLE_TIMEOUT = exports.DEBUG_WAIT_FOR_IDLE = exports.DEBUG_RESOURCE_DISCOVERY_TIMEOUT = exports.DEBUG_AUTO_WIDTH = void 0;
 exports.TXT_SANDBOX_EXEC_BACKGROUND = exports.TXT_SANDBOX_EXEC_ID = exports.ERR_SANDBOX_CP_INVALID_DEST = exports.ERR_SANDBOX_CP_SOURCE_NOT_FOUND = exports.TXT_SANDBOX_CP_DONE = exports.TXT_SANDBOX_CP_PROGRESS = exports.OPTION_SANDBOX_CP_SILENT = exports.OPTION_SANDBOX_CP_DEST = exports.OPTION_SANDBOX_CP_SOURCE = exports.DESC_COMMAND_SANDBOX_CP = exports.ERR_SANDBOX_ENDPOINTS_NOT_FOUND = exports.ERR_SANDBOX_ENDPOINT_NOT_FOUND = exports.ERR_SANDBOX_ENDPOINT_EXISTS = exports.TXT_SANDBOX_ENDPOINT_DELETED = exports.TXT_SANDBOX_ENDPOINT_ADDED = exports.OPTION_SANDBOX_ENDPOINT_TYPE = exports.OPTION_SANDBOX_ENDPOINT_PORT = exports.OPTION_SANDBOX_ENDPOINT_NAME_ARG = exports.OPTION_SANDBOX_ENDPOINT_NAME = exports.DESC_COMMAND_SANDBOX_ENDPOINT_DELETE = exports.DESC_COMMAND_SANDBOX_ENDPOINT_ADD = exports.DESC_COMMAND_SANDBOX_ENDPOINT_GET = exports.DESC_COMMAND_SANDBOX_ENDPOINT_LIST = exports.DESC_COMMAND_SANDBOX_ENDPOINT = exports.ERR_SANDBOX_SNAPSHOTS_NOT_FOUND = exports.ERR_SANDBOX_SNAPSHOT_NOT_FOUND = exports.ERR_SANDBOX_SNAPSHOT_FAILED = exports.TXT_SANDBOX_SNAPSHOT_WAITING = exports.TXT_SANDBOX_SNAPSHOT_DELETED = exports.TXT_SANDBOX_SNAPSHOT_CREATED = exports.OPTION_SANDBOX_FROM_SNAPSHOT = exports.OPTION_SANDBOX_SNAPSHOT_NAME_ARG = exports.OPTION_SANDBOX_SNAPSHOT_NAME = exports.DESC_COMMAND_SANDBOX_SNAPSHOT_DELETE = exports.DESC_COMMAND_SANDBOX_SNAPSHOT_GET = exports.DESC_COMMAND_SANDBOX_SNAPSHOT_CREATE = exports.DESC_COMMAND_SANDBOX_SNAPSHOT_LIST = exports.DESC_COMMAND_SANDBOX_SNAPSHOT = exports.TXT_SANDBOX_COMMAND_KILLED = exports.OPTION_SANDBOX_COMMAND_FOLLOW = exports.OPTION_SANDBOX_COMMAND_ID = exports.DESC_COMMAND_SANDBOX_EXEC_KILL = exports.DESC_COMMAND_SANDBOX_EXEC_LOGS = exports.DESC_COMMAND_SANDBOX_EXEC_STATUS = exports.DESC_COMMAND_SANDBOX_EXEC_LIST = exports.TXT_SANDBOX_WAITING_START = exports.TXT_SANDBOX_WAITING_STOP = exports.TXT_SANDBOX_WAITING_APP = exports.TXT_SANDBOX_WAITING_SETUP = exports.TXT_SANDBOX_WAITING_RUNNING = void 0;
-exports.TXT_PROJECT_NONE = exports.ERR_PROJECT_NO_PROJECTS = exports.ERR_PROJECT_NOT_FOUND = exports.TXT_LOGIN_SELECT_PROJECT = exports.TXT_PROJECT_SET_CLEARED = exports.TXT_PROJECT_SET_SUCCESS = exports.DESC_COMMAND_PROJECT_GET = exports.ARG_COMMAND_PROJECT_NAME = exports.DESC_COMMAND_PROJECT_SET = exports.DESC_COMMAND_PROJECT_LIST = exports.DESC_COMMAND_PROJECT = exports.ERR_LOGIN_INVALID_BASE_URL = exports.ERR_LOGIN_NO_PROJECT_FOUND = exports.ERR_LOGIN_NO_WORKSPACE_FOUND = exports.ERR_LOGIN_NO_WORKSPACES = exports.TXT_LOGIN_SUCCESS = exports.TXT_LOGIN_SELECT_WORKSPACE = exports.TXT_LOGIN_ENTER_TOKEN = exports.TXT_LOGIN_ENTER_BASE_URL = exports.TXT_LOGIN_SELECT_REGION = exports.TXT_WORKSPACE_NONE = exports.TXT_WORKSPACE_SET_SUCCESS = exports.ARG_COMMAND_WORKSPACE = exports.DESC_COMMAND_WORKSPACE_GET = exports.DESC_COMMAND_WORKSPACE_SET = exports.DESC_COMMAND_WORKSPACE_LIST = exports.DESC_COMMAND_WORKSPACE = exports.TXT_LOGOUT_SUCCESS = exports.DESC_COMMAND_LOGOUT = exports.DESC_COMMAND_LOGIN = exports.TXT_SANDBOX_EXEC_FAILED = exports.TXT_SANDBOX_EXEC_INPROGRESS = exports.TXT_SANDBOX_EXEC_SUCCESS = void 0;
+exports.TXT_PROJECT_NONE = exports.ERR_PROJECT_NO_PROJECTS = exports.ERR_PROJECT_NOT_FOUND = exports.TXT_LOGIN_SELECT_PROJECT = exports.TXT_PROJECT_SET_CLEARED = exports.TXT_PROJECT_SET_SUCCESS = exports.DESC_COMMAND_PROJECT_GET = exports.ARG_COMMAND_PROJECT_NAME = exports.DESC_COMMAND_PROJECT_SET = exports.DESC_COMMAND_PROJECT_LIST = exports.DESC_COMMAND_PROJECT = exports.ERR_LOGIN_INVALID_BASE_URL = exports.ERR_LOGIN_NO_PROJECT_FOUND = exports.ERR_LOGIN_NO_WORKSPACE_FOUND = exports.ERR_LOGIN_NO_WORKSPACES = exports.ERR_LOGIN_HTTP_SUCCESS = exports.ERR_LOGIN_HTTP_FAILED = exports.TXT_LOGIN_OAUTH = exports.ERR_LOGIN_HTTP_SERVER_PORT_TAKEN = exports.TXT_LOGIN_SUCCESS = exports.TXT_LOGIN_SELECT_WORKSPACE = exports.TXT_LOGIN_ENTER_BASE_URL = exports.TXT_LOGIN_SELECT_REGION = exports.TXT_WORKSPACE_NONE = exports.TXT_WORKSPACE_SET_SUCCESS = exports.ARG_COMMAND_WORKSPACE = exports.DESC_COMMAND_WORKSPACE_GET = exports.DESC_COMMAND_WORKSPACE_SET = exports.DESC_COMMAND_WORKSPACE_LIST = exports.DESC_COMMAND_WORKSPACE = exports.TXT_LOGOUT_SUCCESS = exports.DESC_COMMAND_LOGOUT = exports.DESC_COMMAND_LOGIN = exports.ERR_WHOAMI_LOGOUT = exports.TXT_WHOAMI_NO_PROJECT = exports.TXT_WHOAMI_NO_WORKSPACE = exports.DESC_COMMAND_WHOAMI = exports.TXT_SANDBOX_EXEC_FAILED = exports.TXT_SANDBOX_EXEC_INPROGRESS = exports.TXT_SANDBOX_EXEC_SUCCESS = void 0;
 const utils_1 = require("./utils");
 exports.ERR_REST_API_GENERAL_ERROR = 'Something went wrong';
 exports.ERR_REST_API_CONNECT_ERROR = 'Connection refused. Check selected endpoint';
@@ -563,6 +563,11 @@ const TXT_SANDBOX_EXEC_INPROGRESS = (id) => `Command in progress: ${id}`;
 exports.TXT_SANDBOX_EXEC_INPROGRESS = TXT_SANDBOX_EXEC_INPROGRESS;
 const TXT_SANDBOX_EXEC_FAILED = (id) => `Command failed: ${id}`;
 exports.TXT_SANDBOX_EXEC_FAILED = TXT_SANDBOX_EXEC_FAILED;
+// Whoami command
+exports.DESC_COMMAND_WHOAMI = 'Check login information';
+exports.TXT_WHOAMI_NO_WORKSPACE = 'Not set. Run `bdy ws set` to set a workspace';
+exports.TXT_WHOAMI_NO_PROJECT = 'Not set. Run `bdy proj set` to set a project';
+exports.ERR_WHOAMI_LOGOUT = 'Not logged in. Run `bdy login` to authenticate.';
 // Login command
 exports.DESC_COMMAND_LOGIN = 'Log in to Buddy';
 exports.DESC_COMMAND_LOGOUT = 'Log out from Buddy';
@@ -578,10 +583,12 @@ exports.TXT_WORKSPACE_SET_SUCCESS = TXT_WORKSPACE_SET_SUCCESS;
 exports.TXT_WORKSPACE_NONE = 'No workspace configured. Run "bdy login" or "bdy workspace set" first.';
 exports.TXT_LOGIN_SELECT_REGION = 'Select region:';
 exports.TXT_LOGIN_ENTER_BASE_URL = 'Enter your Buddy instance URL (e.g., buddy.company.com):';
-const TXT_LOGIN_ENTER_TOKEN = (url) => `Enter your personal access token (get your personal access token at: ${url}):`;
-exports.TXT_LOGIN_ENTER_TOKEN = TXT_LOGIN_ENTER_TOKEN;
 exports.TXT_LOGIN_SELECT_WORKSPACE = 'Select workspace:';
 exports.TXT_LOGIN_SUCCESS = 'Logged in successfully!';
+exports.ERR_LOGIN_HTTP_SERVER_PORT_TAKEN = 'Cant start local http server to authorize';
+exports.TXT_LOGIN_OAUTH = 'Starting authorization process...';
+exports.ERR_LOGIN_HTTP_FAILED = 'Failed to authorize. Try again...';
+exports.ERR_LOGIN_HTTP_SUCCESS = 'Authorized. You can now safely close this browser tab';
 exports.ERR_LOGIN_NO_WORKSPACES = 'No workspaces found for this token';
 exports.ERR_LOGIN_NO_WORKSPACE_FOUND = 'Provided workspace has been not found';
 exports.ERR_LOGIN_NO_PROJECT_FOUND = 'Provided project has been not found';

package/distTs/src/tunnel/cfg.js CHANGED Viewed

@@ -172,6 +172,17 @@ class Cfg {
             this.json.apiToken = token;
         this.save();
     }
+    setApiClient(clientId, clientSecret) {
+        if (!clientId || !clientSecret) {
+            delete this.json.apiClientId;
+            delete this.json.apiClientSecret;
+        }
+        else {
+            this.json.apiClientId = clientId;
+            this.json.apiClientSecret = clientSecret;
+        }
+        this.save();
+    }
     setWhitelist(whitelist) {
         if (!whitelist || !whitelist.length)
             delete this.json.whitelist;
@@ -192,6 +203,12 @@ class Cfg {
     getApiToken() {
         return this.json.apiToken || '';
     }
+    getApiClientId() {
+        return this.json.apiClientId || '';
+    }
+    getApiClientSecret() {
+        return this.json.apiClientSecret || '';
+    }
     getTokenHost() {
         const token = this.getToken();
         if (!token) {

package/distTs/src/tunnel/server/http1.js CHANGED Viewed

@@ -11,9 +11,11 @@ const texts_1 = require("../../texts");
 const tunnel_1 = require("../../types/tunnel");
 class ServerHttp1 extends events_1.default {
     server;
+    host;
     constructor(host) {
         super();
-        this.server = http_1.default.createServer((req, res) => this.processRequest(req, res, host));
+        this.host = host;
+        this.server = http_1.default.createServer((req, res) => this.processRequest(req, res));
         this.server.on('connection', (socket) => {
             socket.id = (0, uuid_1.v4)();
             this.emit(tunnel_1.TUNNEL_HTTP_SOCKET.OPEN, socket);
@@ -46,7 +48,10 @@ class ServerHttp1 extends events_1.default {
             method: logRequest.method,
             setHost: false,
             path: logRequest.url,
-            headers: logRequest.headers,
+            headers: {
+                ...logRequest.headers,
+                host: this.host
+            },
         });
         if (logRequest.requestBody.data.length > 0)
             req.write(logRequest.requestBody.data);
@@ -60,9 +65,9 @@ class ServerHttp1 extends events_1.default {
         });
         req.end();
     }
-    checkHostHeader(req, res, host) {
+    checkHostHeader(req, res) {
         const headerHost = (req.headers.host || '').split(':')[0];
-        if (headerHost === host)
+        if (headerHost === this.host)
             return true;
         else {
             res.statusCode = 421;
@@ -70,8 +75,8 @@ class ServerHttp1 extends events_1.default {
             return false;
         }
     }
-    async processRequest(req, res, host) {
-        if (!this.checkHostHeader(req, res, host))
+    async processRequest(req, res) {
+        if (!this.checkHostHeader(req, res))
             return;
         logger_1.default.debug((0, texts_1.LOG_HTTP1_REQUEST)(req.method, req.url));
         this.emit(tunnel_1.TUNNEL_EVENT.HTTP_REQUEST, req, res);

package/distTs/src/tunnel/server/http2.js CHANGED Viewed

@@ -11,9 +11,11 @@ const texts_1 = require("../../texts");
 const tunnel_1 = require("../../types/tunnel");
 class ServerHttp2 extends events_1.default {
     server;
+    host;
     constructor(host) {
         super();
-        this.server = http2_1.default.createServer((req, res) => this.processRequest(req, res, host));
+        this.host = host;
+        this.server = http2_1.default.createServer((req, res) => this.processRequest(req, res));
         this.server.on('session', (session) => {
             session.id = (0, uuid_1.v4)();
             this.emit(tunnel_1.TUNNEL_EVENT.HTTP_SESSION_OPEN, session);
@@ -43,7 +45,10 @@ class ServerHttp2 extends events_1.default {
         let client = http2_1.default.connect(`http://localhost:${address.port}`, {
             maxSessionMemory: 100,
         });
-        let req = client.request(logRequest.headers);
+        let req = client.request({
+            ...logRequest.headers,
+            ':authority': this.host
+        });
         if (logRequest.requestBody.data.length > 0)
             req.write(logRequest.requestBody.data);
         req.on('response', () => {
@@ -64,9 +69,12 @@ class ServerHttp2 extends events_1.default {
         });
         req.end();
     }
-    checkHostHeader(req, res, host) {
+    checkHostHeader(req, res) {
+        logger_js_1.default.info('checkHostHeader');
+        logger_js_1.default.info(this.host);
+        logger_js_1.default.info(req.headers[':authority']);
         const headerHost = (req.headers[':authority'] || '').split(':')[0];
-        if (headerHost === host)
+        if (headerHost === this.host)
             return true;
         else {
             res.statusCode = 421;
@@ -74,8 +82,8 @@ class ServerHttp2 extends events_1.default {
             return false;
         }
     }
-    async processRequest(req, res, host) {
-        if (!this.checkHostHeader(req, res, host))
+    async processRequest(req, res) {
+        if (!this.checkHostHeader(req, res))
             return;
         logger_js_1.default.debug((0, texts_1.LOG_HTTP2_REQUEST)(req.method, req.url));
         this.emit(tunnel_1.TUNNEL_EVENT.HTTP_REQUEST, req, res);

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.16.14-dev",
+  "version": "1.16.16-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -31,6 +31,7 @@
     "eventsource": "4.0.0",
     "fastify": "4.28.1",
     "fdir": "6.5.0",
+    "open": "11.0.0",
     "fflate": "0.8.2",
     "human-id": "^4.1.3",
     "isbinaryfile": "5.0.2",