@osaas/cli 4.24.1 → 4.25.0

package/dist/cli.js

@@ -41,6 +41,8 @@ const cmd_7 = __importDefault(require("./db/cmd"));
 const cmd_8 = require("./architect/cmd");
 const cmd_9 = require("./vod/cmd");
 const cmd_10 = require("./web/cmd");
+const login_1 = require("./login");
+const util_1 = require("./user/util");
 const cli = new commander_1.Command();
 // Read package.json
 const packageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', 'package.json'), 'utf8'));
@@ -48,6 +50,15 @@ cli.version(packageJson.version, '-v, --version', 'Output the current version');
 cli
     .configureHelp({ showGlobalOptions: true })
     .option('--env <environment>', 'Environment to use (overrides ENVIRONMENT env var)', process.env.ENVIRONMENT || 'prod');
+cli.addCommand((0, login_1.cmdLogin)());
+cli.hook('preAction', async (thisCommand) => {
+    const commandName = thisCommand.args?.[0] || thisCommand.name();
+    if (commandName !== 'login') {
+        const globalOpts = thisCommand.optsWithGlobals();
+        const environment = globalOpts?.env || 'prod';
+        await (0, util_1.ensureToken)(environment);
+    }
+});
 cli.addCommand((0, cmd_1.default)());
 cli.addCommand(cmdUser.cmdList());
 cli.addCommand(cmdUser.cmdCreate());

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2BAAkC;AAClC,+BAA4B;AAC5B,yCAAoC;AACpC,sDAAmC;AACnC,oDAAsC;AACtC,qDAAoC;AACpC,yDAAyC;AACzC,qDAAiC;AACjC,yDAAyC;AACzC,2DAA6C;AAC7C,mDAA6B;AAC7B,yCAA0C;AAC1C,mCAAmC;AACnC,oCAAmC;AAEnC,MAAM,GAAG,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE1B,oBAAoB;AACpB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAC5D,CAAC;AAEF,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,4BAA4B,CAAC,CAAC;AAEhF,GAAG;KACA,aAAa,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;KAC1C,MAAM,CACL,qBAAqB,EACrB,oDAAoD,EACpD,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,MAAM,CAClC,CAAC;AAEJ,GAAG,CAAC,UAAU,CAAC,IAAA,aAAQ,GAAE,CAAC,CAAC;AAC3B,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAClC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;AACtC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAClC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;AACrC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC;AACjD,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC;AACjD,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC;AAChD,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;AAC3C,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;AACrC,GAAG,CAAC,UAAU,CAAC,IAAA,aAAW,GAAE,CAAC,CAAC;AAC9B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAU,GAAE,CAAC,CAAC;AAC7B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAO,GAAE,CAAC,CAAC;AAC1B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAW,GAAE,CAAC,CAAC;AAC9B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAa,GAAE,CAAC,CAAC;AAChC,GAAG,CAAC,UAAU,CAAC,IAAA,aAAK,GAAE,CAAC,CAAC;AACxB,GAAG,CAAC,UAAU,CAAC,IAAA,aAAO,GAAE,CAAC,CAAC;AAC1B,GAAG,CAAC,UAAU,CAAC,IAAA,YAAM,GAAE,CAAC,CAAC;AACzB,GAAG,CAAC,UAAU,CAAC,IAAA,aAAM,GAAE,CAAC,CAAC;AACzB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/login.d.ts

@@ -0,0 +1,6 @@
+import { Command } from 'commander';
+export declare function saveToken(token: string, environment?: string): void;
+export declare function loadToken(environment?: string): string | undefined;
+export declare function login(environment?: string): Promise<string>;
+export declare function cmdLogin(): Command;
+//# sourceMappingURL=login.d.ts.map

package/dist/login.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../src/login.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,SAAS,GAAG,IAAI,CAKnE;AAED,wBAAgB,SAAS,CAAC,WAAW,SAAS,GAAG,MAAM,GAAG,SAAS,CAMlE;AA2BD,wBAAsB,KAAK,CAAC,WAAW,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CA+GjE;AAED,wBAAgB,QAAQ,YAmBvB"}

package/dist/login.js

