@salesforce/plugin-auth 2.5.2 → 2.6.0

package/lib/commands/{auth/list.d.ts → org/list/auth.d.ts}

@@ -4,7 +4,7 @@ type AuthListResult = Omit<OrgAuthorization, 'aliases'> & {
     alias: string;
 };
 export type AuthListResults = AuthListResult[];
-export default class List extends SfCommand<AuthListResults> {
+export default class ListAuth extends SfCommand<AuthListResults> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];

package/lib/commands/{auth/list.js → org/list/auth.js}

@@ -10,9 +10,9 @@ const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'list');
-class List extends sf_plugins_core_1.SfCommand {
+class ListAuth extends sf_plugins_core_1.SfCommand {
     async run() {
-        await this.parse(List);
+        await this.parse(ListAuth);
         try {
             const auths = await core_1.AuthInfo.listAllAuthorizations();
             if (auths.length === 0) {
@@ -46,13 +46,13 @@ class List extends sf_plugins_core_1.SfCommand {
         }
     }
 }
-exports.default = List;
-List.summary = messages.getMessage('summary');
-List.description = messages.getMessage('description');
-List.examples = messages.getMessages('examples');
-List.deprecateAliases = true;
-List.aliases = ['force:auth:list'];
-List.flags = {
+exports.default = ListAuth;
+ListAuth.summary = messages.getMessage('summary');
+ListAuth.description = messages.getMessage('description');
+ListAuth.examples = messages.getMessages('examples');
+ListAuth.deprecateAliases = true;
+ListAuth.aliases = ['force:auth:list', 'auth:list'];
+ListAuth.flags = {
     loglevel: sf_plugins_core_1.loglevel,
 };
-//# sourceMappingURL=list.js.map
+//# sourceMappingURL=auth.js.map

package/lib/commands/org/list/auth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/commands/org/list/auth.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAAkE;AAClE,2CAAwE;AAGxE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;AAE1E,MAAqB,QAAS,SAAQ,2BAA0B;IAWvD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,eAAQ,CAAC,qBAAqB,EAAE,CAAC;YACrD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAChD,OAAO,EAAE,CAAC;aACX;YACD,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAA0C,EAAE,EAAE;gBAC3E,oEAAoE;gBACpE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAExD,OAAO,IAAI,CAAC,OAAO,CAAC;gBACpB,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAClE,IAAI,OAAO,GAAG;gBACZ,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;gBAC1B,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE;gBAChC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;gBAC3B,WAAW,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;gBACvC,WAAW,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;aACvC,CAAC;YACF,IAAI,SAAS,EAAE;gBACb,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;aAC7D;YACD,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACjC,OAAO,WAAW,CAAC;SACpB;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAChD,OAAO,EAAE,CAAC;SACX;IACH,CAAC;;AA5CH,2BA6CC;AA5CwB,gBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,oBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,iBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,yBAAgB,GAAG,IAAI,CAAC;AACjC,gBAAO,GAAG,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;AAElC,cAAK,GAAG;IAC7B,QAAQ,EAAR,0BAAQ;CACT,CAAC"}

package/lib/commands/{auth/accesstoken/store.d.ts → org/login/access-token.d.ts}

@@ -2,7 +2,7 @@
 import { AuthFields } from '@salesforce/core';
 import { Interfaces } from '@oclif/core';
 import { AuthBaseCommand } from '../../../authBaseCommand';
-export default class Store extends AuthBaseCommand<AuthFields> {
+export default class LoginAccessToken extends AuthBaseCommand<AuthFields> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];

package/lib/commands/{auth/accesstoken/store.js → org/login/access-token.js}

@@ -15,9 +15,9 @@ 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 authBaseCommand_1.AuthBaseCommand {
+class LoginAccessToken extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        const { flags } = await this.parse(Store);
+        const { flags } = await this.parse(LoginAccessToken);
         this.flags = flags;
         const instanceUrl = (0, ts_types_1.ensureString)((0, ts_types_1.getString)(flags, 'instance-url.href'));
         const accessToken = await this.getAccessToken();
@@ -60,49 +60,50 @@ class Store extends authBaseCommand_1.AuthBaseCommand {
     }
     async getAccessToken() {
         const accessToken = kit_1.env.getString('SFDX_ACCESS_TOKEN') ?? (await this.askForAccessToken());
-        if (!core_1.sfdc.matchesAccessToken(accessToken)) {
+        if (!(0, core_1.matchesAccessToken)(accessToken)) {
             throw new core_1.SfError(messages.getMessage('invalidAccessTokenFormat', [ACCESS_TOKEN_FORMAT]));
         }
         return accessToken;
     }
 }
-exports.default = Store;
-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.flags = {
+exports.default = LoginAccessToken;
+LoginAccessToken.summary = messages.getMessage('summary');
+LoginAccessToken.description = messages.getMessage('description');
+LoginAccessToken.examples = messages.getMessages('examples');
+LoginAccessToken.deprecateAliases = true;
+LoginAccessToken.aliases = ['force:auth:accesstoken:store', 'auth:accesstoken:store'];
+LoginAccessToken.flags = {
     'instance-url': sf_plugins_core_1.Flags.url({
         char: 'r',
-        summary: commonMessages.getMessage('instanceUrl'),
+        summary: commonMessages.getMessage('flags.instance-url.summary'),
+        description: commonMessages.getMessage('flags.instance-url.description'),
         required: true,
         deprecateAliases: true,
         aliases: ['instanceurl'],
     }),
     'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        summary: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
         default: false,
         deprecateAliases: true,
-        aliases: ['setdefaultdevhub'],
+        aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
     }),
     'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        summary: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('flags.set-default.summary'),
         default: false,
         deprecateAliases: true,
         aliases: ['setdefaultusername'],
     }),
     alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        summary: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('flags.alias.summary'),
         deprecateAliases: true,
         aliases: ['setalias'],
     }),
     'no-prompt': sf_plugins_core_1.Flags.boolean({
         char: 'p',
-        summary: commonMessages.getMessage('noPrompt'),
+        summary: commonMessages.getMessage('flags.no-prompt.summary'),
         required: false,
         default: false,
         deprecateAliases: true,
@@ -110,4 +111,4 @@ Store.flags = {
     }),
     loglevel: sf_plugins_core_1.loglevel,
 };
-//# sourceMappingURL=store.js.map
+//# sourceMappingURL=access-token.js.map

package/lib/commands/org/login/access-token.js.map

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

package/lib/commands/{auth/device/login.d.ts → org/login/device.d.ts}

@@ -3,7 +3,7 @@ import { AuthFields } from '@salesforce/core';
 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> {
+export default class LoginDevice extends AuthBaseCommand<DeviceLoginResult> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];

package/lib/commands/{auth/device/login.js → org/login/device.js}

@@ -15,16 +15,16 @@ 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 authBaseCommand_1.AuthBaseCommand {
+class LoginDevice extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        const { flags } = await this.parse(Login);
+        const { flags } = await this.parse(LoginDevice);
         if (await this.shouldExitCommand(false))
             return {};
         const oauthConfig = {
-            loginUrl: await common_1.Common.resolveLoginUrl((0, ts_types_1.get)(flags.instanceurl, 'href', null)),
-            clientId: flags.clientid,
+            loginUrl: await common_1.Common.resolveLoginUrl((0, ts_types_1.get)(flags['instance-url'], 'href', null)),
+            clientId: flags['client-id'],
         };
-        if (flags.clientid) {
+        if (flags['client-id']) {
             oauthConfig.clientSecret = await this.askForClientSecret(flags['disable-masking']);
         }
         const deviceOauthService = await core_1.DeviceOauthService.create(oauthConfig);
@@ -56,48 +56,49 @@ class Login extends authBaseCommand_1.AuthBaseCommand {
         }
     }
 }
-exports.default = Login;
-Login.summary = messages.getMessage('summary');
-Login.description = messages.getMessage('description');
-Login.examples = messages.getMessages('examples');
-Login.aliases = ['force:auth:device:login'];
-Login.flags = {
+exports.default = LoginDevice;
+LoginDevice.summary = messages.getMessage('summary');
+LoginDevice.description = messages.getMessage('description');
+LoginDevice.examples = messages.getMessages('examples');
+LoginDevice.aliases = ['force:auth:device:login', 'auth:device:login'];
+LoginDevice.flags = {
     'client-id': sf_plugins_core_1.Flags.string({
         char: 'i',
-        summary: commonMessages.getMessage('clientId'),
+        summary: commonMessages.getMessage('flags.client-id.summary'),
         deprecateAliases: true,
         aliases: ['clientid'],
     }),
     'instance-url': sf_plugins_core_1.Flags.url({
         char: 'r',
-        summary: commonMessages.getMessage('instanceUrl'),
+        summary: commonMessages.getMessage('flags.instance-url.summary'),
+        description: commonMessages.getMessage('flags.instance-url.description'),
         deprecateAliases: true,
         aliases: ['instanceurl'],
     }),
     'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        summary: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
         deprecateAliases: true,
-        aliases: ['setdefaultdevhub'],
+        aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
     }),
     'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        summary: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('flags.set-default.summary'),
         deprecateAliases: true,
         aliases: ['setdefaultusername'],
     }),
     alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        summary: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('flags.alias.summary'),
         deprecateAliases: true,
         aliases: ['setalias'],
     }),
     'disable-masking': sf_plugins_core_1.Flags.boolean({
-        summary: commonMessages.getMessage('disableMasking'),
+        summary: commonMessages.getMessage('flags.disable-masking.summary'),
         hidden: true,
         deprecateAliases: true,
         aliases: ['disablemasking'],
     }),
     loglevel: sf_plugins_core_1.loglevel,
 };
