Skip to content

Commit

Permalink
Revert "feat: add access token hub auth strategy (#90)"
Browse files Browse the repository at this point in the history
This reverts commit 296df6e.
  • Loading branch information
peternhale committed May 24, 2021
1 parent 2369b5f commit 1a84a32
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 37 deletions.
37 changes: 1 addition & 36 deletions src/hubAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { env } from '@salesforce/kit';
export enum AuthStrategy {
JWT = 'JWT',
AUTH_URL = 'AUTH_URL',
ACCESS_TOKEN = 'ACCESS_TOKEN',
REUSE = 'REUSE',
NONE = 'NONE',
}
Expand Down Expand Up @@ -58,20 +57,14 @@ export const prepareForJwt = (homeDir: string): string => {
return jwtKey;
};

export const prepareForAccessToken = (homeDir: string): string => {
const accessTokenFile = path.join(homeDir, 'accessTokenFile');
fs.writeFileSync(accessTokenFile, env.getString('TESTKIT_AUTH_ACCESS_TOKEN', ''));
return accessTokenFile;
};

export const prepareForAuthUrl = (homeDir: string): string => {
const tmpUrl = path.join(homeDir, 'tmpUrl');
fs.writeFileSync(tmpUrl, env.getString('TESTKIT_AUTH_URL', ''));
return tmpUrl;
};

/**
* Inspects the environment (via AuthStrategy) and authenticates to a devhub via JWT, AuthUrl or AccessToken
* Inspects the environment (via AuthStrategy) and authenticates to a devhub via JWT or AuthUrl
* Sets the hub as default for use in tests
*
* @param homeDir the testSession directory where credential files will be written
Expand All @@ -81,7 +74,6 @@ export const prepareForAuthUrl = (homeDir: string): string => {
* for jwt: TESTKIT_HUB_USERNAME, TESTKIT_JWT_CLIENT_ID, TESTKIT_JWT_KEY
* optional but recommended: TESTKIT_HUB_INSTANCE
* required for AuthUrl: TESTKIT_AUTH_URL
* required for AccessToken: TESTKIT_AUTH_ACCESS_TOKEN, TESTKIT_HUB_INSTANCE
*/
export const testkitHubAuth = (homeDir: string, authStrategy: AuthStrategy = getAuthStrategy()): void => {
const logger = debug('testkit:authFromStubbedHome');
Expand Down Expand Up @@ -112,7 +104,6 @@ export const testkitHubAuth = (homeDir: string, authStrategy: AuthStrategy = get
}
return;
}

if (authStrategy === AuthStrategy.AUTH_URL) {
logger('trying to authenticate with AuthUrl');

Expand All @@ -130,29 +121,6 @@ export const testkitHubAuth = (homeDir: string, authStrategy: AuthStrategy = get

return;
}

if (authStrategy === AuthStrategy.ACCESS_TOKEN) {
logger('trying to authenticate with Access Token');

const accessTokenFile = prepareForAccessToken(homeDir);

const shellOutput = shell.exec(
`sfdx auth:accesstoken:store --noprompt -d -f ${accessTokenFile} -r ${env.getString(
'TESTKIT_HUB_INSTANCE',
DEFAULT_INSTANCE_URL
)}`,
execOpts
) as shell.ShellString;
logger(shellOutput);
if (shellOutput.code !== 0) {
throw new Error(
`auth:sfdxurl for url ${accessTokenFile} failed with exit code: ${shellOutput.code}\n ${
shellOutput.stdout + shellOutput.stderr
}`
);
}
return;
}
logger('no hub configured');
};

Expand All @@ -167,9 +135,6 @@ const getAuthStrategy = (): AuthStrategy => {
if (env.getString('TESTKIT_AUTH_URL')) {
return AuthStrategy.AUTH_URL;
}
if (env.getString('TESTKIT_AUTH_ACCESS_TOKEN') && env.getString('TESTKIT_HUB_INSTANCE')) {
return AuthStrategy.ACCESS_TOKEN;
}
// none of the above are included, so we want to reuse an already authenticated hub
if (env.getString('TESTKIT_HUB_USERNAME')) {
return AuthStrategy.REUSE;
Expand Down
1 change: 0 additions & 1 deletion src/testSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ export interface TestSessionOptions {
* TESTKIT_JWT_KEY = JWT key (not a filepath, the actual contents of the key)
* TESTKIT_HUB_INSTANCE = instance url for the hub. Defaults to https://login.salesforce.com
* TESTKIT_AUTH_URL = auth url to be used with auth:sfdxurl:store
* TESTKIT_AUTH_ACCESS_TOKEN = access token to be used with auth:accesstoken:store
*/
export class TestSession extends AsyncOptionalCreatable<TestSessionOptions> {
public id: string;
Expand Down

0 comments on commit 1a84a32

Please sign in to comment.