@@ -0,0 +1,165 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cmdLogin = exports.login = exports.loadToken = exports.saveToken = void 0;
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_http_1 = __importDefault(require("node:http"));
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const node_os_1 = __importDefault(require("node:os"));
+const commander_1 = require("commander");
+const CLIENT_ID = 'cli';
+const TOKEN_DIR = (0, node_path_1.join)(node_os_1.default.homedir(), '.osc');
+function getTokenPath(environment) {
+    const suffix = !environment || environment === 'prod' ? '' : `-${environment}`;
+    return (0, node_path_1.join)(TOKEN_DIR, `token${suffix}`);
+}
+function saveToken(token, environment = 'prod') {
+    if (!(0, node_fs_1.existsSync)(TOKEN_DIR)) {
+        (0, node_fs_1.mkdirSync)(TOKEN_DIR, { mode: 0o700 });
+    }
+    (0, node_fs_1.writeFileSync)(getTokenPath(environment), token, { mode: 0o600 });
+}
+exports.saveToken = saveToken;
+function loadToken(environment = 'prod') {
+    const tokenPath = getTokenPath(environment);
+    if ((0, node_fs_1.existsSync)(tokenPath)) {
+        return (0, node_fs_1.readFileSync)(tokenPath, 'utf-8').trim();
+    }
+    return undefined;
+}
+exports.loadToken = loadToken;
+function getBaseUrl(environment) {
+    if (!environment || environment === 'prod') {
+        return 'https://app.osaas.io';
+    }
+    return `https://app.${environment}.osaas.io`;
+}
+function generateCodeVerifier() {
+    return node_crypto_1.default.randomBytes(32).toString('base64url');
+}
+function generateCodeChallenge(verifier) {
+    return node_crypto_1.default.createHash('sha256').update(verifier).digest('base64url');
+}
+function openBrowser(url) {
+    const command = process.platform === 'darwin'
+        ? 'open'
+        : process.platform === 'win32'
+            ? 'start'
+            : 'xdg-open';
+    (0, node_child_process_1.exec)(`${command} "${url}"`);
+}
+async function login(environment = 'prod') {
+    const baseUrl = getBaseUrl(environment);
+    const authUrlBase = `${baseUrl}/api/connect/authorize`;
+    const tokenUrl = `${baseUrl}/api/connect/token`;
+    const codeVerifier = generateCodeVerifier();
+    const codeChallenge = generateCodeChallenge(codeVerifier);
+    return new Promise((resolve, reject) => {
+        const server = node_http_1.default.createServer(async (req, res) => {
+            try {
+                const url = new URL(req.url || '', `http://localhost`);
+                if (url.pathname !== '/callback') {
+                    res.writeHead(404);
+                    res.end('Not found');
+                    return;
+                }
+                const code = url.searchParams.get('code');
+                const error = url.searchParams.get('error');
+                if (error) {
+                    res.writeHead(400, { 'Content-Type': 'text/html' });
+                    res.end('<html><body><h1>Login failed</h1><p>You can close this window.</p></body></html>');
+                    server.close();
+                    reject(new Error(`Authorization failed: ${error}`));
+                    return;
+                }
+                if (!code) {
+                    res.writeHead(400, { 'Content-Type': 'text/html' });
+                    res.end('<html><body><h1>Login failed</h1><p>No authorization code received.</p></body></html>');
+                    server.close();
+                    reject(new Error('No authorization code received'));
+                    return;
+                }
+                const address = server.address();
+                const port = address && typeof address === 'object' ? address.port : null;
+                const redirectUri = `http://localhost:${port}/callback`;
+                const tokenResponse = await fetch(tokenUrl, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                    body: new URLSearchParams({
+                        grant_type: 'authorization_code',
+                        client_id: CLIENT_ID,
+                        code,
+                        redirect_uri: redirectUri,
+                        code_verifier: codeVerifier
+                    }).toString()
+                });
+                if (!tokenResponse.ok) {
+                    const errorText = await tokenResponse.text();
+                    res.writeHead(400, { 'Content-Type': 'text/html' });
+                    res.end('<html><body><h1>Login failed</h1><p>Token exchange failed. You can close this window.</p></body></html>');
+                    server.close();
+                    reject(new Error(`Token exchange failed: ${errorText}`));
+                    return;
+                }
+                const tokenData = (await tokenResponse.json());
+                const accessToken = tokenData.access_token;
+                res.writeHead(200, { 'Content-Type': 'text/html' });
+                res.end('<html><body><h1>Login successful!</h1><p>You can close this window and return to the terminal.</p></body></html>');
+                server.close();
+                resolve(accessToken);
+            }
+            catch (err) {
+                res.writeHead(500, { 'Content-Type': 'text/html' });
+                res.end('<html><body><h1>Login failed</h1><p>An unexpected error occurred.</p></body></html>');
+                server.close();
+                reject(err);
+            }
+        });
+        server.listen(0, () => {
+            const address = server.address();
+            const port = address && typeof address === 'object' ? address.port : null;
+            if (!port) {
+                server.close();
+                reject(new Error('Failed to start local server'));
+                return;
+            }
+            const redirectUri = `http://localhost:${port}/callback`;
+            const authUrl = new URL(authUrlBase);
+            authUrl.searchParams.set('response_type', 'code');
+            authUrl.searchParams.set('client_id', CLIENT_ID);
+            authUrl.searchParams.set('redirect_uri', redirectUri);
+            authUrl.searchParams.set('code_challenge', codeChallenge);
+            authUrl.searchParams.set('code_challenge_method', 'S256');
+            console.log('Opening browser for login...');
+            console.log(`If the browser does not open, visit: ${authUrl.toString()}`);
+            openBrowser(authUrl.toString());
+        });
+    });
+}
+exports.login = login;
+function cmdLogin() {
+    const loginCmd = new commander_1.Command('login');
+    loginCmd
+        .description('Login to Open Source Cloud using OAuth')
+        .action(async (options, command) => {
+        try {
+            const globalOpts = command.optsWithGlobals();
+            const environment = globalOpts?.env || 'prod';
+            const token = await login(environment);
+            saveToken(token, environment);
+            process.env.OSC_ACCESS_TOKEN = token;
+            console.log('Login successful! Token saved to ~/.osc');
+        }
+        catch (err) {
+            console.log(err.message);
+            process.exit(1);
+        }
+    });
+    return loginCmd;
+}
+exports.cmdLogin = cmdLogin;
+//# sourceMappingURL=login.js.map

package/dist/login.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../src/login.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAiC;AACjC,0DAA6B;AAC7B,2DAA0C;AAC1C,qCAA6E;AAC7E,yCAAiC;AACjC,sDAAyB;AACzB,yCAAoC;AAEpC,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,MAAM,SAAS,GAAG,IAAA,gBAAI,EAAC,iBAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;AAE7C,SAAS,YAAY,CAAC,WAAmB;IACvC,MAAM,MAAM,GACV,CAAC,WAAW,IAAI,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC;IAClE,OAAO,IAAA,gBAAI,EAAC,SAAS,EAAE,QAAQ,MAAM,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,SAAS,CAAC,KAAa,EAAE,WAAW,GAAG,MAAM;IAC3D,IAAI,CAAC,IAAA,oBAAU,EAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,mBAAS,EAAC,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;KACvC;IACD,IAAA,uBAAa,EAAC,YAAY,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AACnE,CAAC;AALD,8BAKC;AAED,SAAgB,SAAS,CAAC,WAAW,GAAG,MAAM;IAC5C,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,IAAA,oBAAU,EAAC,SAAS,CAAC,EAAE;QACzB,OAAO,IAAA,sBAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;KAChD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAND,8BAMC;AAED,SAAS,UAAU,CAAC,WAAmB;IACrC,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,MAAM,EAAE;QAC1C,OAAO,sBAAsB,CAAC;KAC/B;IACD,OAAO,eAAe,WAAW,WAAW,CAAC;AAC/C,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO,qBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAgB;IAC7C,OAAO,qBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,OAAO,GACX,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAC3B,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC9B,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,UAAU,CAAC;IACjB,IAAA,yBAAI,EAAC,GAAG,OAAO,KAAK,GAAG,GAAG,CAAC,CAAC;AAC9B,CAAC;AAEM,KAAK,UAAU,KAAK,CAAC,WAAW,GAAG,MAAM;IAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,GAAG,OAAO,wBAAwB,CAAC;IACvD,MAAM,QAAQ,GAAG,GAAG,OAAO,oBAAoB,CAAC;IAChD,MAAM,YAAY,GAAG,oBAAoB,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAE1D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,mBAAI,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClD,IAAI;gBACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,kBAAkB,CAAC,CAAC;gBACvD,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,EAAE;oBAChC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACnB,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBACrB,OAAO;iBACR;gBAED,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAE5C,IAAI,KAAK,EAAE;oBACT,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;oBACpD,GAAG,CAAC,GAAG,CACL,kFAAkF,CACnF,CAAC;oBACF,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC,CAAC;oBACpD,OAAO;iBACR;gBAED,IAAI,CAAC,IAAI,EAAE;oBACT,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;oBACpD,GAAG,CAAC,GAAG,CACL,uFAAuF,CACxF,CAAC;oBACF,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;oBACpD,OAAO;iBACR;gBAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjC,MAAM,IAAI,GACR,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC/D,MAAM,WAAW,GAAG,oBAAoB,IAAI,WAAW,CAAC;gBAExD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;oBAC1C,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;oBAChE,IAAI,EAAE,IAAI,eAAe,CAAC;wBACxB,UAAU,EAAE,oBAAoB;wBAChC,SAAS,EAAE,SAAS;wBACpB,IAAI;wBACJ,YAAY,EAAE,WAAW;wBACzB,aAAa,EAAE,YAAY;qBAC5B,CAAC,CAAC,QAAQ,EAAE;iBACd,CAAC,CAAC;gBAEH,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE;oBACrB,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;oBAC7C,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;oBACpD,GAAG,CAAC,GAAG,CACL,yGAAyG,CAC1G,CAAC;oBACF,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC,CAAC;oBACzD,OAAO;iBACR;gBAED,MAAM,SAAS,GAAG,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAE5C,CAAC;gBACF,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC;gBAE3C,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;gBACpD,GAAG,CAAC,GAAG,CACL,kHAAkH,CACnH,CAAC;gBACF,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,WAAW,CAAC,CAAC;aACtB;YAAC,OAAO,GAAG,EAAE;gBACZ,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;gBACpD,GAAG,CAAC,GAAG,CACL,qFAAqF,CACtF,CAAC;gBACF,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE;YACpB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAC1E,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;gBAClD,OAAO;aACR;YAED,MAAM,WAAW,GAAG,oBAAoB,IAAI,WAAW,CAAC;YACxD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;YACrC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YAClD,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACjD,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YACtD,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;YAC1D,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;YAE1D,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,wCAAwC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC1E,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA/GD,sBA+GC;AAED,SAAgB,QAAQ;IACtB,MAAM,QAAQ,GAAG,IAAI,mBAAO,CAAC,OAAO,CAAC,CAAC;IAEtC,QAAQ;SACL,WAAW,CAAC,wCAAwC,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACjC,IAAI;YACF,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,WAAW,GAAG,UAAU,EAAE,GAAG,IAAI,MAAM,CAAC;YAC9C,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;YACvC,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,KAAK,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;SACxD;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IACL,OAAO,QAAQ,CAAC;AAClB,CAAC;AAnBD,4BAmBC"}

