apify-cli 1.0.0-beta.13 → 1.0.0-beta.15

package/dist/commands/login.d.ts

@@ -3,6 +3,7 @@ export declare class LoginCommand extends ApifyCommand<typeof LoginCommand> {
     static description: string;
     static flags: {
         token: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        method: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,qBAAa,YAAa,SAAQ,YAAY,CAAC,OAAO,YAAY,CAAC;IAC/D,OAAgB,WAAW,SAEU;IAErC,OAAgB,KAAK;;MAMnB;IAEI,GAAG;CAgBZ"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AA0BvD,qBAAa,YAAa,SAAQ,YAAY,CAAC,OAAO,YAAY,CAAC;IAC/D,OAAgB,WAAW,SAEU;IAErC,OAAgB,KAAK;;;MAYnB;IAEI,GAAG;CA6HZ"}

package/dist/commands/login.js

@@ -1,30 +1,155 @@
+import { cryptoRandomObjectId } from '@apify/utilities';
 import { Flags } from '@oclif/core';
+import computerName from 'computer-name';
+import cors from 'cors';
+import express from 'express';
 import inquirer from 'inquirer';
+import open from 'open';
 import { ApifyCommand } from '../lib/apify_command.js';
-import { error, success } from '../lib/outputs.js';
+import { error, info, success } from '../lib/outputs.js';
 import { useApifyIdentity } from '../lib/telemetry.js';
 import { getLocalUserInfo, getLoggedClient } from '../lib/utils.js';
+const CONSOLE_BASE_URL = 'https://console.apify.com/account?tab=integrations';
+// const CONSOLE_BASE_URL = 'http://localhost:3000/account?tab=integrations';
+const CONSOLE_URL_ORIGIN = new URL(CONSOLE_BASE_URL).origin;
+const API_BASE_URL = CONSOLE_BASE_URL.includes('localhost') ? 'http://localhost:3333' : undefined;
+// Not really checked right now, but it might come useful if we ever need to do some breaking changes
+const API_VERSION = 'v1';
+const tryToLogin = async (token) => {
+    const isUserLogged = await getLoggedClient(token, API_BASE_URL);
+    const userInfo = await getLocalUserInfo();
+    if (isUserLogged) {
+        await useApifyIdentity(userInfo.id);
+        success(`You are logged in to Apify as ${userInfo.username || userInfo.id}!`);
+    }
+    else {
+        error('Login to Apify failed, the provided API token is not valid.');
+    }
+    return isUserLogged;
+};
 export class LoginCommand extends ApifyCommand {
     async run() {
-        let { token } = this.flags;
-        if (!token) {
+        const { token, method } = this.flags;
+        if (token) {
+            await tryToLogin(token);
+            return;
+        }
+        let selectedMethod = method;
+        if (!method) {
+            const answer = await inquirer.prompt([{
+                    type: 'list',
+                    name: 'loginMethod',
+                    message: 'Choose how you want to log in to Apify',
+                    choices: [
+                        {
+                            value: 'console',
+                            name: 'Through Apify Console in your default browser',
+                            short: 'Through Apify Console',
+                        },
+                        { value: 'manual', name: 'Enter API token manually', short: 'Manually' },
+                    ],
+                    loop: true,
+                }]);
+            selectedMethod = answer.loginMethod;
+        }
+        if (selectedMethod === 'console') {
+            let server;
+            const app = express();
+            // To send requests from browser to localhost, CORS has to be configured properly
+            app.use(cors({
+                origin: CONSOLE_URL_ORIGIN,
+                allowedHeaders: ['Content-Type', 'Authorization'],
+            }));
+            // Turn off keepalive, otherwise closing the server when command is finished is lagging
+            app.use((_, res, next) => {
+                res.set('Connection', 'close');
+                next();
+            });
+            app.use(express.json());
+            // Basic authorization via a random token, which is passed to the Apify Console,
+            // and that sends it back via the `token` query param, or `Authorization` header
+            const authToken = cryptoRandomObjectId();
+            app.use((req, res, next) => {
+                let { token: serverToken } = req.query;
+                if (!serverToken) {
+                    const authorizationHeader = req.get('Authorization');
+                    if (authorizationHeader) {
+                        const [schema, tokenFromHeader, ...extra] = authorizationHeader.trim().split(/\s+/);
+                        if (schema.toLowerCase() === 'bearer' && tokenFromHeader && extra.length === 0) {
+                            serverToken = tokenFromHeader;
+                        }
+                    }
+                }
+                if (serverToken !== authToken) {
+                    res.status(401);
+                    res.send('Authorization failed');
+                }
+                else {
+                    next();
+                }
+            });
+            const apiRouter = express.Router();
+            app.use(`/api/${API_VERSION}`, apiRouter);
+            apiRouter.post('/login-token', async (req, res) => {
+                try {
+                    if (req.body.apiToken) {
+                        await tryToLogin(req.body.apiToken);
+                    }
+                    else {
+                        throw new Error('Request did not contain API token');
+                    }
+                    res.end();
+                }
+                catch (err) {
+                    const errorMessage = `Login to Apify failed with error: ${err.message}`;
+                    error(errorMessage);
+                    res.status(500);
+                    res.send(errorMessage);
+                }
+                server.close();
+            });
+            apiRouter.post('/exit', (req, res) => {
+                if (req.body.isWindowClosed) {
+                    error('Login to Apify failed, the console window was closed.');
+                }
+                else if (req.body.actionCanceled) {
+                    error('Login to Apify failed, the action was canceled in the Apify Console.');
+                }
+                else {
+                    error('Login to Apify failed.');
+                }
+                res.end();
+                server.close();
+            });
+            // Listening on port 0 will assign a random available port
+            server = app.listen(0);
+            const { port } = server.address();
+            const consoleUrl = new URL(CONSOLE_BASE_URL);
+            consoleUrl.searchParams.set('localCliCommand', 'login');
+            consoleUrl.searchParams.set('localCliPort', `${port}`);
+            consoleUrl.searchParams.set('localCliToken', authToken);
+            consoleUrl.searchParams.set('localCliApiVersion', API_VERSION);
+            try {
+                consoleUrl.searchParams.set('localCliComputerName', encodeURIComponent(computerName()));
+            }
+            catch {
+                // Ignore errors from fetching computer name as it's not critical
+            }
+            info(`Opening Apify Console at "${consoleUrl.href}"...`);
+            await open(consoleUrl.href);
+        }
+        else {
             console.log('Enter your Apify API token. You can find it at https://console.apify.com/account#/integrations');
-            const tokenPrompt = await inquirer.prompt([{ name: 'token', message: 'token:', type: 'password' }]);
-            ({ token } = tokenPrompt);
+            const tokenAnswer = await inquirer.prompt([{ name: 'token', message: 'token:', type: 'password' }]);
+            await tryToLogin(tokenAnswer.token);
         }
-        const isUserLogged = await getLoggedClient(token);
-        const userInfo = await getLocalUserInfo();
-        await useApifyIdentity(userInfo.id);
-        return isUserLogged
-            ? success(`You are logged in to Apify as ${userInfo.username || userInfo.id}!`)
-            : error('Login to Apify failed, the provided API token is not valid.');
     }
 }
 Object.defineProperty(LoginCommand, "description", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: 'Logs in to your Apify account using a provided API token.\nThe API token and other account '
+    value: 'Logs in to your Apify account.\nThe API token and other account '
         + 'information is stored in the ~/.apify directory, from where it is read by all other "apify" commands. '
         + 'To log out, call "apify logout".'
 });
@@ -38,6 +163,12 @@ Object.defineProperty(LoginCommand, "flags", {
             description: '[Optional] Apify API token',
             required: false,
         }),
+        method: Flags.string({
+            char: 'm',
+            description: '[Optional] Method of logging in to Apify',
+            options: ['console', 'manual'],
+            required: false,
+        }),
     }
 });
 //# sourceMappingURL=login.js.map

