@salesforce/plugin-auth 2.6.0 → 2.6.1

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

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

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

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

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

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

package/lib/commands/{org/login/device.d.ts → auth/device/login.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 LoginDevice extends AuthBaseCommand<DeviceLoginResult> {
+export default class Login extends AuthBaseCommand<DeviceLoginResult> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];

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

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

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

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

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

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

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

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

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

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

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

package/lib/commands/{org/list/auth.js → auth/list.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 ListAuth extends sf_plugins_core_1.SfCommand {
+class List extends sf_plugins_core_1.SfCommand {
     async run() {
-        await this.parse(ListAuth);
+        await this.parse(List);
         try {
             const auths = await core_1.AuthInfo.listAllAuthorizations();
             if (auths.length === 0) {
@@ -46,13 +46,13 @@ class ListAuth extends sf_plugins_core_1.SfCommand {
         }
     }
 }
-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 = {
+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 = {
     loglevel: sf_plugins_core_1.loglevel,
 };
-//# sourceMappingURL=auth.js.map
+//# sourceMappingURL=list.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/auth/list.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,IAAK,SAAQ,2BAA0B;IAWnD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvB,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,uBA6CC;AA5CwB,YAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,aAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,qBAAgB,GAAG,IAAI,CAAC;AACjC,YAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAErB,UAAK,GAAG;IAC7B,QAAQ,EAAR,0BAAQ;CACT,CAAC"}

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

@@ -14,8 +14,7 @@ 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 promptForOrgsToRemove;
+    private shouldRunLogoutCommand;
 }

package/lib/commands/auth/logout.js

@@ -0,0 +1,98 @@
+"use strict";
+/*
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const os = require("os");
+const core_1 = require("@salesforce/core");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const ts_types_1 = require("@salesforce/ts-types");
+const authBaseCommand_1 = require("../../authBaseCommand");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'logout');
+const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
+class Logout extends authBaseCommand_1.AuthBaseCommand {
+    async run() {
+        const { flags } = await this.parse(Logout);
+        this.flags = flags;
+        this.configAggregator = await core_1.ConfigAggregator.create();
+        const remover = await core_1.AuthRemover.create();
+        let usernames;
+        try {
+            const targetUsername = this.flags['target-org'] ?? this.configAggregator.getInfo(core_1.OrgConfigProperties.TARGET_ORG).value;
+            usernames = (this.shouldFindAllAuths()
+                ? Object.keys(remover.findAllAuths())
+                : [(await remover.findAuth(targetUsername))?.username ?? targetUsername]).filter((username) => username);
+        }
+        catch (e) {
+            // keep the error name the same for SFDX
+            const err = e;
+            err.name = 'NoOrgFound';
+            throw core_1.SfError.wrap(err);
+        }
+        if (await this.shouldRunLogoutCommand(usernames)) {
+            for (const username of usernames) {
+                // run sequentially to avoid configFile concurrency issues
+                // eslint-disable-next-line no-await-in-loop
+                await remover.removeAuth(username);
+            }
+            this.logSuccess(messages.getMessage('logoutOrgCommandSuccess', [usernames.join(os.EOL)]));
+            return usernames;
+        }
+        else {
+            return [];
+        }
+    }
+    shouldFindAllAuths() {
+        return !!this.flags.all || (!this.flags['target-org'] && core_1.Global.getEnvironmentMode() === core_1.Mode.DEMO);
+    }
+    async shouldRunLogoutCommand(usernames) {
+        const orgsToDelete = usernames.filter(ts_types_1.isString);
+        if (orgsToDelete.length === 0) {
+            this.log(messages.getMessage('logoutOrgCommandNoOrgsFound'));
+            return false;
+        }
+        const message = messages.getMessage('logoutCommandYesNo', [
+            orgsToDelete.join(os.EOL),
+            this.config.bin,
+            this.config.bin,
+            this.config.bin,
+        ]);
+        return this.shouldRunCommand(this.flags['no-prompt'], message, false);
+    }
+}
+exports.default = Logout;
+Logout.summary = messages.getMessage('summary');
+Logout.description = messages.getMessage('description');
+Logout.examples = messages.getMessages('examples');
+Logout.deprecateAliases = true;
+Logout.aliases = ['force:auth:logout'];
+Logout.flags = {
+    // taking control over target-org vs using a org flag from sf-plugins-core to guarantee
+    // idempotency of the command
+    'target-org': sf_plugins_core_1.Flags.string({
+        summary: messages.getMessage('flags.target-org.summary'),
+        char: 'o',
+        aliases: ['targetusername', 'u'],
+        deprecateAliases: true,
+    }),
+    all: sf_plugins_core_1.Flags.boolean({
+        char: 'a',
+        summary: messages.getMessage('all'),
+        description: messages.getMessage('allLong'),
+        required: false,
+        exclusive: ['target-org'],
+    }),
+    'no-prompt': sf_plugins_core_1.Flags.boolean({
+        char: 'p',
+        summary: commonMessages.getMessage('noPrompt'),
+        required: false,
+        deprecateAliases: true,
+        aliases: ['noprompt'],
+    }),
+    loglevel: sf_plugins_core_1.loglevel,
+};
+//# sourceMappingURL=logout.js.map

package/lib/commands/auth/logout.js.map

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

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

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

package/lib/commands/{org/login/sfdx-url.js → auth/sfdxurl/store.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 LoginSfdxUrl extends authBaseCommand_1.AuthBaseCommand {
+class Store extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        const { flags } = await this.parse(LoginSfdxUrl);
+        const { flags } = await this.parse(Store);
         if (await this.shouldExitCommand(flags['no-prompt']))
             return {};
         const authFile = flags['sfdx-url-file'];
@@ -42,40 +42,40 @@ class LoginSfdxUrl extends authBaseCommand_1.AuthBaseCommand {
         return result;
     }
 }
-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 = {
+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 = {
     'sfdx-url-file': sf_plugins_core_1.Flags.file({
         char: 'f',
-        summary: messages.getMessage('flags.sfdx-url-file.summary'),
+        summary: messages.getMessage('file'),
         required: true,
         deprecateAliases: true,
         aliases: ['sfdxurlfile'],
     }),
     'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
         char: 'd',
-        summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
+        summary: commonMessages.getMessage('setDefaultDevHub'),
         deprecateAliases: true,
         aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
     }),
     'set-default': sf_plugins_core_1.Flags.boolean({
         char: 's',
-        summary: commonMessages.getMessage('flags.set-default.summary'),
+        summary: commonMessages.getMessage('setDefaultUsername'),
         deprecateAliases: true,
         aliases: ['setdefaultusername'],
     }),
     alias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        summary: commonMessages.getMessage('flags.alias.summary'),
+        summary: commonMessages.getMessage('setAlias'),
         deprecateAliases: true,
         aliases: ['setalias'],
     }),
     'no-prompt': sf_plugins_core_1.Flags.boolean({
         char: 'p',
-        summary: commonMessages.getMessage('flags.no-prompt.summary'),
+        summary: commonMessages.getMessage('noPromptAuth'),
         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=sfdx-url.js.map
+//# sourceMappingURL=store.js.map

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

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

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

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