package/dist/user/util.d.ts

@@ -3,4 +3,5 @@ export declare function instanceOptsToPayload(opts: string[] | undefined): {
 };
 export declare function makeSafeName(name: string): string;
 export declare function confirm(message: string | undefined): Promise<void>;
+export declare function ensureToken(environment?: string): Promise<void>;
 //# sourceMappingURL=util.d.ts.map

package/dist/user/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS;;EA0B/D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBxE"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":"AAGA,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS;;EA0B/D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBxE;AAED,wBAAsB,WAAW,CAAC,WAAW,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCrE"}

package/dist/user/util.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirm = exports.makeSafeName = exports.instanceOptsToPayload = void 0;
+exports.ensureToken = exports.confirm = exports.makeSafeName = exports.instanceOptsToPayload = void 0;
 const node_readline_1 = __importDefault(require("node:readline"));
+const login_1 = require("../login");
 function instanceOptsToPayload(opts) {
     const payload = {};
     if (opts) {
@@ -58,4 +59,35 @@ async function confirm(message) {
     });
 }
 exports.confirm = confirm;
+async function ensureToken(environment = 'prod') {
+    if (process.env.OSC_ACCESS_TOKEN) {
+        return;
+    }
+    const savedToken = (0, login_1.loadToken)(environment);
+    if (savedToken) {
+        process.env.OSC_ACCESS_TOKEN = savedToken;
+        return;
+    }
+    const rl = node_readline_1.default.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    const answer = await new Promise((resolve) => {
+        rl.question('OSC_ACCESS_TOKEN is not set. Do you want to login? (yes/no) ', (ans) => {
+            rl.close();
+            resolve(ans.trim().toLowerCase());
+        });
+    });
+    if (answer === 'yes') {
+        const token = await (0, login_1.login)(environment);
+        (0, login_1.saveToken)(token, environment);
+        process.env.OSC_ACCESS_TOKEN = token;
+        console.log('Login successful!');
+    }
+    else {
+        console.error('OSC_ACCESS_TOKEN is required. Set it or run: osc login');
+        process.exit(1);
+    }
+}
+exports.ensureToken = ensureToken;
 //# sourceMappingURL=util.js.map

package/dist/user/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAqC;AAErC,SAAgB,qBAAqB,CAAC,IAA0B;IAC9D,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE;YACtB,MAAM,KAAK,GAAG,8BAA8B,CAAC;YAC7C,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,IAAI,OAAO,GAAG,OAAO,CAAC;gBACtB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBAChC,IAAI,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;wBAChC,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;qBACzB;yBAAM;wBACL,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;4BACpB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;yBACtB;wBACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;qBAC3B;gBACH,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACtB;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA1BD,sDA0BC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACtD,CAAC;AAFD,oCAEC;AAEM,KAAK,UAAU,OAAO,CAAC,OAA2B;IACvD,MAAM,EAAE,GAAG,uBAAQ,CAAC,eAAe,CAAC;QAClC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,EAAE,CAAC,QAAQ,CAAC,OAAO,IAAI,yBAAyB,EAAE,CAAC,MAAM,EAAE,EAAE;YAC3D,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC5C,IAAI,OAAO,KAAK,KAAK,EAAE;gBACrB,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,0BAiBC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osaas/cli",
-  "version": "4.24.1",
+  "version": "4.25.0",
   "description": "Open Source Cloud CLI",
   "author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
   "homepage": "https://www.osaas.io",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0c2c66c87a143e3c6a1c9f26934eaeaffbd91f1b"
+  "gitHead": "256415ebd4ee729710330c7760e936b45d0188a3"
 }

package/readme.md

@@ -5,7 +5,7 @@ CLI for working and scripting with [Open Source Cloud](www.osaas.io)
 Prerequisites:
 
 - Node >18
-- An Open Source Cloud account and a Personal Access Token at hand
+- An Open Source Cloud account
 
 ## Install
 
@@ -13,6 +13,38 @@ Prerequisites:
 npm install -g @osaas/cli
 ```
 
+## Authentication
+
+You can authenticate with Open Source Cloud in two ways:
+
+### Option 1: Login via browser (recommended)
+
+Run the `login` command to authenticate using your browser. The token is saved to `~/.osc` and used automatically for subsequent commands.
+
+```
+% osc login
+Opening browser for login...
+Login successful! Token saved to ~/.osc
+```
+
+When using a non-production environment:
+
+```
+% osc --env dev login
+```
+
+### Option 2: Personal Access Token
+
+Set the environment variable `OSC_ACCESS_TOKEN` with your personal access token. Obtain the personal access token in the Eyevinn Open Source Cloud web console.
+
+```
+% export OSC_ACCESS_TOKEN=<personal-access-token>
+```
+
+### Auto-prompt
+
+If neither a saved token nor `OSC_ACCESS_TOKEN` is found when running a command, the CLI will prompt you to login interactively.
+
 ## Usage
 
 ```
