Skip to content

feat: remove access token format validation @W-20036916@ #1438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jfeingold35 wants to merge 1 commit into from
Closed

feat: remove access token format validation @W-20036916@ #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/commands/org/login/access-token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@
*/

import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
import { AuthFields, AuthInfo, Messages, matchesAccessToken, SfError, StateAggregator } from '@salesforce/core';
import { AuthFields, AuthInfo, Messages, StateAggregator } from '@salesforce/core';
import { env } from '@salesforce/kit';
import { InferredFlags } from '@oclif/core/interfaces';

Messages.importMessagesDirectoryFromMetaUrl(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>"';

export default class LoginAccessToken extends SfCommand<AuthFields> {
public static readonly summary = messages.getMessage('summary');
public static readonly description = messages.getMessage('description');
Expand Down Expand Up @@ -122,15 +120,12 @@ export default class LoginAccessToken extends SfCommand<AuthFields> {
}

private async getAccessToken(): Promise<string> {
const accessToken =
return (
env.getString('SF_ACCESS_TOKEN') ??
env.getString('SFDX_ACCESS_TOKEN') ??
(this.flags['no-prompt'] === true
? '' // will throw when validating
: await this.secretPrompt({ message: commonMessages.getMessage('accessTokenStdin') }));
if (!matchesAccessToken(accessToken)) {
throw new SfError(messages.getMessage('invalidAccessTokenFormat', [ACCESS_TOKEN_FORMAT]));
}
return accessToken;
: await this.secretPrompt({ message: commonMessages.getMessage('accessTokenStdin') }))
);
}
}
15 changes: 1 addition & 14 deletions test/commands/org/login/access-token.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { AuthFields, AuthInfo, StateAggregator } from '@salesforce/core';
import { assert, expect } from 'chai';
import { expect } from 'chai';
import { TestContext } from '@salesforce/core/testSetup';
import { stubPrompter, stubSfCommandUx } from '@salesforce/sf-plugins-core';
import { env } from '@salesforce/kit';
Expand Down Expand Up @@ -68,19 +68,6 @@ describe('org:login:access-token', () => {
expect(result).to.deep.equal(authFields);
});

it('should show invalid access token provided as input', async () => {
prompterStubs.secret.resolves('invalidaccesstokenformat');

try {
await Store.run(['--instance-url', 'https://foo.bar.org.salesforce.com']);
assert(false, 'should throw error');
} catch (e) {
assert(e instanceof Error);
expect(e.message).to.include("The access token isn't in the correct format");
}
expect(prompterStubs.secret.callCount).to.equal(1);
});

it('should show that auth file already exists', async () => {
prompterStubs.secret.resolves(accessToken);
prompterStubs.confirm.resolves(false);
Expand Down