@salesforce/plugin-auth 2.4.1 → 2.5.0

package/lib/authBaseCommand.d.ts

@@ -0,0 +1,11 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Config } from '@oclif/core';
+export declare abstract class AuthBaseCommand<T> extends SfCommand<T> {
+    constructor(argv: string[], config: Config);
+    protected askForHiddenResponse(messageKey: string, disableMasking?: boolean): Promise<string>;
+    protected shouldExitCommand(noPrompt?: boolean, message?: string): Promise<boolean>;
+    protected shouldRunCommand(noPrompt?: boolean, message?: string, defaultAnswer?: boolean): Promise<boolean>;
+    protected askForClientSecret(disableMasking?: boolean): Promise<string>;
+    protected askForAccessToken(disableMasking?: boolean): Promise<string>;
+    protected askOverwriteAuthFile(username: string): Promise<boolean>;
+}

package/lib/authBaseCommand.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthBaseCommand = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const core_1 = require("@salesforce/core");
+const chalk = require("chalk");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
+function dimMessage(message) {
+    return chalk.dim(message);
+}
+class AuthBaseCommand extends sf_plugins_core_1.SfCommand {
+    constructor(argv, config) {
+        super(argv, config);
+    }
+    async askForHiddenResponse(messageKey, disableMasking = false) {
+        const msg = dimMessage(messages.getMessage(messageKey));
+        const hidden = await this.prompt({
+            message: msg,
+            type: 'input',
+            name: 'response',
+            transformer: (input) => (disableMasking ? input : '*'.repeat(input.length)),
+        });
+        return hidden.response;
+    }
+    async shouldExitCommand(noPrompt, message) {
+        if (noPrompt || core_1.Global.getEnvironmentMode() !== core_1.Mode.DEMO) {
+            return false;
+        }
+        else {
+            const msg = dimMessage(message ?? messages.getMessage('warnAuth', [this.config.bin]));
+            const answer = await this.confirm(msg);
+            return !answer;
+        }
+    }
+    async shouldRunCommand(noPrompt, message, defaultAnswer = true) {
+        if (noPrompt || core_1.Global.getEnvironmentMode() === core_1.Mode.DEMO) {
+            return true;
+        }
+        else {
+            const msg = dimMessage(message ?? messages.getMessage('warnAuth', [this.config.bin]));
+            const answer = await this.confirm(msg, 10000, defaultAnswer);
+            return answer;
+        }
+    }
+    async askForClientSecret(disableMasking = false) {
+        return this.askForHiddenResponse('clientSecretStdin', disableMasking);
+    }
+    async askForAccessToken(disableMasking = false) {
+        return this.askForHiddenResponse('accessTokenStdin', disableMasking);
+    }
+    async askOverwriteAuthFile(username) {
+        const yN = await this.confirm(messages.getMessage('overwriteAccessTokenAuthUserFile', [username]));
+        return yN;
+    }
+}
+exports.AuthBaseCommand = AuthBaseCommand;
+//# sourceMappingURL=authBaseCommand.js.map

package/lib/authBaseCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authBaseCommand.js","sourceRoot":"","sources":["../src/authBaseCommand.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA0D;AAC1D,+BAA+B;AAC/B,iEAAwD;AAGxD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAE9E,SAAS,UAAU,CAAC,OAAe;IACjC,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,MAAsB,eAAmB,SAAQ,2BAAY;IAC3D,YAAmB,IAAc,EAAE,MAAc;QAC/C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtB,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,UAAkB,EAAE,cAAc,GAAG,KAAK;QAC7E,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACxD,MAAM,MAAM,GAAyB,MAAM,IAAI,CAAC,MAAM,CAAC;YACrD,OAAO,EAAE,GAAG;YACZ,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SACpF,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAkB,EAAE,OAAgB;QACpE,IAAI,QAAQ,IAAI,aAAM,CAAC,kBAAkB,EAAE,KAAK,WAAI,CAAC,IAAI,EAAE;YACzD,OAAO,KAAK,CAAC;SACd;aAAM;YACL,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACvC,OAAO,CAAC,MAAM,CAAC;SAChB;IACH,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,QAAkB,EAAE,OAAgB,EAAE,aAAa,GAAG,IAAI;QACzF,IAAI,QAAQ,IAAI,aAAM,CAAC,kBAAkB,EAAE,KAAK,WAAI,CAAC,IAAI,EAAE;YACzD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;YAC7D,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IAES,KAAK,CAAC,kBAAkB,CAAC,cAAc,GAAG,KAAK;QACvD,OAAO,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACxE,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,cAAc,GAAG,KAAK;QACtD,OAAO,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACvE,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,QAAgB;QACnD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,kCAAkC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACnG,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAhDD,0CAgDC"}