@@ -20,47 +52,39 @@ npm install -g @osaas/cli
 Usage: osc [options] [command]
 
 Options:
-  -v, --version                        Output the current version
-  --env <environment>                  Environment to use
-  -h, --help                           display help for command
+  -v, --version                                    Output the current version
+  --env <environment>                              Environment to use
+  -h, --help                                       display help for command
 
 Commands:
-  admin                                Administrative commands for OSC super admins
-  list <serviceId>                     List all my service instances
-  create [options] <serviceId> <name>  Create a service instance
-  describe <serviceId> <name>          Get details for a service instance
-  remove [options] <serviceId> <name>  Remove a service instance
-  restart <serviceId> <name>           Restart a service instance
-  logs <serviceId> <name>              Get logs for a service instance
-  list-reserved-nodes                  List all my reserved nodes
-  service-access-token <serviceId>     Generate a service access token for a service
-  secrets                              Manage secrets for services (list, create, update, remove)
-  packager [options] <source> <dest>   Create streaming package from ABR bundle on S3
-                                       and store on another S3 bucket
-  compare vmaf <reference> <distorted> <result>  Compare two video files using VMAF
-  live                                 Live streaming commands
-  intercom                             Intercom messaging commands
-  transcribe [options] <source>        Generate subtitles from video or audio using OpenAI Whisper
-  db                                   Database management commands
-  architect                            AI chat assistant for architecture guidance
-  vod create [options] <name> <source> Create a VOD file ready for streaming
-  vod cleanup <name>                   Remove VOD pipeline but keep VOD files
-  web publish [options] <name> <dir>   Publish a website
-  web cdn-create [options] <serviceId> <instanceName>  Create a CDN distribution
-  web config-create <name>             Create a configuration service instance
-  web config-delete [options] <name>   Delete a configuration service instance
-  web config-to-env <name>             Export configuration values as environment variables
-  help [command]                       display help for command
+  login                                            Login to Open Source Cloud using OAuth
+  admin                                            Administrative commands for OSC super admins
+  list <serviceId>                                 List all my service instances
+  create [options] <serviceId> <name>              Create a service instance
+  describe <serviceId> <name>                      Get details for a service instance
+  remove [options] <serviceId> <name>              Remove a service instance
+  logs <serviceId> <name>                          Get logs for a service instance
+  restart <serviceId> <name>                       Restart a service instance
+  get-instance-replicas <serviceId> <name>         Get the number of replicas for a service instance
+  set-instance-replicas <serviceId> <name> <n>     Set the number of replicas for a service instance
+  service-access-token <serviceId>                 Generate a service access token for a service
+  list-reserved-nodes                              List all my reserved nodes
+  secrets                                          Manage secrets for services (list, create, update, remove)
+  packager [options] <source> <dest>               Create streaming package from ABR bundle on S3
+  compare vmaf [options] <reference> <distorted> <result>
+                                                   Compare two video files using VMAF
+  live                                             Live streaming commands
+  intercom                                         Intercom messaging commands
+  transcribe [options] <source>                    Generate subtitles from video or audio using OpenAI Whisper
+  db                                               Database management commands
+  architect                                        AI chat assistant for architecture guidance
+  vod                                              VOD transcoding and packaging commands
+  web                                              Web publishing and configuration commands
+  help [command]                                   display help for command
 ```
 
 ## Examples
 
-First set the environment variable `OSC_ACCESS_TOKEN` with your personal access token. Obtain the personal access token in the Eyevinn Open Source Cloud web console.
-
-```
-% export OSC_ACCESS_TOKEN=<personal-access-token>
-```
-
 ### Create a MinIO storage service and bucket
 
 Create a MinIO storage server instance called `mystore` with the given credentials.
@@ -141,6 +165,50 @@ Setup CDN property in AWS Cloudfront
 Are you sure you want to remove mystore? (yes/no) yes
 ```
 
