@tolgee/cli 2.8.1 → 2.8.3

package/dist/cli.js

@@ -16,6 +16,7 @@ import TagCommand from './commands/tag.js';
 import { getSingleOption } from './utils/getSingleOption.js';
 import { createTolgeeClient } from './client/TolgeeClient.js';
 import { projectIdFromKey } from './client/ApiClient.js';
+import { printApiKeyLists } from './utils/apiKeyList.js';
 const NO_KEY_COMMANDS = ['login', 'logout', 'extract'];
 ansi.enabled = process.stdout.isTTY;
 function topLevelName(command) {
@@ -58,16 +59,21 @@ function loadProjectId(cmd) {
         }
     }
 }
-function validateOptions(cmd) {
+async function validateOptions(cmd) {
     const opts = cmd.optsWithGlobals();
-    if (!opts.apiKey) {
-        exitWithError('No API key has been provided. You must either provide one via --api-key, or login via `tolgee login`.');
-    }
     if (opts.projectId === -1) {
         error('No Project ID have been specified. You must either provide one via --project-id, or by setting up a `.tolgeerc` file.');
+        info('If you provide Project Api Key (PAK) via `--api-key`, Project ID is derived automatically.');
         info('Learn more about configuring the CLI here: https://tolgee.io/tolgee-cli/project-configuration');
         process.exit(1);
     }
+    if (!opts.apiKey) {
+        error(`Not authenticated for host ${ansi.blue(opts.apiUrl.hostname)} and project ${ansi.blue(opts.projectId)}.`);
+        info(`You must either provide api key via --api-key or login via \`tolgee login\` (for correct api url and project)`);
+        console.log('\nYou are logged into these projects:');
+        await printApiKeyLists();
+        process.exit(1);
+    }
 }
 const preHandler = (config) => async function (prog, cmd) {
     if (!NO_KEY_COMMANDS.includes(topLevelName(cmd))) {

package/dist/commands/login.js

@@ -1,17 +1,26 @@
 import { Command } from 'commander';
+import ansi from 'ansi-colors';
 import { saveApiKey, removeApiKeys, clearAuthStore, } from '../config/credentials.js';
-import { success } from '../utils/logger.js';
+import { exitWithError, success } from '../utils/logger.js';
 import { createTolgeeClient } from '../client/TolgeeClient.js';
+import { printApiKeyLists } from '../utils/apiKeyList.js';
 async function loginHandler(key) {
     const opts = this.optsWithGlobals();
+    if (opts.list) {
+        printApiKeyLists();
+        return;
+    }
+    else if (!key) {
+        exitWithError('Missing argument [API Key]');
+    }
     const keyInfo = await createTolgeeClient({
         baseUrl: opts.apiUrl.toString(),
         apiKey: key,
     }).getApiKeyInfo();
     await saveApiKey(opts.apiUrl, keyInfo);
     success(keyInfo.type === 'PAK'
-        ? `Logged in as ${keyInfo.username} on ${opts.apiUrl.hostname} for project ${keyInfo.project.name} (#${keyInfo.project.id}). Welcome back!`
-        : `Logged in as ${keyInfo.username} on ${opts.apiUrl.hostname}. Welcome back!`);
+        ? `Logged in as ${keyInfo.username} on ${ansi.blue(opts.apiUrl.hostname)} for project ${ansi.blue(String(keyInfo.project.id))} (${keyInfo.project.name}). Welcome back!`
+        : `Logged in as ${keyInfo.username} on ${ansi.blue(opts.apiUrl.hostname)}. Welcome back!`);
 }
 async function logoutHandler() {
     const opts = this.optsWithGlobals();
@@ -26,7 +35,8 @@ async function logoutHandler() {
 export const Login = new Command()
     .name('login')
     .description('Login to Tolgee with an API key. You can be logged into multiple Tolgee instances at the same time by using --api-url')
-    .argument('<API Key>', 'The API key. Can be either a personal access token, or a project key')
+    .option('-l, --list', 'List existing api keys')
+    .argument('[API Key]', 'The API key. Can be either a personal access token, or a project key')
     .action(loginHandler);
 export const Logout = new Command()
     .name('logout')

package/dist/config/credentials.js

@@ -13,7 +13,7 @@ async function ensureConfigPath() {
         }
     }
 }
-async function loadStore() {
+export async function loadStore() {
     try {
         await ensureConfigPath();
         const storeData = await readFile(API_TOKENS_FILE, 'utf8');
@@ -42,25 +42,34 @@ async function storePat(store, instance, pat) {
         },
     });
 }
-async function storePak(store, instance, projectId, pak) {
+async function storePak(store, instance, project, pak) {
     return saveStore({
         ...store,
         [instance.hostname]: {
             ...(store[instance.hostname] || {}),
             projects: {
                 ...(store[instance.hostname]?.projects || {}),
-                [projectId.toString(10)]: pak,
+                [project.id.toString(10)]: pak,
+            },
+            projectDetails: {
+                ...(store[instance.hostname]?.projectDetails || {}),
+                [project.id.toString(10)]: { name: project.name },
             },
         },
     });
 }
+async function removePak(store, instance, projectId) {
+    delete store[instance.hostname].projects?.[projectId.toString(10)];
+    delete store[instance.hostname].projectDetails?.[projectId.toString(10)];
+    return saveStore(store);
+}
 export async function savePat(instance, pat) {
     const store = await loadStore();
     return storePat(store, instance, pat);
 }
-export async function savePak(instance, projectId, pak) {
+export async function savePak(instance, project, pak) {
     const store = await loadStore();
-    return storePak(store, instance, projectId, pak);
+    return storePak(store, instance, project, pak);
 }
 export async function getApiKey(instance, projectId) {
     const store = await loadStore();
@@ -84,7 +93,7 @@ export async function getApiKey(instance, projectId) {
     if (pak) {
         if (pak.expires !== 0 && Date.now() > pak.expires) {
             warn(`Your project API key for project #${projectId} on ${instance.hostname} expired.`);
-            await storePak(store, instance, projectId, undefined);
+            await removePak(store, instance, projectId);
             return null;
         }
         return pak.token;
@@ -99,17 +108,15 @@ export async function saveApiKey(instance, token) {
             expires: token.expires,
         });
     }
-    return storePak(store, instance, token.project.id, {
+    return storePak(store, instance, token.project, {
         token: token.key,
         expires: token.expires,
     });
 }
 export async function removeApiKeys(api) {
     const store = await loadStore();
-    return saveStore({
-        ...store,
-        [api.hostname]: {},
-    });
+    delete store[api.hostname];
+    return saveStore(store);
 }
 export async function clearAuthStore() {
     return saveStore({});

package/dist/utils/apiKeyList.js

@@ -0,0 +1,46 @@
+import ansi from 'ansi-colors';
+import { loadStore } from '../config/credentials.js';
+function getProjectName(projectId, projectDetails) {
+    return projectDetails?.[projectId]?.name;
+}
+function printToken(type, token, projectId, projectDetails) {
+    let result = type === 'PAK' ? ansi.green('PAK') : ansi.blue('PAT');
+    if (projectId !== undefined) {
+        const projectName = getProjectName(projectId, projectDetails);
+        result += '\t ' + ansi.red(`#${projectId}` + ' ' + (projectName ?? ''));
+    }
+    else {
+        result += '\t ' + ansi.yellow('<all projects>');
+    }
+    if (token.expires) {
+        result +=
+            '\t ' +
+                ansi.grey('expires ' + new Date(token.expires).toLocaleDateString());
+    }
+    else {
+        result += '\t ' + ansi.grey('never expires');
+    }
+    console.log(result);
+}
+export async function printApiKeyLists() {
+    const store = await loadStore();
+    const list = Object.entries(store);
+    if (list.length === 0) {
+        console.log(ansi.gray('No records\n'));
+    }
+    for (const [origin, server] of list) {
+        console.log(ansi.white('[') + ansi.red(origin) + ansi.white(']'));
+        if (server.user) {
+            printToken('PAT', server.user);
+        }
+        if (server.projects) {
+            for (const [project, token] of Object.entries(server.projects)) {
+                if (token) {
+                    printToken('PAK', token, project, server.projectDetails);
+                }
+            }
+        }
+        console.log('\n');
+    }
+    return;
+}

package/dist/utils/logger.js

@@ -1,3 +1,4 @@
+import { stdout } from 'process';
 import { getStackTrace } from './getStackTrace.js';
 const SYMBOLS = ['      🐁', '    🐁  ', '  🐁    ', '🐁      '];
 let debugEnabled = false;
@@ -59,21 +60,47 @@ export function warn(msg) {
 export function error(msg) {
     console.log(`🔴 ${msg}`);
 }
-export function exitWithError(err) {
+export function printError(err, level = 0) {
     let message;
     let stack;
+    let cause;
     if (err instanceof Error) {
         message = err.message;
         stack = err.stack;
+        cause = err.cause;
     }
     else {
         message = err;
-        stack = getStackTrace();
     }
-    error(message);
+    if (level === 0) {
+        error(message);
+    }
+    else {
+        stdout.write('[cause] ');
+    }
     if (debugEnabled && stack) {
         console.log(stack);
     }
+    else if (level !== 0) {
+        console.log(message);
+    }
+    if (cause && level < 3) {
+        printError(cause, level + 1);
+    }
+}
+export function exitWithError(err) {
+    if (err instanceof Error) {
+        printError(err);
+    }
+    else {
+        error(err);
+        if (debugEnabled) {
+            console.log(getStackTrace());
+        }
+    }
+    if (!isDebugEnabled()) {
+        console.log('\nHINT: Use `--verbose` parameter to get full stack trace');
+    }
     process.exit(1);
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {