@salesforce/plugin-auth 2.8.26 → 3.0.1

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

@@ -1,20 +1,65 @@
-"use strict";
 /*
  * Copyright (c) 2021, 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 sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
-const core_1 = require("@salesforce/core");
-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');
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { Flags, loglevel } from '@salesforce/sf-plugins-core';
+import { AuthInfo, Messages, matchesAccessToken, SfError, StateAggregator } from '@salesforce/core';
+import { env } from '@salesforce/kit';
+import { AuthBaseCommand } from '../../../authBaseCommand.js';
+Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+const messages = Messages.loadMessages('@salesforce/plugin-auth', 'accesstoken.store');
+const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
 const ACCESS_TOKEN_FORMAT = '"<org id>!<accesstoken>"';
-class LoginAccessToken extends authBaseCommand_1.AuthBaseCommand {
+export default class LoginAccessToken extends AuthBaseCommand {
+    static summary = messages.getMessage('summary');
+    static description = messages.getMessage('description');
+    static examples = messages.getMessages('examples');
+    static deprecateAliases = true;
+    static aliases = ['force:auth:accesstoken:store', 'auth:accesstoken:store'];
+    static flags = {
+        'instance-url': Flags.url({
+            char: 'r',
+            summary: commonMessages.getMessage('flags.instance-url.summary'),
+            description: commonMessages.getMessage('flags.instance-url.description'),
+            required: true,
+            deprecateAliases: true,
+            aliases: ['instanceurl'],
+        }),
+        'set-default-dev-hub': Flags.boolean({
+            char: 'd',
+            summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
+            default: false,
+            deprecateAliases: true,
+            aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
+        }),
+        'set-default': Flags.boolean({
+            char: 's',
+            summary: commonMessages.getMessage('flags.set-default.summary'),
+            default: false,
+            deprecateAliases: true,
+            aliases: ['setdefaultusername'],
+        }),
+        alias: Flags.string({
+            char: 'a',
+            summary: commonMessages.getMessage('flags.alias.summary'),
+            deprecateAliases: true,
+            aliases: ['setalias'],
+        }),
+        'no-prompt': Flags.boolean({
+            char: 'p',
+            summary: commonMessages.getMessage('flags.no-prompt.summary'),
+            required: false,
+            default: false,
+            deprecateAliases: true,
+            aliases: ['noprompt'],
+        }),
+        loglevel,
+    };
+    flags;
     async run() {
         const { flags } = await this.parse(LoginAccessToken);
         this.flags = flags;
@@ -26,7 +71,7 @@ class LoginAccessToken extends authBaseCommand_1.AuthBaseCommand {
     // because stubbed on the test (instead of stubbing in core)
     // eslint-disable-next-line class-methods-use-this
     async getUserInfo(accessToken, instanceUrl) {
-        return core_1.AuthInfo.create({ accessTokenOptions: { accessToken, instanceUrl, loginUrl: instanceUrl } });
+        return AuthInfo.create({ accessTokenOptions: { accessToken, instanceUrl, loginUrl: instanceUrl } });
     }
     async storeAuthFromAccessToken(authInfo) {
         if (await this.overwriteAuthInfo(authInfo.getUsername())) {
@@ -46,68 +91,23 @@ class LoginAccessToken extends authBaseCommand_1.AuthBaseCommand {
             setDefault: this.flags['set-default'],
             setDefaultDevHub: this.flags['set-default-dev-hub'],
         });
-        await core_1.AuthInfo.identifyPossibleScratchOrgs(authInfo.getFields(true), authInfo);
+        await AuthInfo.identifyPossibleScratchOrgs(authInfo.getFields(true), authInfo);
     }
     async overwriteAuthInfo(username) {
         if (!this.flags['no-prompt']) {
-            const stateAggregator = await core_1.StateAggregator.getInstance();
+            const stateAggregator = await StateAggregator.getInstance();
             if (await stateAggregator.orgs.exists(username)) {
-                return this.askOverwriteAuthFile(username);
+                return this.confirm(messages.getMessage('overwriteAccessTokenAuthUserFile', [username]));
             }
         }
         return true;
     }
     async getAccessToken() {
-        const accessToken = kit_1.env.getString('SFDX_ACCESS_TOKEN') ?? (await this.askForAccessToken());
-        if (!(0, core_1.matchesAccessToken)(accessToken)) {
-            throw new core_1.SfError(messages.getMessage('invalidAccessTokenFormat', [ACCESS_TOKEN_FORMAT]));
+        const accessToken = env.getString('SFDX_ACCESS_TOKEN') ?? (await this.askForAccessToken());
+        if (!matchesAccessToken(accessToken)) {
+            throw new SfError(messages.getMessage('invalidAccessTokenFormat', [ACCESS_TOKEN_FORMAT]));
         }
         return accessToken;
     }
 }
-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('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('flags.set-default-dev-hub.summary'),
-        default: false,
-        deprecateAliases: true,
-        aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
-    }),
-    'set-default': sf_plugins_core_1.Flags.boolean({
-        char: 's',
-        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('flags.alias.summary'),
-        deprecateAliases: true,
-        aliases: ['setalias'],
-    }),
-    'no-prompt': sf_plugins_core_1.Flags.boolean({
-        char: 'p',
-        summary: commonMessages.getMessage('flags.no-prompt.summary'),
-        required: false,
-        default: false,
-        deprecateAliases: true,
-        aliases: ['noprompt'],
-    }),
-    loglevel: sf_plugins_core_1.loglevel,
-};
-exports.default = LoginAccessToken;
 //# sourceMappingURL=access-token.js.map

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

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

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

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

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

@@ -1,32 +1,76 @@
-"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 core_1 = require("@salesforce/core");
-const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
-const core_2 = require("@oclif/core");
-const authBaseCommand_1 = require("../../../authBaseCommand");
-const common_1 = require("../../../common");
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'device.login');
-const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
-class LoginDevice extends authBaseCommand_1.AuthBaseCommand {
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { AuthInfo, DeviceOauthService, Messages } from '@salesforce/core';
+import { Flags, loglevel } from '@salesforce/sf-plugins-core';
+import { ux } from '@oclif/core';
+import { AuthBaseCommand } from '../../../authBaseCommand.js';
+import { Common } from '../../../common.js';
+Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+const messages = Messages.loadMessages('@salesforce/plugin-auth', 'device.login');
+const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
+export default class LoginDevice extends AuthBaseCommand {
+    static summary = messages.getMessage('summary');
+    static description = messages.getMessage('description');
+    static examples = messages.getMessages('examples');
+    static aliases = ['force:auth:device:login', 'auth:device:login'];
+    static flags = {
+        'client-id': Flags.string({
+            char: 'i',
+            summary: commonMessages.getMessage('flags.client-id.summary'),
+            deprecateAliases: true,
+            aliases: ['clientid'],
+        }),
+        'instance-url': Flags.url({
+            char: 'r',
+            summary: commonMessages.getMessage('flags.instance-url.summary'),
+            description: commonMessages.getMessage('flags.instance-url.description'),
+            deprecateAliases: true,
+            aliases: ['instanceurl'],
+        }),
+        'set-default-dev-hub': Flags.boolean({
+            char: 'd',
+            summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
+            deprecateAliases: true,
+            aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
+        }),
+        'set-default': Flags.boolean({
+            char: 's',
+            summary: commonMessages.getMessage('flags.set-default.summary'),
+            deprecateAliases: true,
+            aliases: ['setdefaultusername'],
+        }),
+        alias: Flags.string({
+            char: 'a',
+            summary: commonMessages.getMessage('flags.alias.summary'),
+            deprecateAliases: true,
+            aliases: ['setalias'],
+        }),
+        'disable-masking': Flags.boolean({
+            summary: commonMessages.getMessage('flags.disable-masking.summary'),
+            hidden: true,
+            deprecateAliases: true,
+            aliases: ['disablemasking'],
+        }),
+        loglevel,
+    };
     async run() {
         const { flags } = await this.parse(LoginDevice);
         if (await this.shouldExitCommand(false))
             return {};
         const oauthConfig = {
-            loginUrl: await common_1.Common.resolveLoginUrl(flags['instance-url']?.href),
+            loginUrl: await Common.resolveLoginUrl(flags['instance-url']?.href),
             clientId: flags['client-id'],
         };
-        const deviceOauthService = await core_1.DeviceOauthService.create(oauthConfig);
+        const deviceOauthService = await DeviceOauthService.create(oauthConfig);
         const loginData = await deviceOauthService.requestDeviceLogin();
         if (this.jsonEnabled()) {
-            core_2.ux.log(JSON.stringify(loginData, null, 2));
+            ux.log(JSON.stringify(loginData, null, 2));
         }
         else {
             this.styledHeader(messages.getMessage('actionRequired'));
@@ -42,7 +86,7 @@ class LoginDevice extends authBaseCommand_1.AuthBaseCommand {
                 setDefaultDevHub: flags['set-default-dev-hub'],
             });
             const fields = authInfo.getFields(true);
-            await core_1.AuthInfo.identifyPossibleScratchOrgs(fields, authInfo);
+            await AuthInfo.identifyPossibleScratchOrgs(fields, authInfo);
             const successMsg = messages.getMessage('success', [fields.username]);
             this.logSuccess(successMsg);
             return { ...fields, ...loginData };
@@ -52,49 +96,4 @@ class LoginDevice extends authBaseCommand_1.AuthBaseCommand {
         }
     }
 }
-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('flags.client-id.summary'),
-        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'),
-        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'),
-        deprecateAliases: true,
-        aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
-    }),
-    'set-default': sf_plugins_core_1.Flags.boolean({
-        char: 's',
-        summary: commonMessages.getMessage('flags.set-default.summary'),
-        deprecateAliases: true,
-        aliases: ['setdefaultusername'],
-    }),
-    alias: sf_plugins_core_1.Flags.string({
-        char: 'a',
-        summary: commonMessages.getMessage('flags.alias.summary'),
-        deprecateAliases: true,
-        aliases: ['setalias'],
-    }),
-    'disable-masking': sf_plugins_core_1.Flags.boolean({
-        summary: commonMessages.getMessage('flags.disable-masking.summary'),
-        hidden: true,
-        deprecateAliases: true,
-        aliases: ['disablemasking'],
-    }),
-    loglevel: sf_plugins_core_1.loglevel,
-};
-exports.default = LoginDevice;
 //# sourceMappingURL=device.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../src/commands/org/login/device.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2CAAoG;AACpG,iEAA8D;AAE9D,sCAAiC;AACjC,8DAA2D;AAC3D,4CAAyC;AAEzC,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;AAClF,MAAM,cAAc,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAIpF,MAAqB,WAAY,SAAQ,iCAAkC;IA+ClE,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEnD,MAAM,WAAW,GAAiB;YAChC,QAAQ,EAAE,MAAM,eAAM,CAAC,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC;YACnE,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC;SAC7B,CAAC;QAEF,MAAM,kBAAkB,GAAG,MAAM,yBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;QAEhE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;YACtB,SAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SAC5C;aAAM;YACL,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACzD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAC9F,IAAI,CAAC,GAAG,EAAE,CAAC;SACZ;QAED,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACzE,IAAI,QAAQ,EAAE;YACZ,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACrE,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;YAC7D,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC5B,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;SACpC;aAAM;YACL,OAAO,EAAE,CAAC;SACX;IACH,CAAC;;AAlFsB,mBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,uBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,oBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACrD,mBAAO,GAAG,CAAC,yBAAyB,EAAE,mBAAmB,CAAC,CAAC;AAElD,iBAAK,GAAG;IAC7B,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,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,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,QAAQ,EAAR,0BAAQ;CACT,CAAC;kBA7CiB,WAAW"}
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../src/commands/org/login/device.ts"],"names":[],"mappings":"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"}

package/lib/commands/org/login/jwt.d.ts

@@ -1,22 +1,22 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { AuthFields } from '@salesforce/core';
 import { Interfaces } from '@oclif/core';
-import { AuthBaseCommand } from '../../../authBaseCommand';
+import { AuthBaseCommand } from '../../../authBaseCommand.js';
 export default class LoginJwt extends AuthBaseCommand<AuthFields> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
     static aliases: string[];
     static readonly flags: {
-        username: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'jwt-key-file': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'client-id': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'instance-url': Interfaces.OptionFlag<import("url").URL | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        username: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        'jwt-key-file': Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        'client-id': Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        'instance-url': Interfaces.OptionFlag<import("url").URL | undefined, Interfaces.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>;
+        alias: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         'no-prompt': Interfaces.BooleanFlag<boolean>;
-        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
     };
     private flags;
     private logger;