+### Create a service instance with safe name option
+
+Create a service instance with invalid characters stripped from the name:
+
+```bash
+% osc create minio-minio "my store with spaces!" --safe-name -o RootUser=admin -o RootPassword=abC12345678
+```
+
+### Instance replica management
+
+Get the number of replicas for a service instance:
+
+```bash
+% osc get-instance-replicas minio-minio mystore
+Instance mystore has 1 actual replicas and 1 desired replicas.
+```
+
+Set the number of replicas:
+
+```bash
+% osc set-instance-replicas minio-minio mystore 3
+Set desired replicas for instance mystore to 3.
+```
+
+### Service instance management
+
+Restart a service instance:
+
+```bash
+% osc restart minio-minio mystore
+```
+
+List your reserved nodes:
+
+```bash
+% osc list-reserved-nodes
+```
+
+Generate a service access token:
+
+```bash
+% osc service-access-token minio-minio
+```
+
 ### Create ABR file for VOD using SVT Encore
 
 Create a VOD file for streaming from using a pipeline named `demo`. Follow the steps in the [Eyevinn Open Source Cloud documentation](https://docs.osaas.io/osaas.wiki/Solution%3A-VOD-Transcoding.html#vod-transcoding-and-packaging) on how to setup a pipeline.
@@ -161,47 +229,91 @@ Remove a VOD pipeline but keep the VOD files:
 % osc vod cleanup demo
 ```
 
-### List all channel-engine instance for tenant `eyevinn` as an OSC super admin
+### Live streaming
+
+Start a single bitrate live stream:
 
+```bash
+% osc live start-single mystreamname
+Start streaming to rtmp://... and watch at https://...
 ```
-PAT_SECRET=<pat-secret> osc admin list-instances eyevinn channel-engine
+
+Stop and remove a single bitrate live stream:
+
+```bash
+% osc live stop-single mystreamname
 ```
 
-### Remove a channel-engine instance in dev env for tenant `asdasd` as an OSC super admin
+List all single bitrate live streams:
 
+```bash
+% osc live list-single
 ```
-PAT_SECRET=<pat-secret> osc --env dev admin remove-instance asdasd channel-engine mychannel
+
+Create and start a multi bitrate live stream:
+
+```bash
+% osc live create-multi mystreamname
+```
+
+Start an existing multi bitrate live stream:
+
+```bash
+% osc live start-multi mystreamname
+```
+
+Stop a multi bitrate live stream:
+
+```bash
+% osc live stop-multi mystreamname
 ```
 
-### Create application configuration service instance
+### Database management
 
-To manage configuration values for an application we can create an instance of an Application Config Service.
+Create a Valkey database:
 
 ```bash
-% osc web config-create jonastest
-Configuration service instance available at https://eyevinnlab-jonastest.eyevinn-app-config-svc.auto.prod.osaas.io
+% osc db create valkey mydb
 ```
 
-And to remove it (with the data)
+List all databases of a given type:
 
 ```bash
-% osc web config-delete --data jonastest
+% osc db list valkey
 ```
 
-### Store application configuration values as environment variables
+Remove a database:
 
-Configuration values managed by the Application Config Service can be stored as environment variable using this commmand.
+```bash
+% osc db remove valkey mydb
+```
+
+### Intercom
+
+List productions in an intercom system:
 
 ```bash
-% osc web config-to-env <config-instance-name>
-export AWS_ACCESS_KEY_ID=admin
-export CHANNELURL=https://eyevinnlab.ce.prod.osaas.io/channels/mychannel/master.m3u8
+% osc intercom list-productions myintercom
 ```
 
-And storing it in the shell.
+Create a production with lines:
 
 ```bash
-% eval `osc web config-to-env <config-instance-name>`
+% osc intercom create-production myintercom "My Production" line1 line2
+```
+
+Delete a production:
+
+```bash
+% osc intercom delete-production myintercom <productionId>
+```
+
+### AI architect chat
+
+Start an interactive chat session with the AI assistant:
+
+```bash
+% osc architect chat
 ```
 
 ### Compare video files using VMAF
@@ -212,6 +324,15 @@ Compare two video files and get a VMAF quality score:
 % osc compare vmaf s3://bucket/reference.mp4 s3://bucket/distorted.mp4 s3://bucket/vmaf-result.json
 ```
 
+Custom AWS credentials and S3 endpoint can be provided:
+
+```bash
+% osc compare vmaf \
+  --aws-access-key-id=AKID --aws-secret-access-key=SECRET \
+  --s3-endpoint-url=https://s3.example.com \
+  s3://bucket/reference.mp4 s3://bucket/distorted.mp4 s3://bucket/vmaf-result.json
+```
+
 ### Generate subtitles from video or audio
 
 Generate subtitles using OpenAI Whisper:
@@ -221,6 +342,14 @@ Generate subtitles using OpenAI Whisper:
 % osc transcribe https://example.com/video.mp4 --format vtt --language en
 ```
 
+### Create streaming package
+
+Create a streaming package from an ABR bundle on S3:
+
+```bash
+% osc packager -v video_1.mp4 video_2.mp4 -a audio.mp4 s3://source-bucket/abr s3://dest-bucket/package
+```
+
 ### Manage service secrets
 
 List secrets for a service:
@@ -247,30 +376,59 @@ Remove a secret:
 % osc secrets remove minio-minio mysecret
 ```
 
-### Service instance management
+### Web publishing and configuration
 
-Restart a service instance:
+Publish a website:
 
 ```bash
-% osc restart minio-minio mystore
+% osc web publish mysite ./dist
 ```
 
-List your reserved nodes:
+Create a CDN distribution:
 
 ```bash
-% osc list-reserved-nodes
+% osc web cdn-create --provider=cloudfront --origin-path=/mybucket minio-minio mystore
 ```
 
-Generate a service access token:
+### Application configuration service
+
+Create a configuration service instance:
 
 ```bash
-% osc service-access-token minio-minio
+% osc web config-create jonastest
+Configuration service instance available at https://eyevinnlab-jonastest.eyevinn-app-config-svc.auto.prod.osaas.io
 ```
 
-### Create a service instance with safe name option
+And to remove it (with the data):
 
-Create a service instance with invalid characters stripped from the name:
+```bash
+% osc web config-delete --data jonastest
+```
+
+Store application configuration values as environment variables:
 
 ```bash
-% osc create minio-minio "my store with spaces!" --safe-name -o RootUser=admin -o RootPassword=abC12345678
+% osc web config-to-env <config-instance-name>
+export AWS_ACCESS_KEY_ID=admin
+export CHANNELURL=https://eyevinnlab.ce.prod.osaas.io/channels/mychannel/master.m3u8
+```
+
+And storing it in the shell:
+
+```bash
+% eval `osc web config-to-env <config-instance-name>`
+```
+
+### Admin commands
+
+List all channel-engine instance for tenant `eyevinn` as an OSC super admin:
+
+```
+PAT_SECRET=<pat-secret> osc admin list-instances eyevinn channel-engine
+```
+
+Remove a channel-engine instance in dev env for tenant `asdasd` as an OSC super admin:
+
+```
+PAT_SECRET=<pat-secret> osc --env dev admin remove-instance asdasd channel-engine mychannel
 ```

package/src/cli.ts

@@ -14,6 +14,8 @@ import cmdDb from './db/cmd';
 import { cmdChat } from './architect/cmd';
 import { cmdVod } from './vod/cmd';
 import { cmdWeb } from './web/cmd';
+import { cmdLogin } from './login';
+import { ensureToken } from './user/util';
 
 const cli = new Command();
 
@@ -32,6 +34,16 @@ cli
     process.env.ENVIRONMENT || 'prod'
   );
 