package/dist/commands/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,OAAO,YAAa,SAAQ,YAAiC;IAa/D,KAAK,CAAC,GAAG;QACL,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE3B,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,gGAAgG,CAAC,CAAC;YAC9G,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAoB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YACvH,CAAC,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,CAAC;QAC9B,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC1C,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAG,CAAC,CAAC;QACrC,OAAO,YAAY;YACf,CAAC,CAAC,OAAO,CAAC,iCAAiC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE,GAAG,CAAC;YAC/E,CAAC,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC/E,CAAC;;AA3Be;;;;WAAc,6FAA6F;UACzH,wGAAwG;UACxG,kCAAkC;GAAC;AAErB;;;;WAAQ;QACpB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAChB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,4BAA4B;YACzC,QAAQ,EAAE,KAAK;SAClB,CAAC;KACL;GAAC"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}

package/dist/commands/secrets/index.js

@@ -11,7 +11,7 @@ Object.defineProperty(SecretsIndexCommand, "description", {
     writable: true,
     value: 'Manages secret values for Actor environment variables.\n\n'
         + 'Example:\n'
-        + '$ apify secrets:add mySecret TopSecretValue123\n\n'
+        + '$ apify secrets add mySecret TopSecretValue123\n\n'
         + `Now the "mySecret" value can be used in an environment variable defined in "${LOCAL_CONFIG_PATH}" file by adding the "@" prefix:\n\n`
         + '{\n'
         + '  "actorSpecification": 1,\n'

package/dist/lib/secrets.js

@@ -24,7 +24,7 @@ const writeSecretsFile = (secrets) => {
 export const addSecret = (name, value) => {
     const secrets = getSecretsFile();
     if (secrets[name])
-        throw new Error(`Secret with name ${name} already exists. Call "apify secrets:rm ${name}" to remove it.`);
+        throw new Error(`Secret with name ${name} already exists. Call "apify secrets rm ${name}" to remove it.`);
     if (!_.isString(name) || name.length > MAX_ENV_VAR_NAME_LENGTH) {
         throw new Error(`Secret name has to be string with maximum length ${MAX_ENV_VAR_NAME_LENGTH}.`);
     }
@@ -60,7 +60,7 @@ export const replaceSecretsValue = (env, secrets) => {
                 updatedEnv[key] = secrets[secretKey];
             }
             else {
-                warning(`Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets:add ${secretKey} [SECRET_VALUE]"`);
+                warning(`Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets add ${secretKey} [SECRET_VALUE]"`);
             }
         }
         else {
@@ -89,7 +89,7 @@ export const transformEnvToEnvVars = (env, secrets) => {
                 });
             }
             else {
-                warning(`Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets:add ${secretKey} [SECRET_VALUE]"`);
+                warning(`Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets add ${secretKey} [SECRET_VALUE]"`);
             }
         }
         else {

package/oclif.manifest.json

@@ -251,10 +251,10 @@
         "init.js"
       ]
     },
-    "login-new": {
+    "login": {
       "aliases": [],
       "args": {},
-      "description": "Logs in to your Apify account using your API token.\nThe API token and other account information is stored in the ~/.apify directory, from where it is read by all other \"apify\" commands. To log out, call \"apify logout\".",
+      "description": "Logs in to your Apify account.\nThe API token and other account information is stored in the ~/.apify directory, from where it is read by all other \"apify\" commands. To log out, call \"apify logout\".",
       "flags": {
         "token": {
           "char": "t",
@@ -264,35 +264,18 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hidden": true,
-      "hiddenAliases": [],
-      "id": "login-new",
-      "pluginAlias": "apify-cli",
-      "pluginName": "apify-cli",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "login-new.js"
-      ]
-    },
-    "login": {
-      "aliases": [],
-      "args": {},
-      "description": "Logs in to your Apify account using a provided API token.\nThe API token and other account information is stored in the ~/.apify directory, from where it is read by all other \"apify\" commands. To log out, call \"apify logout\".",
-      "flags": {
-        "token": {
-          "char": "t",
-          "description": "[Optional] Apify API token",
-          "name": "token",
+        },
+        "method": {
+          "char": "m",
+          "description": "[Optional] Method of logging in to Apify",
+          "name": "method",
           "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "console",
+            "manual"
+          ],
           "type": "option"
         }
       },
@@ -681,7 +664,7 @@
     "secrets": {
       "aliases": [],
       "args": {},
-      "description": "Manages secret values for Actor environment variables.\n\nExample:\n$ apify secrets:add mySecret TopSecretValue123\n\nNow the \"mySecret\" value can be used in an environment variable defined in \".actor/actor.json\" file by adding the \"@\" prefix:\n\n{\n  \"actorSpecification\": 1,\n  \"name\": \"my_actor\",\n  \"environmentVariables\": { \"SECRET_ENV_VAR\": \"@mySecret\" },\n  \"version\": \"0.1\n}\n\nWhen the Actor is pushed to Apify cloud, the \"SECRET_ENV_VAR\" and its value is stored as a secret environment variable of the Actor.",
+      "description": "Manages secret values for Actor environment variables.\n\nExample:\n$ apify secrets add mySecret TopSecretValue123\n\nNow the \"mySecret\" value can be used in an environment variable defined in \".actor/actor.json\" file by adding the \"@\" prefix:\n\n{\n  \"actorSpecification\": 1,\n  \"name\": \"my_actor\",\n  \"environmentVariables\": { \"SECRET_ENV_VAR\": \"@mySecret\" },\n  \"version\": \"0.1\n}\n\nWhen the Actor is pushed to Apify cloud, the \"SECRET_ENV_VAR\" and its value is stored as a secret environment variable of the Actor.",
       "flags": {},
       "hasDynamicHelp": false,
       "hiddenAliases": [],
@@ -725,5 +708,5 @@
       ]
     }
   },
