@salesforce/plugin-auth 2.4.2 → 2.5.0

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

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

package/lib/commands/auth/list.d.ts

@@ -1,8 +1,18 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+import { SfCommand } from '@salesforce/sf-plugins-core';
 import { OrgAuthorization } from '@salesforce/core';
-export default class List extends SfdxCommand {
+type AuthListResult = Omit<OrgAuthorization, 'aliases'> & {
+    alias: string;
+};
+export type AuthListResults = AuthListResult[];
+export default class List extends SfCommand<AuthListResults> {
+    static readonly summary: string;
     static readonly description: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
     static aliases: string[];
-    static readonly flagsConfig: FlagsConfig;
-    run(): Promise<OrgAuthorization[]>;
+    static readonly flags: {
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<AuthListResults>;
 }
+export {};

package/lib/commands/auth/list.js

@@ -6,26 +6,24 @@
  * 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 command_1 = require("@salesforce/command");
+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 command_1.SfdxCommand {
+class List extends sf_plugins_core_1.SfCommand {
     async run() {
+        await this.parse(List);
         try {
             const auths = await core_1.AuthInfo.listAllAuthorizations();
             if (auths.length === 0) {
-                this.ux.log(messages.getMessage('noResultsFound'));
+                this.log(messages.getMessage('noResultsFound'));
                 return [];
             }
-            auths.map((auth) => {
+            const mappedAuths = auths.map((auth) => {
                 // core3 moved to aliases as a string[], revert to alias as a string
-                auth.alias = auth.aliases.join(',');
-                // to prevent 'undefined' entries in the table only delete auth.alias if it's json output
-                // matches the previous behavior where alias was only present when it was defined
-                if (auth.alias === '' && this.flags.json)
-                    delete auth.alias;
+                auth.alias = auth.aliases ? auth.aliases.join(',') : '';
                 delete auth.aliases;
+                return auth;
             });
             const hasErrors = auths.filter((auth) => !!auth.error).length > 0;
             let columns = {
@@ -38,18 +36,23 @@ class List extends command_1.SfdxCommand {
             if (hasErrors) {
                 columns = { ...columns, ...{ error: { header: 'ERROR' } } };
             }
-            this.ux.styledHeader('authenticated orgs');
-            this.ux.table(auths, columns);
-            return auths;
+            this.styledHeader('authenticated orgs');
+            this.table(mappedAuths, columns);
+            return mappedAuths;
         }
         catch (err) {
-            this.ux.log(messages.getMessage('noResultsFound'));
+            this.log(messages.getMessage('noResultsFound'));
             return [];
         }
     }
 }
 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.flagsConfig = {};
+List.flags = {
+    loglevel: sf_plugins_core_1.loglevel,
+};
 //# sourceMappingURL=list.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/auth/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iDAA+D;AAC/D,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,qBAAW;IAKpC,KAAK,CAAC,GAAG;QACd,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,eAAQ,CAAC,qBAAqB,EAAE,CAAC;YACrD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBACnD,OAAO,EAAE,CAAC;aACX;YACD,KAAK,CAAC,GAAG,CAAC,CAAC,IAA0C,EAAE,EAAE;gBACvD,oEAAoE;gBACpE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACpC,yFAAyF;gBACzF,iFAAiF;gBACjF,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,OAAO,IAAI,CAAC,KAAK,CAAC;gBAE5D,OAAO,IAAI,CAAC,OAAO,CAAC;YACtB,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,GAAoD;gBAC7D,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,EAAE,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;YAC3C,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9B,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACnD,OAAO,EAAE,CAAC;SACX;IACH,CAAC;;AAvCH,uBAwCC;AAvCwB,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAC1D,YAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAErB,gBAAW,GAAgB,EAAE,CAAC"}
+{"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/auth/logout.d.ts

@@ -1,11 +1,20 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
-export default class Logout extends SfdxCommand {
+import { Interfaces } from '@oclif/core';
+import { AuthBaseCommand } from '../../authBaseCommand';
+export type AuthLogoutResults = string[];
+export default class Logout extends AuthBaseCommand<AuthLogoutResults> {
+    static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
-    static readonly supportsUsername = true;
+    static readonly deprecateAliases = true;
     static aliases: string[];
-    static readonly flagsConfig: FlagsConfig;
-    run(): Promise<string[]>;
+    static readonly flags: {
+        'target-org': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        all: Interfaces.BooleanFlag<boolean>;
+        'no-prompt': Interfaces.BooleanFlag<boolean>;
+        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    private flags;
+    run(): Promise<AuthLogoutResults>;
     private shouldFindAllAuths;
-    private shouldRunCommand;
+    private shouldRunLogoutCommand;
 }

package/lib/commands/auth/logout.js

@@ -8,25 +8,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const core_1 = require("@salesforce/core");
-const command_1 = require("@salesforce/command");
-const prompts_1 = require("../../prompts");
+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 command_1.SfdxCommand {
+class Logout extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        if (this.flags.targetusername && this.flags.all) {
-            throw new core_1.SfError(messages.getMessage('specifiedBothUserAndAllError'), 'SpecifiedBothUserAndAllError');
-        }
+        const { flags } = await this.parse(Logout);
+        this.flags = flags;
+        this.configAggregator = await core_1.ConfigAggregator.create();
         const remover = await core_1.AuthRemover.create();
-        const targetUsername = this.flags.targetusername
-            ? this.flags.targetusername
-            : this.configAggregator.getInfo(core_1.OrgConfigProperties.TARGET_ORG).value;
         let usernames;
         try {
-            usernames = this.shouldFindAllAuths()
+            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];
+                : [(await remover.findAuth(targetUsername))?.username ?? targetUsername]).filter((username) => username);
         }
         catch (e) {
             // keep the error name the same for SFDX
@@ -34,13 +33,13 @@ class Logout extends command_1.SfdxCommand {
             err.name = 'NoOrgFound';
             throw core_1.SfError.wrap(err);
         }
-        if (await this.shouldRunCommand(usernames)) {
+        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.ux.log(messages.getMessage('logoutOrgCommandSuccess', [usernames.join(os.EOL)]));
+            this.logSuccess(messages.getMessage('logoutOrgCommandSuccess', [usernames.join(os.EOL)]));
             return usernames;
         }
         else {
@@ -48,30 +47,52 @@ class Logout extends command_1.SfdxCommand {
         }
     }
     shouldFindAllAuths() {
-        return !!this.flags.all || (!this.flags.targetusername && core_1.Global.getEnvironmentMode() === core_1.Mode.DEMO);
+        return !!this.flags.all || (!this.flags['target-org'] && core_1.Global.getEnvironmentMode() === core_1.Mode.DEMO);
     }
-    async shouldRunCommand(usernames) {
-        const orgsToDelete = [usernames.join(os.EOL)];
-        const message = messages.getMessage('logoutCommandYesNo', orgsToDelete);
-        return prompts_1.Prompts.shouldRunCommand(this.ux, Boolean(this.flags.noprompt), message);
+    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.getMessage('examples').split(os.EOL);
-Logout.supportsUsername = true;
+Logout.examples = messages.getMessages('examples');
+Logout.deprecateAliases = true;
 Logout.aliases = ['force:auth:logout'];
-Logout.flagsConfig = {
-    all: command_1.flags.boolean({
+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',
-        description: messages.getMessage('all'),
-        longDescription: messages.getMessage('allLong'),
+        summary: messages.getMessage('all'),
+        description: messages.getMessage('allLong'),
         required: false,
+        exclusive: ['target-org'],
     }),
-    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,
+        deprecateAliases: true,
+        aliases: ['noprompt'],
     }),
+    loglevel: sf_plugins_core_1.loglevel,
 };
 //# sourceMappingURL=logout.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,2CAAqG;AACrG,iDAAsE;AACtE,2CAAwC;AAExC,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;AAC5E,MAAM,cAAc,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAEpF,MAAqB,MAAO,SAAQ,qBAAW;IAoBtC,KAAK,CAAC,GAAG;QACd,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;YAC/C,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC,EAAE,8BAA8B,CAAC,CAAC;SACxG;QAED,MAAM,OAAO,GAAG,MAAM,kBAAW,CAAC,MAAM,EAAE,CAAC;QAE3C,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc;YAC9C,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,cAAyB;YACvC,CAAC,CAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,0BAAmB,CAAC,UAAU,CAAC,CAAC,KAAgB,CAAC;QACpF,IAAI,SAAmB,CAAC;QACxB,IAAI;YACF,SAAS,GAAG,IAAI,CAAC,kBAAkB,EAAE;gBACnC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBACrC,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;SACzD;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACxC,MAAM,GAAG,GAAG,CAAU,CAAC;YACvB,GAAG,CAAC,IAAI,GAAG,YAAY,CAAC;YACxB,MAAM,cAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACzB;QAED,IAAI,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;YAC1C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,0DAA0D;gBAC1D,4CAA4C;gBAC5C,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACpC;YACD,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,yBAAyB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACtF,OAAO,SAAS,CAAC;SAClB;aAAM;YACL,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEO,kBAAkB;QACxB,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,aAAM,CAAC,kBAAkB,EAAE,KAAK,WAAI,CAAC,IAAI,CAAC,CAAC;IACvG,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,SAAmB;QAChD,MAAM,YAAY,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;QACxE,OAAO,iBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IAClF,CAAC;;AA/DH,yBAgEC;AA/DwB,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,eAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,uBAAgB,GAAG,IAAI,CAAC;AACjC,cAAO,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAEvB,kBAAW,GAAgB;IAChD,GAAG,EAAE,eAAK,CAAC,OAAO,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;QACvC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC/C,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC;QAClD,QAAQ,EAAE,KAAK;KAChB,CAAC;CACH,CAAC"}
+{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"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"}

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

@@ -1,9 +1,17 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
 import { AuthFields } from '@salesforce/core';
-export default class Store extends SfdxCommand {
+import { AuthBaseCommand } from '../../../authBaseCommand';
+export default class Store 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: {
+        'sfdx-url-file': import("@oclif/core/lib/interfaces").OptionFlag<string, 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>;
+        'no-prompt': 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<AuthFields>;
 }

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

@@ -6,21 +6,21 @@
  * 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 promises_1 = require("fs/promises");
-const fs_extra_1 = require("fs-extra");
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
-const prompts_1 = require("../../../prompts");
+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', 'sfdxurl.store');
 const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
 const AUTH_URL_FORMAT = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';
-class Store extends command_1.SfdxCommand {
+class Store extends authBaseCommand_1.AuthBaseCommand {
     async run() {
-        if (await prompts_1.Prompts.shouldExitCommand(this.ux, this.flags.noprompt))
+        const { flags } = await this.parse(Store);
+        if (await this.shouldExitCommand(flags['no-prompt']))
             return {};
-        const authFile = this.flags.sfdxurlfile;
+        const authFile = flags['sfdx-url-file'];
         const sfdxAuthUrl = authFile.endsWith('.json') ? await getUrlFromJson(authFile) : await (0, promises_1.readFile)(authFile, 'utf8');
         if (!sfdxAuthUrl) {
             throw new Error(`Error getting the auth URL from file ${authFile}. Please ensure it meets the description shown in the documentation for this command.`);
@@ -29,50 +29,63 @@ class Store extends command_1.SfdxCommand {
         const authInfo = await core_1.AuthInfo.create({ oauth2Options });
         await authInfo.save();
         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 result = authInfo.getFields(true);
         // ensure the clientSecret field... even if it is empty
         result.clientSecret = result.clientSecret ?? '';
         await core_1.AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
         const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
-        this.ux.log(successMsg);
+        this.logSuccess(successMsg);
         return result;
     }
 }
 exports.default = Store;
+Store.summary = messages.getMessage('summary');
 Store.description = messages.getMessage('description', [AUTH_URL_FORMAT]);
-Store.examples = messages.getMessage('examples').split(os.EOL);
+Store.examples = messages.getMessages('examples');
 Store.aliases = ['force:auth:sfdxurl:store'];
-Store.flagsConfig = {
-    sfdxurlfile: command_1.flags.filepath({
+Store.flags = {
+    'sfdx-url-file': sf_plugins_core_1.Flags.file({
         char: 'f',
-        description: messages.getMessage('file'),
+        summary: messages.getMessage('file'),
         required: true,
+        deprecateAliases: true,
+        aliases: ['sfdxurlfile'],
     }),
-    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,
 };
 const getUrlFromJson = async (authFile) => {
-    const authFileJson = (await (0, fs_extra_1.readJson)(authFile));
+    const jsonContents = await (0, promises_1.readFile)(authFile, 'utf8');
+    const authFileJson = (0, kit_1.parseJson)(jsonContents);
     return authFileJson.result?.sfdxAuthUrl ?? authFileJson.sfdxAuthUrl;
 };
 //# sourceMappingURL=store.js.map

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

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

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

@@ -1,10 +1,25 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+/// <reference types="node" />
 import { AuthFields } from '@salesforce/core';
-export default class Login extends SfdxCommand {
+import { Interfaces } from '@oclif/core';
+import { AuthBaseCommand } from '../../../authBaseCommand';
+export default class Login 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: {
+        browser: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'client-id': Interfaces.OptionFlag<string | undefined, 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>;
+        'disable-masking': Interfaces.BooleanFlag<boolean>;
+        'no-prompt': Interfaces.BooleanFlag<boolean>;
+        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    private flags;
     run(): Promise<AuthFields>;
     private executeLoginFlow;
 }

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

@@ -6,42 +6,43 @@
  * 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 open = require("open");
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 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', 'web.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() {
+        const { flags } = await this.parse(Login);
+        this.flags = flags;
         if (isSFDXContainerMode()) {
             throw new core_1.SfError(messages.getMessage('deviceWarning'), 'DEVICE_WARNING');
         }
-        if (await prompts_1.Prompts.shouldExitCommand(this.ux, this.flags.noprompt))
+        if (await this.shouldExitCommand(flags['no-prompt']))
             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['instance-url'], 'href', null)),
+            clientId: flags.clientid,
         };
-        if (this.flags.clientid) {
-            oauthConfig.clientSecret = await prompts_1.Prompts.askForClientSecret(this.ux, Boolean(this.flags.disablemasking));
+        if (flags.clientid) {
+            oauthConfig.clientSecret = await this.askForClientSecret(flags['disable-masking']);
         }
         try {
             const authInfo = await this.executeLoginFlow(oauthConfig);
             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 = commonMessages.getMessage('authorizeCommandSuccess', [fields.username, fields.orgId]);
-            this.ux.log(successMsg);
+            this.logSuccess(successMsg);
             return fields;
         }
         catch (err) {
@@ -66,45 +67,62 @@ 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.deprecateAliases = true;
 Login.aliases = ['force:auth:web:login'];
-Login.flagsConfig = {
-    browser: command_1.flags.enum({
+Login.flags = {
+    browser: sf_plugins_core_1.Flags.string({
         char: 'b',
-        description: messages.getMessage('browser'),
+        summary: messages.getMessage('browser'),
         options: ['chrome', 'edge', 'firefox'], // These are ones supported by "open" package
     }),
-    clientid: command_1.flags.string({
+    '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: ['setdefaultdevhubusername'],
     }),
-    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'],
     }),
-    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,
 };
 const isSFDXContainerMode = () => {
     const env = new kit_1.Env();