+cli.addCommand(cmdLogin());
+cli.hook('preAction', async (thisCommand) => {
+  const commandName = thisCommand.args?.[0] || thisCommand.name();
+  if (commandName !== 'login') {
+    const globalOpts = thisCommand.optsWithGlobals();
+    const environment = globalOpts?.env || 'prod';
+    await ensureToken(environment);
+  }
+});
+
 cli.addCommand(cmdAdmin());
 cli.addCommand(cmdUser.cmdList());
 cli.addCommand(cmdUser.cmdCreate());

package/src/login.ts

@@ -0,0 +1,190 @@
+import crypto from 'node:crypto';
+import http from 'node:http';
+import { exec } from 'node:child_process';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import os from 'node:os';
+import { Command } from 'commander';
+
+const CLIENT_ID = 'cli';
+const TOKEN_DIR = join(os.homedir(), '.osc');
+
+function getTokenPath(environment: string): string {
+  const suffix =
+    !environment || environment === 'prod' ? '' : `-${environment}`;
+  return join(TOKEN_DIR, `token${suffix}`);
+}
+
+export function saveToken(token: string, environment = 'prod'): void {
+  if (!existsSync(TOKEN_DIR)) {
+    mkdirSync(TOKEN_DIR, { mode: 0o700 });
+  }
+  writeFileSync(getTokenPath(environment), token, { mode: 0o600 });
+}
+
+export function loadToken(environment = 'prod'): string | undefined {
+  const tokenPath = getTokenPath(environment);
+  if (existsSync(tokenPath)) {
+    return readFileSync(tokenPath, 'utf-8').trim();
+  }
+  return undefined;
+}
+
+function getBaseUrl(environment: string): string {
+  if (!environment || environment === 'prod') {
+    return 'https://app.osaas.io';
+  }
+  return `https://app.${environment}.osaas.io`;
+}
+
+function generateCodeVerifier(): string {
+  return crypto.randomBytes(32).toString('base64url');
+}
+
+function generateCodeChallenge(verifier: string): string {
+  return crypto.createHash('sha256').update(verifier).digest('base64url');
+}
+
+function openBrowser(url: string): void {
+  const command =
+    process.platform === 'darwin'
+      ? 'open'
+      : process.platform === 'win32'
+      ? 'start'
+      : 'xdg-open';
+  exec(`${command} "${url}"`);
+}
+
+export async function login(environment = 'prod'): Promise<string> {
+  const baseUrl = getBaseUrl(environment);
+  const authUrlBase = `${baseUrl}/api/connect/authorize`;
+  const tokenUrl = `${baseUrl}/api/connect/token`;
+  const codeVerifier = generateCodeVerifier();
+  const codeChallenge = generateCodeChallenge(codeVerifier);
+
+  return new Promise((resolve, reject) => {
+    const server = http.createServer(async (req, res) => {
+      try {
+        const url = new URL(req.url || '', `http://localhost`);
+        if (url.pathname !== '/callback') {
+          res.writeHead(404);
+          res.end('Not found');
+          return;
+        }
+
+        const code = url.searchParams.get('code');
+        const error = url.searchParams.get('error');
+
+        if (error) {
+          res.writeHead(400, { 'Content-Type': 'text/html' });
+          res.end(
+            '<html><body><h1>Login failed</h1><p>You can close this window.</p></body></html>'
+          );
+          server.close();
+          reject(new Error(`Authorization failed: ${error}`));
+          return;
+        }
+
+        if (!code) {
+          res.writeHead(400, { 'Content-Type': 'text/html' });
+          res.end(
+            '<html><body><h1>Login failed</h1><p>No authorization code received.</p></body></html>'
+          );
+          server.close();
+          reject(new Error('No authorization code received'));
+          return;
+        }
+
+        const address = server.address();
+        const port =
+          address && typeof address === 'object' ? address.port : null;
+        const redirectUri = `http://localhost:${port}/callback`;
+
+        const tokenResponse = await fetch(tokenUrl, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: new URLSearchParams({
+            grant_type: 'authorization_code',
+            client_id: CLIENT_ID,
+            code,
+            redirect_uri: redirectUri,
+            code_verifier: codeVerifier
+          }).toString()
+        });
+
+        if (!tokenResponse.ok) {
+          const errorText = await tokenResponse.text();
+          res.writeHead(400, { 'Content-Type': 'text/html' });
+          res.end(
+            '<html><body><h1>Login failed</h1><p>Token exchange failed. You can close this window.</p></body></html>'
+          );
+          server.close();
+          reject(new Error(`Token exchange failed: ${errorText}`));
+          return;
+        }
+
+        const tokenData = (await tokenResponse.json()) as {
+          access_token: string;
+        };
+        const accessToken = tokenData.access_token;
+
+        res.writeHead(200, { 'Content-Type': 'text/html' });
+        res.end(
+          '<html><body><h1>Login successful!</h1><p>You can close this window and return to the terminal.</p></body></html>'
+        );
+        server.close();
+        resolve(accessToken);
+      } catch (err) {
+        res.writeHead(500, { 'Content-Type': 'text/html' });
+        res.end(
+          '<html><body><h1>Login failed</h1><p>An unexpected error occurred.</p></body></html>'
+        );
+        server.close();
+        reject(err);
+      }
+    });
+
+    server.listen(0, () => {
+      const address = server.address();
+      const port = address && typeof address === 'object' ? address.port : null;
+      if (!port) {
+        server.close();
+        reject(new Error('Failed to start local server'));
+        return;
+      }
+
+      const redirectUri = `http://localhost:${port}/callback`;
+      const authUrl = new URL(authUrlBase);
+      authUrl.searchParams.set('response_type', 'code');
+      authUrl.searchParams.set('client_id', CLIENT_ID);
+      authUrl.searchParams.set('redirect_uri', redirectUri);
+      authUrl.searchParams.set('code_challenge', codeChallenge);
+      authUrl.searchParams.set('code_challenge_method', 'S256');
+
+      console.log('Opening browser for login...');
+      console.log(`If the browser does not open, visit: ${authUrl.toString()}`);
+      openBrowser(authUrl.toString());
+    });
+  });
+}
+
+export function cmdLogin() {
+  const loginCmd = new Command('login');
+
+  loginCmd
+    .description('Login to Open Source Cloud using OAuth')
+    .action(async (options, command) => {
+      try {
+        const globalOpts = command.optsWithGlobals();
+        const environment = globalOpts?.env || 'prod';
+        const token = await login(environment);
+        saveToken(token, environment);
+        process.env.OSC_ACCESS_TOKEN = token;
+        console.log('Login successful! Token saved to ~/.osc');
+      } catch (err) {
+        console.log((err as Error).message);
+        process.exit(1);
+      }
+    });
+  return loginCmd;
+}