-//# sourceMappingURL=login.js.map
+//# sourceMappingURL=device.js.map

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

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

package/lib/commands/{auth/jwt/grant.d.ts → org/login/jwt.d.ts}

@@ -2,7 +2,7 @@
 import { AuthFields } from '@salesforce/core';
 import { Interfaces } from '@oclif/core';
 import { AuthBaseCommand } from '../../../authBaseCommand';
-export default class Grant extends AuthBaseCommand<AuthFields> {
+export default class LoginJwt extends AuthBaseCommand<AuthFields> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];

package/lib/commands/{auth/jwt/grant.js → org/login/jwt.js}

@@ -14,13 +14,13 @@ 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 authBaseCommand_1.AuthBaseCommand {
+class LoginJwt extends authBaseCommand_1.AuthBaseCommand {
     constructor() {
         super(...arguments);
         this.logger = core_1.Logger.childFromRoot(this.constructor.name);
     }
     async run() {
-        const { flags } = await this.parse(Grant);
+        const { flags } = await this.parse(LoginJwt);
         this.flags = flags;
         let result = {};
         if (await this.shouldExitCommand(flags['no-prompt']))
@@ -76,60 +76,61 @@ class Grant extends authBaseCommand_1.AuthBaseCommand {
         return authInfo;
     }
 }
-exports.default = Grant;
-Grant.summary = messages.getMessage('summary');
-Grant.description = messages.getMessage('description');
-Grant.examples = messages.getMessages('examples');
-Grant.aliases = ['force:auth:jwt:grant'];
-Grant.flags = {
+exports.default = LoginJwt;
+LoginJwt.summary = messages.getMessage('summary');
+LoginJwt.description = messages.getMessage('description');
+LoginJwt.examples = messages.getMessages('examples');
+LoginJwt.aliases = ['force:auth:jwt:grant', 'auth:jwt:grant'];
+LoginJwt.flags = {
     username: sf_plugins_core_1.Flags.string({
         char: 'o',
-        summary: messages.getMessage('username'),
+        summary: messages.getMessage('flags.username.summary'),
         required: true,
         deprecateAliases: true,
         aliases: ['u'],
     }),
     'jwt-key-file': sf_plugins_core_1.Flags.file({
         char: 'f',
-        summary: messages.getMessage('key'),
+        summary: messages.getMessage('flags.jwt-key-file.summary'),
         required: true,
         deprecateAliases: true,
         aliases: ['jwtkeyfile'],
     }),
     'client-id': sf_plugins_core_1.Flags.string({
         char: 'i',
-        summary: commonMessages.getMessage('clientId'),
+        summary: commonMessages.getMessage('flags.client-id.summary'),
         required: true,
         deprecateAliases: true,
         aliases: ['clientid'],
     }),
     'instance-url': sf_plugins_core_1.Flags.url({
         char: 'r',
-        summary: commonMessages.getMessage('instanceUrl'),
+        summary: commonMessages.getMessage('flags.instance-url.summary'),
+        description: commonMessages.getMessage('flags.instance-url.description'),
         deprecateAliases: true,
         aliases: ['instanceurl'],
     }),
     'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        summary: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
         deprecateAliases: true,
-        aliases: ['setdefaultdevhub'],
+        aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
     }),
     'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        summary: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('flags.set-default.summary'),
         deprecateAliases: true,
         aliases: ['setdefaultusername'],
     }),
     alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        summary: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('flags.alias.summary'),
         deprecateAliases: true,
         aliases: ['setalias'],
     }),
     'no-prompt': sf_plugins_core_1.Flags.boolean({
         char: 'p',
-        summary: commonMessages.getMessage('noPromptAuth'),
+        summary: commonMessages.getMessage('flags.no-prompt.summary'),
         required: false,
         hidden: true,
         deprecateAliases: true,
@@ -137,4 +138,4 @@ Grant.flags = {
     }),
     loglevel: sf_plugins_core_1.loglevel,
 };