-  "version": "1.0.0-beta.13"
+  "version": "1.0.0-beta.15"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "apify-cli",
-    "version": "1.0.0-beta.13",
+    "version": "1.0.0-beta.15",
     "description": "Apify command-line interface (CLI) helps you manage the Apify cloud platform and develop, build, and deploy Apify Actors.",
     "exports": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -60,7 +60,7 @@
         "@apify/input_schema": "~3.5.15",
         "@apify/utilities": "~2.10.0",
         "@crawlee/memory-storage": "~3.8.1",
-        "@oclif/core": "~3.23.0",
+        "@oclif/core": "~3.25.0",
         "@oclif/plugin-help": "~6.0.14",
         "@root/walk": "~1.1.0",
         "adm-zip": "~0.5.10",
@@ -138,7 +138,8 @@
         ],
         "additionalVersionFlags": [
             "-v"
-        ]
+        ],
+        "topicSeparator": " "
     },
     "volta": {
         "node": "20.11.1",

package/dist/commands/login-new.d.ts

@@ -1,10 +0,0 @@
-import { ApifyCommand } from '../lib/apify_command.js';
-export declare class LoginNewCommand extends ApifyCommand<typeof LoginNewCommand> {
-    static description: string;
-    static flags: {
-        token: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-    };
-    static hidden: boolean;
-    run(): Promise<void>;
-}
-//# sourceMappingURL=login-new.d.ts.map

package/dist/commands/login-new.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"login-new.d.ts","sourceRoot":"","sources":["../../src/commands/login-new.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AA0BvD,qBAAa,eAAgB,SAAQ,YAAY,CAAC,OAAO,eAAe,CAAC;IACrE,OAAgB,WAAW,SAEU;IAErC,OAAgB,KAAK;;MAMnB;IAEF,OAAgB,MAAM,UAAQ;IAExB,GAAG;CAoHZ"}

package/dist/commands/login-new.js

@@ -1,166 +0,0 @@
-import { cryptoRandomObjectId } from '@apify/utilities';
-import { Flags } from '@oclif/core';
-import computerName from 'computer-name';
-import cors from 'cors';
-import express from 'express';
-import inquirer from 'inquirer';
-import open from 'open';
-import { ApifyCommand } from '../lib/apify_command.js';
-import { error, info, success, warning } from '../lib/outputs.js';
-import { useApifyIdentity } from '../lib/telemetry.js';
-import { getLocalUserInfo, getLoggedClient } from '../lib/utils.js';
-const CONSOLE_BASE_URL = 'https://console.apify.com/account?tab=integrations';
-// const CONSOLE_BASE_URL = 'http://localhost:3000/account?tab=integrations';
-const CONSOLE_URL_ORIGIN = new URL(CONSOLE_BASE_URL).origin;
-const API_BASE_URL = CONSOLE_BASE_URL.includes('localhost') ? 'http://localhost:3333' : undefined;
-// Not really checked right now, but it might come useful if we ever need to do some breaking changes
-const API_VERSION = 'v1';
-const tryToLogin = async (token) => {
-    const isUserLogged = await getLoggedClient(token, API_BASE_URL);
-    const userInfo = await getLocalUserInfo();
-    if (isUserLogged) {
-        await useApifyIdentity(userInfo.id);
-        success(`You are logged in to Apify as ${userInfo.username || userInfo.id}!`);
-    }
-    else {
-        error('Login to Apify failed, the provided API token is not valid.');
-    }
-    return isUserLogged;
-};
-export class LoginNewCommand extends ApifyCommand {
-    async run() {
-        warning('This command is still experimental and might break at any time. Use at your own risk.\n');
-        const { token } = this.flags;
-        if (token) {
-            await tryToLogin(token);
-            return;
-        }
-        const answer = await inquirer.prompt([{
-                type: 'list',
-                name: 'loginMethod',
-                message: 'Choose how you want to log in to Apify',
-                choices: [
-                    { value: 'console', name: 'Through Apify Console in your default browser', short: 'Through Apify Console' },
-                    { value: 'manual', name: 'Enter API token manually', short: 'Manually' },
-                ],
-                loop: false,
-            }]);
-        if (answer.loginMethod === 'console') {
-            let server;
-            const app = express();
-            // To send requests from browser to localhost, CORS has to be configured properly
-            app.use(cors({
-                origin: CONSOLE_URL_ORIGIN,
-                allowedHeaders: ['Content-Type', 'Authorization'],
-            }));
-            // Turn off keepalive, otherwise closing the server when command is finished is lagging
-            app.use((_, res, next) => {
-                res.set('Connection', 'close');
-                next();
-            });
-            app.use(express.json());
-            // Basic authorization via a random token, which is passed to the Apify Console,
-            // and that sends it back via the `token` query param, or `Authorization` header
-            const authToken = cryptoRandomObjectId();
-            app.use((req, res, next) => {
-                let { token: serverToken } = req.query;
-                if (!serverToken) {
-                    const authorizationHeader = req.get('Authorization');
-                    if (authorizationHeader) {
-                        const [schema, tokenFromHeader, ...extra] = authorizationHeader.trim().split(/\s+/);
-                        if (schema.toLowerCase() === 'bearer' && tokenFromHeader && extra.length === 0) {
-                            serverToken = tokenFromHeader;
-                        }
-                    }
-                }
-                if (serverToken !== authToken) {
-                    res.status(401);
-                    res.send('Authorization failed');
-                }
-                else {
-                    next();
-                }
-            });
-            const apiRouter = express.Router();
-            app.use(`/api/${API_VERSION}`, apiRouter);
-            apiRouter.post('/login-token', async (req, res) => {
-                try {
-                    if (req.body.apiToken) {
-                        await tryToLogin(req.body.apiToken);
-                    }
-                    else {
-                        throw new Error('Request did not contain API token');
-                    }
-                    res.end();
-                }
-                catch (err) {
-                    const errorMessage = `Login to Apify failed with error: ${err.message}`;
-                    error(errorMessage);
-                    res.status(500);
-                    res.send(errorMessage);
-                }
-                server.close();
-            });
-            apiRouter.post('/exit', (req, res) => {
-                if (req.body.isWindowClosed) {
-                    error('Login to Apify failed, the console window was closed.');
-                }
-                else if (req.body.actionCanceled) {
-                    error('Login to Apify failed, the action was canceled in the Apify Console.');
-                }
-                else {
-                    error('Login to Apify failed.');
-                }
-                res.end();
-                server.close();
-            });
-            // Listening on port 0 will assign a random available port
-            server = app.listen(0);
-            const { port } = server.address();
-            const consoleUrl = new URL(CONSOLE_BASE_URL);
-            consoleUrl.searchParams.set('localCliCommand', 'login');
-            consoleUrl.searchParams.set('localCliPort', `${port}`);
-            consoleUrl.searchParams.set('localCliToken', authToken);
-            consoleUrl.searchParams.set('localCliApiVersion', API_VERSION);
-            try {
-                consoleUrl.searchParams.set('localCliComputerName', encodeURIComponent(computerName()));
-            }
-            catch {
-                // Ignore errors from fetching computer name as it's not critical
-            }
-            info(`Opening Apify Console at "${consoleUrl.href}"...`);
-            await open(consoleUrl.href);
-        }
-        else {
-            const tokenAnswer = await inquirer.prompt([{ name: 'token', message: 'Insert your Apify API token', type: 'password' }]);
-            await tryToLogin(tokenAnswer.token);
-        }
-    }
-}
-Object.defineProperty(LoginNewCommand, "description", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: 'Logs in to your Apify account using your API token.\nThe API token and other account '
-        + 'information is stored in the ~/.apify directory, from where it is read by all other "apify" commands. '
-        + 'To log out, call "apify logout".'
-});
-Object.defineProperty(LoginNewCommand, "flags", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: {
-        token: Flags.string({
-            char: 't',
-            description: '[Optional] Apify API token',
-            required: false,
-        }),
-    }
-});
-Object.defineProperty(LoginNewCommand, "hidden", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: true
-});
-//# sourceMappingURL=login-new.js.map

package/dist/commands/login-new.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"login-new.js","sourceRoot":"","sources":["../../src/commands/login-new.ts"],"names":[],"mappings":"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"}