package/src/user/util.ts

@@ -1,4 +1,5 @@
 import readline from 'node:readline';
+import { login, loadToken, saveToken } from '../login';
 
 export function instanceOptsToPayload(opts: string[] | undefined) {
   const payload: { [key: string]: any } = {};
@@ -50,3 +51,40 @@ export async function confirm(message: string | undefined): Promise<void> {
     });
   });
 }
+
+export async function ensureToken(environment = 'prod'): Promise<void> {
+  if (process.env.OSC_ACCESS_TOKEN) {
+    return;
+  }
+
+  const savedToken = loadToken(environment);
+  if (savedToken) {
+    process.env.OSC_ACCESS_TOKEN = savedToken;
+    return;
+  }
+
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  const answer = await new Promise<string>((resolve) => {
+    rl.question(
+      'OSC_ACCESS_TOKEN is not set. Do you want to login? (yes/no) ',
+      (ans) => {
+        rl.close();
+        resolve(ans.trim().toLowerCase());
+      }
+    );
+  });
+
+  if (answer === 'yes') {
+    const token = await login(environment);
+    saveToken(token, environment);
+    process.env.OSC_ACCESS_TOKEN = token;
+    console.log('Login successful!');
+  } else {
+    console.error('OSC_ACCESS_TOKEN is required. Set it or run: osc login');
+    process.exit(1);
+  }
+}