-//# sourceMappingURL=grant.js.map
+//# sourceMappingURL=jwt.js.map

package/lib/commands/org/login/jwt.js.map

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

package/lib/commands/{auth/sfdxurl/store.d.ts → org/login/sfdx-url.d.ts}

@@ -1,6 +1,6 @@
 import { AuthFields } from '@salesforce/core';
 import { AuthBaseCommand } from '../../../authBaseCommand';
-export default class Store extends AuthBaseCommand<AuthFields> {
+export default class LoginSfdxUrl extends AuthBaseCommand<AuthFields> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];

package/lib/commands/{auth/sfdxurl/store.js → org/login/sfdx-url.js}

@@ -15,9 +15,9 @@ core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'sfdxurl.store');
 const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
 const AUTH_URL_FORMAT = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';
-class Store extends authBaseCommand_1.AuthBaseCommand {
+class LoginSfdxUrl extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        const { flags } = await this.parse(Store);
+        const { flags } = await this.parse(LoginSfdxUrl);
         if (await this.shouldExitCommand(flags['no-prompt']))
             return {};
         const authFile = flags['sfdx-url-file'];
@@ -42,40 +42,40 @@ class Store extends authBaseCommand_1.AuthBaseCommand {
         return result;
     }
 }
-exports.default = Store;
-Store.summary = messages.getMessage('summary');
-Store.description = messages.getMessage('description', [AUTH_URL_FORMAT]);
-Store.examples = messages.getMessages('examples');
-Store.aliases = ['force:auth:sfdxurl:store'];
-Store.flags = {
+exports.default = LoginSfdxUrl;
+LoginSfdxUrl.summary = messages.getMessage('summary');
+LoginSfdxUrl.description = messages.getMessage('description', [AUTH_URL_FORMAT]);
+LoginSfdxUrl.examples = messages.getMessages('examples');
+LoginSfdxUrl.aliases = ['force:auth:sfdxurl:store', 'auth:sfdxurl:store'];
+LoginSfdxUrl.flags = {
     'sfdx-url-file': sf_plugins_core_1.Flags.file({
         char: 'f',
-        summary: messages.getMessage('file'),
+        summary: messages.getMessage('flags.sfdx-url-file.summary'),
         required: true,
         deprecateAliases: true,
         aliases: ['sfdxurlfile'],
     }),
     'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        summary: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
         deprecateAliases: true,
-        aliases: ['setdefaultdevhub'],
+        aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
     }),
     'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        summary: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('flags.set-default.summary'),
         deprecateAliases: true,
         aliases: ['setdefaultusername'],
     }),
     alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        summary: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('flags.alias.summary'),
         deprecateAliases: true,
         aliases: ['setalias'],
     }),
     'no-prompt': sf_plugins_core_1.Flags.boolean({
         char: 'p',
-        summary: commonMessages.getMessage('noPromptAuth'),
+        summary: commonMessages.getMessage('flags.no-prompt.summary'),
         required: false,
         hidden: true,
         deprecateAliases: true,
@@ -88,4 +88,4 @@ const getUrlFromJson = async (authFile) => {
     const authFileJson = (0, kit_1.parseJson)(jsonContents);
     return authFileJson.result?.sfdxAuthUrl ?? authFileJson.sfdxAuthUrl;
 };
-//# sourceMappingURL=store.js.map
+//# sourceMappingURL=sfdx-url.js.map

package/lib/commands/org/login/sfdx-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sfdx-url.js","sourceRoot":"","sources":["../../../../src/commands/org/login/sfdx-url.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,0CAAuC;AACvC,iEAA8D;AAC9D,2CAAkE;AAElE,yCAA4C;AAC5C,8DAA2D;AAE3D,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;AACnF,MAAM,cAAc,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAEpF,MAAM,eAAe,GAAG,gEAAgE,CAAC;AAMzF,MAAqB,YAAa,SAAQ,iCAA2B;IA2C5D,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAAE,OAAO,EAAE,CAAC;QAEhE,MAAM,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC;QAExC,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEnH,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CACb,wCAAwC,QAAQ,uFAAuF,CACxI,CAAC;SACH;QAED,MAAM,aAAa,GAAG,eAAQ,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE7D,MAAM,QAAQ,GAAG,MAAM,eAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;QAC1D,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEtB,MAAM,QAAQ,CAAC,6BAA6B,CAAC;YAC3C,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;YAChC,gBAAgB,EAAE,KAAK,CAAC,qBAAqB,CAAC;SAC/C,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxC,uDAAuD;QACvD,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;QAChD,MAAM,eAAQ,CAAC,2BAA2B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE7D,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,yBAAyB,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;;AA5EH,+BA6EC;AA5EwB,oBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,wBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;AACpE,qBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACrD,oBAAO,GAAG,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,CAAC;AAEpD,kBAAK,GAAG;IAC7B,eAAe,EAAE,uBAAK,CAAC,IAAI,CAAC;QAC1B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;QAC3D,QAAQ,EAAE,IAAI;QACd,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,aAAa,CAAC;KACzB,CAAC;IACF,qBAAqB,EAAE,uBAAK,CAAC,OAAO,CAAC;QACnC,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,mCAAmC,CAAC;QACvE,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;KAC1D,CAAC;IACF,aAAa,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC3B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAC/D,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,oBAAoB,CAAC;KAChC,CAAC;IACF,KAAK,EAAE,uBAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACzD,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,UAAU,CAAC;KACtB,CAAC;IACF,WAAW,EAAE,uBAAK,CAAC,OAAO,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAC7D,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,IAAI;QACZ,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,UAAU,CAAC;KACtB,CAAC;IACF,QAAQ,EAAR,0BAAQ;CACT,CAAC;AAsCJ,MAAM,cAAc,GAAG,KAAK,EAAE,QAAgB,EAAmB,EAAE;IACjE,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAA,eAAS,EAAC,YAAY,CAAa,CAAC;IACzD,OAAO,YAAY,CAAC,MAAM,EAAE,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC;AACtE,CAAC,CAAC"}

package/lib/commands/{auth/web/login.d.ts → org/login/web.d.ts}

@@ -2,7 +2,7 @@
 import { AuthFields } from '@salesforce/core';
 import { Interfaces } from '@oclif/core';
 import { AuthBaseCommand } from '../../../authBaseCommand';
-export default class Login extends AuthBaseCommand<AuthFields> {
+export default class LoginWeb extends AuthBaseCommand<AuthFields> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];

package/lib/commands/{auth/web/login.js → org/login/web.js}

@@ -16,9 +16,9 @@ const common_1 = require("../../../common");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'web.login');
 const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
-class Login extends authBaseCommand_1.AuthBaseCommand {
+class LoginWeb extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        const { flags } = await this.parse(Login);
+        const { flags } = await this.parse(LoginWeb);
         this.flags = flags;
         if (isSFDXContainerMode()) {
             throw new core_1.SfError(messages.getMessage('deviceWarning'), 'DEVICE_WARNING');
@@ -27,9 +27,9 @@ class Login extends authBaseCommand_1.AuthBaseCommand {
             return {};
         const oauthConfig = {
             loginUrl: await common_1.Common.resolveLoginUrl((0, ts_types_1.get)(flags['instance-url'], 'href', null)),
-            clientId: flags.clientid,
+            clientId: flags['client-id'],
         };
-        if (flags.clientid) {
+        if (flags['client-id']) {
             oauthConfig.clientSecret = await this.askForClientSecret(flags['disable-masking']);
         }
         try {
@@ -66,57 +66,59 @@ class Login extends authBaseCommand_1.AuthBaseCommand {
         return oauthServer.authorizeAndSave();
     }
 }
-exports.default = Login;
-Login.summary = messages.getMessage('summary');
-Login.description = messages.getMessage('description');
-Login.examples = messages.getMessages('examples');
-Login.deprecateAliases = true;
-Login.aliases = ['force:auth:web:login'];
-Login.flags = {
+exports.default = LoginWeb;
+LoginWeb.summary = messages.getMessage('summary');
+LoginWeb.description = messages.getMessage('description');
+LoginWeb.examples = messages.getMessages('examples');
+LoginWeb.deprecateAliases = true;
+LoginWeb.aliases = ['force:auth:web:login', 'auth:web:login'];
+LoginWeb.flags = {
     browser: sf_plugins_core_1.Flags.string({
         char: 'b',
-        summary: messages.getMessage('browser'),
+        summary: messages.getMessage('flags.browser.summary'),
+        description: messages.getMessage('flags.browser.description'),
         options: ['chrome', 'edge', 'firefox'], // These are ones supported by "open" package
     }),
     'client-id': sf_plugins_core_1.Flags.string({
         char: 'i',
-        summary: commonMessages.getMessage('clientId'),
+        summary: commonMessages.getMessage('flags.client-id.summary'),
         deprecateAliases: true,
         aliases: ['clientid'],
     }),
     'instance-url': sf_plugins_core_1.Flags.url({
         char: 'r',
-        summary: commonMessages.getMessage('instanceUrl'),
+        summary: commonMessages.getMessage('flags.instance-url.summary'),
+        description: commonMessages.getMessage('flags.instance-url.description'),
         deprecateAliases: true,
         aliases: ['instanceurl'],
     }),
     'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        summary: commonMessages.getMessage('setDefaultDevHub'),
+        summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
         deprecateAliases: true,
-        aliases: ['setdefaultdevhubusername'],
+        aliases: ['setdefaultdevhubusername', 'setdefaultdevhub'],
     }),
     'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        summary: commonMessages.getMessage('setDefaultUsername'),
+        summary: commonMessages.getMessage('flags.set-default.summary'),
         deprecateAliases: true,
         aliases: ['setdefaultusername'],
     }),
     alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        summary: commonMessages.getMessage('setAlias'),
+        summary: commonMessages.getMessage('flags.alias.summary'),
         deprecateAliases: true,
         aliases: ['setalias'],
     }),
     'disable-masking': sf_plugins_core_1.Flags.boolean({
-        summary: commonMessages.getMessage('disableMasking'),
+        summary: commonMessages.getMessage('flags.disable-masking.summary'),
         hidden: true,
         deprecateAliases: true,
         aliases: ['disablemasking'],
     }),
     'no-prompt': sf_plugins_core_1.Flags.boolean({
         char: 'p',
-        summary: commonMessages.getMessage('noPromptAuth'),
+        summary: commonMessages.getMessage('flags.no-prompt.summary'),
         required: false,
         hidden: true,
         deprecateAliases: true,
@@ -128,4 +130,4 @@ const isSFDXContainerMode = () => {
     const env = new kit_1.Env();
     return env.getBoolean('SFDX_CONTAINER_MODE');
 };
-//# sourceMappingURL=login.js.map
+//# sourceMappingURL=web.js.map

package/lib/commands/org/login/web.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../../src/commands/org/login/web.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,6BAA6B;AAE7B,iEAA8D;AAE9D,2CAAmG;AACnG,yCAAsC;AACtC,mDAAqD;AAErD,8DAA2D;AAC3D,4CAAyC;AAEzC,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;AAC/E,MAAM,cAAc,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAEpF,MAAqB,QAAS,SAAQ,iCAA2B;IAgExD,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,mBAAmB,EAAE,EAAE;YACzB,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,CAAC;SAC3E;QAED,IAAI,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAAE,OAAO,EAAE,CAAC;QAEhE,MAAM,WAAW,GAAiB;YAChC,QAAQ,EAAE,MAAM,eAAM,CAAC,eAAe,CAAC,IAAA,cAAG,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,IAAI,CAAqB,CAAC;YACpG,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAW;SACvC,CAAC;QAEF,IAAI,KAAK,CAAC,WAAW,CAAC,EAAE;YACtB,WAAW,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;SACpF;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC1D,MAAM,QAAQ,CAAC,6BAA6B,CAAC;gBAC3C,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;gBAChC,gBAAgB,EAAE,KAAK,CAAC,qBAAqB,CAAC;aAC/C,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,eAAQ,CAAC,2BAA2B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAE7D,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,yBAAyB,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACzG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC5B,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,KAAK,GAAG,GAAY,CAAC;YAC3B,aAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAuB,EAAE;gBAC1C,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;aAC5E;YACD,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAED,4CAA4C;IAC5C,kDAAkD;IAC1C,KAAK,CAAC,gBAAgB,CAAC,WAAyB;QACtD,MAAM,WAAW,GAAG,MAAM,qBAAc,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;QACjE,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO;YACpC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAiB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;YAC/E,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,WAAW,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,gBAAgB,EAAE,CAAC;IACxC,CAAC;;AAnHH,2BAoHC;AAnHwB,gBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,oBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,iBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,yBAAgB,GAAG,IAAI,CAAC;AACjC,gBAAO,GAAG,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,CAAC;AAE5C,cAAK,GAAG;IAC7B,OAAO,EAAE,uBAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACrD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAC7D,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,6CAA6C;KACtF,CAAC;IACF,WAAW,EAAE,uBAAK,CAAC,MAAM,CAAC;QACxB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAC7D,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,UAAU,CAAC;KACtB,CAAC;IACF,cAAc,EAAE,uBAAK,CAAC,GAAG,CAAC;QACxB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAChE,WAAW,EAAE,cAAc,CAAC,UAAU,CAAC,gCAAgC,CAAC;QACxE,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,aAAa,CAAC;KACzB,CAAC;IACF,qBAAqB,EAAE,uBAAK,CAAC,OAAO,CAAC;QACnC,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,mCAAmC,CAAC;QACvE,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;KAC1D,CAAC;IACF,aAAa,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC3B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAC/D,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,oBAAoB,CAAC;KAChC,CAAC;IACF,KAAK,EAAE,uBAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACzD,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,UAAU,CAAC;KACtB,CAAC;IACF,iBAAiB,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC/B,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,+BAA+B,CAAC;QACnE,MAAM,EAAE,IAAI;QACZ,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,gBAAgB,CAAC;KAC5B,CAAC;IACF,WAAW,EAAE,uBAAK,CAAC,OAAO,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAC7D,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,IAAI;QACZ,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,UAAU,CAAC;KACtB,CAAC;IACF,QAAQ,EAAR,0BAAQ;CACT,CAAC;AA0DJ,MAAM,mBAAmB,GAAG,GAAY,EAAE;IACxC,MAAM,GAAG,GAAG,IAAI,SAAG,EAAE,CAAC;IACtB,OAAO,GAAG,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;AAC/C,CAAC,CAAC"}

package/lib/commands/{auth → org}/logout.d.ts

@@ -14,7 +14,8 @@ export default class Logout extends AuthBaseCommand<AuthLogoutResults> {
         loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     private flags;
+    private static buildChoices;
     run(): Promise<AuthLogoutResults>;
     private shouldFindAllAuths;
-    private shouldRunLogoutCommand;
+    private promptForOrgsToRemove;
 }