package/lib/commands/auth/accesstoken/store.d.ts

@@ -1,10 +1,22 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+/// <reference types="node" />
 import { AuthFields } from '@salesforce/core';
-export default class Store extends SfdxCommand {
+import { Interfaces } from '@oclif/core';
+import { AuthBaseCommand } from '../../../authBaseCommand';
+export default class Store extends AuthBaseCommand<AuthFields> {
+    static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
+    static readonly deprecateAliases = true;
     static aliases: string[];
-    static readonly flagsConfig: FlagsConfig;
+    static readonly flags: {
+        'instance-url': Interfaces.OptionFlag<import("url").URL, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'set-default-dev-hub': Interfaces.BooleanFlag<boolean>;
+        'set-default': Interfaces.BooleanFlag<boolean>;
+        alias: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'no-prompt': Interfaces.BooleanFlag<boolean>;
+        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    private flags;
     run(): Promise<AuthFields>;
     private getUserInfo;
     private storeAuthFromAccessToken;

package/lib/commands/auth/accesstoken/store.js

@@ -6,19 +6,20 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const os = require("os");
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const prompts_1 = require("../../../prompts");
+const authBaseCommand_1 = require("../../../authBaseCommand");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'accesstoken.store');
 const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
 const ACCESS_TOKEN_FORMAT = '"<org id>!<accesstoken>"';
-class Store extends command_1.SfdxCommand {
+class Store extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        const instanceUrl = (0, ts_types_1.ensureString)((0, ts_types_1.getString)(this.flags, 'instanceurl.href'));
+        const { flags } = await this.parse(Store);
+        this.flags = flags;
+        const instanceUrl = (0, ts_types_1.ensureString)((0, ts_types_1.getString)(flags, 'instance-url.href'));
         const accessToken = await this.getAccessToken();
         const authInfo = await this.getUserInfo(accessToken, instanceUrl);
         return this.storeAuthFromAccessToken(authInfo);
@@ -35,36 +36,30 @@ class Store extends command_1.SfdxCommand {
                 authInfo.getUsername(),
                 authInfo.getFields(true).orgId,
             ]);
-            this.ux.log(successMsg);
+            this.logSuccess(successMsg);
         }
         return authInfo.getFields(true);
     }
     async saveAuthInfo(authInfo) {
         await authInfo.save();
         await authInfo.handleAliasAndDefaultSettings({
-            alias: this.flags.setalias,
-            setDefault: this.flags.setdefaultusername,
-            setDefaultDevHub: this.flags.setdefaultdevhubusername,
+            alias: this.flags.alias,
+            setDefault: this.flags['set-default'],
+            setDefaultDevHub: this.flags['set-default-dev-hub'],
         });
         await core_1.AuthInfo.identifyPossibleScratchOrgs(authInfo.getFields(true), authInfo);
     }
     async overwriteAuthInfo(username) {
-        if (!this.flags.noprompt) {
+        if (!this.flags['no-prompt']) {
             const stateAggregator = await core_1.StateAggregator.getInstance();
             if (await stateAggregator.orgs.exists(username)) {
-                return prompts_1.Prompts.askOverwriteAuthFile(this.ux, username);
+                return this.askOverwriteAuthFile(username);
             }
         }
         return true;
     }
     async getAccessToken() {
-        let accessToken;
-        if (kit_1.env.getString('SFDX_ACCESS_TOKEN')) {
-            accessToken = kit_1.env.getString('SFDX_ACCESS_TOKEN');
-        }
-        else {
-            accessToken = await prompts_1.Prompts.askForAccessToken(this.ux);
-        }
+        const accessToken = kit_1.env.getString('SFDX_ACCESS_TOKEN') ?? (await this.askForAccessToken());
         if (!core_1.sfdc.matchesAccessToken(accessToken)) {
             throw new core_1.SfError(messages.getMessage('invalidAccessTokenFormat', [ACCESS_TOKEN_FORMAT]));
         }
@@ -72,34 +67,47 @@ class Store extends command_1.SfdxCommand {
     }
 }
 exports.default = Store;
-Store.description = messages.getMessage('description', [ACCESS_TOKEN_FORMAT]);
-Store.examples = messages.getMessage('examples').split(os.EOL);
+Store.summary = messages.getMessage('summary');
+Store.description = messages.getMessage('description');
+Store.examples = messages.getMessages('examples');
+Store.deprecateAliases = true;
 Store.aliases = ['force:auth:accesstoken:store'];
-Store.flagsConfig = {
-    instanceurl: command_1.flags.url({
+Store.flags = {
+    'instance-url': sf_plugins_core_1.Flags.url({
         char: 'r',
-        description: commonMessages.getMessage('instanceUrl'),
+        summary: commonMessages.getMessage('instanceUrl'),
         required: true,
+        deprecateAliases: true,
+        aliases: ['instanceurl'],
     }),
-    setdefaultdevhubusername: command_1.flags.boolean({
+    'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        description: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('setDefaultDevHub'),
         default: false,
+        deprecateAliases: true,
+        aliases: ['setdefaultdevhub'],
     }),
-    setdefaultusername: command_1.flags.boolean({
+    'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        description: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('setDefaultUsername'),
         default: false,
+        deprecateAliases: true,
+        aliases: ['setdefaultusername'],
     }),
-    setalias: command_1.flags.string({
+    alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        description: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('setAlias'),
+        deprecateAliases: true,
+        aliases: ['setalias'],
     }),
-    noprompt: command_1.flags.boolean({
+    'no-prompt': sf_plugins_core_1.Flags.boolean({
         char: 'p',
-        description: commonMessages.getMessage('noPrompt'),
+        summary: commonMessages.getMessage('noPrompt'),
         required: false,
         default: false,
+        deprecateAliases: true,
+        aliases: ['noprompt'],
     }),
+    loglevel: sf_plugins_core_1.loglevel,
 };
 //# sourceMappingURL=store.js.map

package/lib/commands/auth/accesstoken/store.js.map

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

package/lib/commands/auth/device/login.d.ts

@@ -1,9 +1,21 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+/// <reference types="node" />
 import { AuthFields } from '@salesforce/core';
-export default class Login extends SfdxCommand {
+import { DeviceCodeResponse } from '@salesforce/core/lib/deviceOauthService';
+import { AuthBaseCommand } from '../../../authBaseCommand';
+export type DeviceLoginResult = (AuthFields & DeviceCodeResponse) | Record<string, never>;
+export default class Login extends AuthBaseCommand<DeviceLoginResult> {
+    static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
     static aliases: string[];
-    static readonly flagsConfig: FlagsConfig;
-    run(): Promise<AuthFields>;
+    static readonly flags: {
+        'client-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'instance-url': import("@oclif/core/lib/interfaces").OptionFlag<import("url").URL | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'set-default-dev-hub': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'set-default': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        alias: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'disable-masking': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<DeviceLoginResult>;
 }

package/lib/commands/auth/device/login.js

@@ -6,49 +6,50 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const os = require("os");
-const command_1 = require("@salesforce/command");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
-const prompts_1 = require("../../../prompts");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_2 = require("@oclif/core");
+const authBaseCommand_1 = require("../../../authBaseCommand");
 const common_1 = require("../../../common");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'device.login');
 const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
-class Login extends command_1.SfdxCommand {
+class Login extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        if (await prompts_1.Prompts.shouldExitCommand(this.ux, false))
+        const { flags } = await this.parse(Login);
+        if (await this.shouldExitCommand(false))
             return {};
         const oauthConfig = {
-            loginUrl: await common_1.Common.resolveLoginUrl((0, ts_types_1.get)(this.flags.instanceurl, 'href', null)),
-            clientId: this.flags.clientid,
+            loginUrl: await common_1.Common.resolveLoginUrl((0, ts_types_1.get)(flags.instanceurl, 'href', null)),
+            clientId: flags.clientid,
         };
-        if (this.flags.clientid) {
-            oauthConfig.clientSecret = await prompts_1.Prompts.askForClientSecret(this.ux, this.flags.disablemasking);
+        if (flags.clientid) {
+            oauthConfig.clientSecret = await this.askForClientSecret(flags['disable-masking']);
         }
         const deviceOauthService = await core_1.DeviceOauthService.create(oauthConfig);
         const loginData = await deviceOauthService.requestDeviceLogin();
-        if (this.flags.json) {
-            this.ux.logJson(loginData);
+        if (this.jsonEnabled()) {
+            core_2.ux.log(JSON.stringify(loginData, null, 2));
         }
         else {
-            this.ux.styledHeader(messages.getMessage('actionRequired'));
-            this.ux.log(messages.getMessage('enterCode'), loginData.user_code, loginData.verification_uri);
-            this.ux.log();
+            this.styledHeader(messages.getMessage('actionRequired'));
+            this.log(messages.getMessage('enterCode', [loginData.user_code, loginData.verification_uri]));
+            this.log();
         }
         const approval = await deviceOauthService.awaitDeviceApproval(loginData);
         if (approval) {
             const authInfo = await deviceOauthService.authorizeAndSave(approval);
             await authInfo.handleAliasAndDefaultSettings({
-                alias: this.flags.setalias,
-                setDefault: this.flags.setdefaultusername,
-                setDefaultDevHub: this.flags.setdefaultdevhubusername,
+                alias: flags.alias,
+                setDefault: flags['set-default'],
+                setDefaultDevHub: flags['set-default-dev-hub'],
             });
             const fields = authInfo.getFields(true);
             await core_1.AuthInfo.identifyPossibleScratchOrgs(fields, authInfo);
             const successMsg = messages.getMessage('success', [fields.username]);
-            this.ux.log(successMsg);
-            return fields;
+            this.logSuccess(successMsg);
+            return { ...fields, ...loginData };
         }
         else {
             return {};
@@ -56,33 +57,47 @@ class Login extends command_1.SfdxCommand {
     }
 }
 exports.default = Login;
+Login.summary = messages.getMessage('summary');
 Login.description = messages.getMessage('description');
-Login.examples = messages.getMessage('examples').split(os.EOL);
+Login.examples = messages.getMessages('examples');
 Login.aliases = ['force:auth:device:login'];
-Login.flagsConfig = {
-    clientid: command_1.flags.string({
+Login.flags = {
+    'client-id': sf_plugins_core_1.Flags.string({
         char: 'i',
-        description: commonMessages.getMessage('clientId'),
+        summary: commonMessages.getMessage('clientId'),
+        deprecateAliases: true,
+        aliases: ['clientid'],
     }),
-    instanceurl: command_1.flags.url({
+    'instance-url': sf_plugins_core_1.Flags.url({
         char: 'r',
-        description: commonMessages.getMessage('instanceUrl'),
+        summary: commonMessages.getMessage('instanceUrl'),
+        deprecateAliases: true,
+        aliases: ['instanceurl'],
     }),
-    setdefaultdevhubusername: command_1.flags.boolean({
+    'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        description: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('setDefaultDevHub'),
+        deprecateAliases: true,
+        aliases: ['setdefaultdevhub'],
     }),
-    setdefaultusername: command_1.flags.boolean({
+    'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        description: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('setDefaultUsername'),
+        deprecateAliases: true,
+        aliases: ['setdefaultusername'],
     }),
-    setalias: command_1.flags.string({
+    alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        description: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('setAlias'),
+        deprecateAliases: true,
+        aliases: ['setalias'],
     }),
-    disablemasking: command_1.flags.boolean({
-        description: commonMessages.getMessage('disableMasking'),
+    'disable-masking': sf_plugins_core_1.Flags.boolean({
+        summary: commonMessages.getMessage('disableMasking'),
         hidden: true,
+        deprecateAliases: true,
+        aliases: ['disablemasking'],
     }),
+    loglevel: sf_plugins_core_1.loglevel,
 };
 //# sourceMappingURL=login.js.map

package/lib/commands/auth/device/login.js.map

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

package/lib/commands/auth/jwt/grant.d.ts

@@ -1,10 +1,25 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+/// <reference types="node" />
 import { AuthFields } from '@salesforce/core';
-export default class Grant extends SfdxCommand {
+import { Interfaces } from '@oclif/core';
+import { AuthBaseCommand } from '../../../authBaseCommand';
+export default class Grant extends AuthBaseCommand<AuthFields> {
+    static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
     static aliases: string[];
-    static readonly flagsConfig: FlagsConfig;
+    static readonly flags: {
+        username: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'jwt-key-file': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'client-id': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'instance-url': Interfaces.OptionFlag<import("url").URL | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'set-default-dev-hub': Interfaces.BooleanFlag<boolean>;
+        'set-default': Interfaces.BooleanFlag<boolean>;
+        alias: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'no-prompt': Interfaces.BooleanFlag<boolean>;
+        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    private flags;
+    private logger;
     run(): Promise<AuthFields>;
     private initAuthInfo;
 }

package/lib/commands/auth/jwt/grant.js

@@ -6,26 +6,31 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const os = require("os");
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
-const prompts_1 = require("../../../prompts");
+const authBaseCommand_1 = require("../../../authBaseCommand");
 const common_1 = require("../../../common");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'jwt.grant');
 const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
-class Grant extends command_1.SfdxCommand {
+class Grant extends authBaseCommand_1.AuthBaseCommand {
+    constructor() {
+        super(...arguments);
+        this.logger = core_1.Logger.childFromRoot(this.constructor.name);
+    }
     async run() {
+        const { flags } = await this.parse(Grant);
+        this.flags = flags;
         let result = {};
-        if (await prompts_1.Prompts.shouldExitCommand(this.ux, Boolean(this.flags.noprompt)))
+        if (await this.shouldExitCommand(flags['no-prompt']))
             return {};
         try {
             const authInfo = await this.initAuthInfo();
             await authInfo.handleAliasAndDefaultSettings({
-                alias: this.flags.setalias,
-                setDefault: this.flags.setdefaultusername,
-                setDefaultDevHub: this.flags.setdefaultdevhubusername,
+                alias: flags.alias,
+                setDefault: flags['set-default'],
+                setDefaultDevHub: flags['set-default-dev-hub'],
             });
             result = authInfo.getFields(true);
             await core_1.AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
@@ -35,15 +40,15 @@ class Grant extends command_1.SfdxCommand {
             throw messages.createError('JwtGrantError', [msg]);
         }
         const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
-        this.ux.log(successMsg);
+        this.logSuccess(successMsg);
         return result;
     }
     async initAuthInfo() {
         const oauth2OptionsBase = {
-            clientId: this.flags.clientid,
-            privateKeyFile: this.flags.jwtkeyfile,
+            clientId: this.flags['client-id'],
+            privateKeyFile: this.flags['jwt-key-file'],
         };
-        const loginUrl = await common_1.Common.resolveLoginUrl((0, ts_types_1.get)(this.flags.instanceurl, 'href', null));
+        const loginUrl = await common_1.Common.resolveLoginUrl(this.flags['instance-url']?.href);
         const oauth2Options = loginUrl ? Object.assign(oauth2OptionsBase, { loginUrl }) : oauth2OptionsBase;
         let authInfo;
         try {
@@ -72,46 +77,64 @@ class Grant extends command_1.SfdxCommand {
     }
 }
 exports.default = Grant;
+Grant.summary = messages.getMessage('summary');
 Grant.description = messages.getMessage('description');
-Grant.examples = messages.getMessage('examples').split(os.EOL);
+Grant.examples = messages.getMessages('examples');
 Grant.aliases = ['force:auth:jwt:grant'];
-Grant.flagsConfig = {
-    username: command_1.flags.string({
-        char: 'u',
-        description: messages.getMessage('username'),
+Grant.flags = {
+    username: sf_plugins_core_1.Flags.string({
+        char: 'o',
+        summary: messages.getMessage('username'),
         required: true,
+        deprecateAliases: true,
+        aliases: ['u'],
     }),
-    jwtkeyfile: command_1.flags.filepath({
+    'jwt-key-file': sf_plugins_core_1.Flags.file({
         char: 'f',
-        description: messages.getMessage('key'),
+        summary: messages.getMessage('key'),
         required: true,
+        deprecateAliases: true,
+        aliases: ['jwtkeyfile'],
     }),
-    clientid: command_1.flags.string({
+    'client-id': sf_plugins_core_1.Flags.string({
         char: 'i',
-        description: commonMessages.getMessage('clientId'),
+        summary: commonMessages.getMessage('clientId'),
         required: true,
+        deprecateAliases: true,
+        aliases: ['clientid'],
     }),
-    instanceurl: command_1.flags.url({
+    'instance-url': sf_plugins_core_1.Flags.url({
         char: 'r',
-        description: commonMessages.getMessage('instanceUrl'),
+        summary: commonMessages.getMessage('instanceUrl'),
+        deprecateAliases: true,
+        aliases: ['instanceurl'],
     }),
-    setdefaultdevhubusername: command_1.flags.boolean({
+    'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        description: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('setDefaultDevHub'),
+        deprecateAliases: true,
+        aliases: ['setdefaultdevhub'],
     }),
-    setdefaultusername: command_1.flags.boolean({
+    'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        description: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('setDefaultUsername'),
+        deprecateAliases: true,
+        aliases: ['setdefaultusername'],
     }),
-    setalias: command_1.flags.string({
+    alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        description: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('setAlias'),
+        deprecateAliases: true,
+        aliases: ['setalias'],
     }),
-    noprompt: command_1.flags.boolean({
+    'no-prompt': sf_plugins_core_1.Flags.boolean({
         char: 'p',
-        description: commonMessages.getMessage('noPromptAuth'),
+        summary: commonMessages.getMessage('noPromptAuth'),
         required: false,
         hidden: true,
+        deprecateAliases: true,
+        aliases: ['noprompt'],
     }),
+    loglevel: sf_plugins_core_1.loglevel,
 };
 //# sourceMappingURL=grant.js.map