Skip to content

Commit

Permalink
feat(sfp): new org login url command (#19)
Browse files Browse the repository at this point in the history
* feat(new-sfp-auth-command): auth with json or txt file

* fix(org login): fix test example after test

* fix: fix npm directory path

* add license info

---------

Co-authored-by: Azlam <[email protected]>
  • Loading branch information
Rocko1204 and azlam-abdulsalam authored Mar 6, 2024
1 parent e292c20 commit 355488c
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 0 deletions.
37 changes: 37 additions & 0 deletions packages/sfp-cli/messages/org_login_url.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# commandDescription

The Salesforce DX authorization URL must have the format "%s". NOTE: The SFDX authorization URL uses the "force" protocol, and not "http" or "https". Also, the "instanceUrl" inside the SFDX authorization URL doesn't include the protocol ("https://").

You have two options when creating the authorization file.

You can create a JSON file that has a top-level property named sfdxAuthUrl whose value is the authorization URL. Finally, you can create a normal text file that includes just the URL and nothing else.

The resulting JSON file contains the URL in the "sfdxAuthUrl" property of the "result" object. You can then reference the file when running this command:

$ <%= config.bin %> <%= command.id %> --url-file authFile.json

Alternatively, you can pipe the SFDX authorization URL through standard input by using the --url-stdin flag and providing the '-' character as the value.

# flags.url-file.description

Path to a file that contains the Salesforce DX authorization URL.

# flags.url-stdin.description

Specify '-' as this flag's value to pipe the Salesforce DX authorization URL through standard input (stdin).

# flags.set-default-dev-hub.description

Set the authenticated org as the default Dev Hub.

# flags.set-default.description

Set the authenticated org as the default that all org-related commands run against.

# flags.alias.description

Alias for the org.

# authorizeCommandSuccess

Successfully authorized %s with org ID %s
106 changes: 106 additions & 0 deletions packages/sfp-cli/src/commands/org/login/url.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
/* Original Copyright belongs to
* 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
*/



import SFPLogger, { LoggerLevel, COLOR_KEY_MESSAGE,COLOR_HEADER } from '@flxbl-io/sfp-logger';
import { Messages, AuthInfo } from '@salesforce/core';
import { Flags } from '@oclif/core';
import SfpCommand from '../../../SfpCommand';
import { loglevel } from '../../../flags/sfdxflags';
import { parseJson } from '@salesforce/kit';
import fs from 'fs/promises';


Messages.importMessagesDirectory(__dirname);


const messages = Messages.loadMessages('@flxblio/sfp', 'org_login_url');
const AUTH_URL_FORMAT = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';

export default class OrgLoginUrl extends SfpCommand {
public static description = messages.getMessage('commandDescription', [AUTH_URL_FORMAT]);

protected static requiresDevhubUsername = false;
protected static requiresProject = false;

public static examples = ['$ sfp org:login:url --url-file files/authFile.json'];

public static flags = {
'url-file': Flags.file({
char: 'f',
description: messages.getMessage('flags.url-file.description'),
exactlyOne: ['url-file', 'url-stdin'],
}),
'url-stdin': Flags.file({
char: 'u',
description: messages.getMessage('flags.url-stdin.description'),
exactlyOne: ['url-file', 'url-stdin'],
}),
'set-default-dev-hub': Flags.boolean({
char: 'd',
description: messages.getMessage('flags.set-default-dev-hub.description'),
}),
'set-default': Flags.boolean({
char: 's',
description: messages.getMessage('flags.set-default.description'),
}),
alias: Flags.string({
char: 'a',
description: messages.getMessage('flags.alias.description'),
}),
loglevel,
};

public async execute(): Promise<void> {
SFPLogger.log(COLOR_HEADER('command: org login url'));
SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
const { flags } = await this.parse(OrgLoginUrl);
const authFile = flags['url-file'];
const authStdin = flags['url-stdin'];
let sfpAuthUrl;
if (authFile) {
sfpAuthUrl = authFile.endsWith('.json') ? await getUrlFromJson(authFile) : await fs.readFile(authFile, 'utf8');
if (!sfpAuthUrl) {
throw new Error(`Error getting the auth URL from file ${authFile}. Please ensure it meets the description shown in the documentation for this command.`);
}
}
else if (authStdin) {
sfpAuthUrl = authStdin;
}
else {
throw new Error('Salesforce Auth URL not found.');
}
const oauth2Options = AuthInfo.parseSfdxAuthUrl(sfpAuthUrl);
const authInfo = await AuthInfo.create({ oauth2Options });
await authInfo.save();
await authInfo.handleAliasAndDefaultSettings({
alias: flags.alias,
setDefault: flags['set-default'],
setDefaultDevHub: flags['set-default-dev-hub'],
});
// ensure the clientSecret field... even if it is empty
const result = { clientSecret: '', ...authInfo.getFields(true) };
await AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
const successMsg = messages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
SFPLogger.log(COLOR_KEY_MESSAGE(successMsg), LoggerLevel.INFO);
}
}

const getUrlFromJson = async (authFile) => {
const jsonContents = await fs.readFile(authFile, 'utf8');
const authFileJson = parseJson(jsonContents);
if(typeof authFileJson === 'object' && authFileJson !== null && ('sfdxAuthUrl' in authFileJson)) {
return authFileJson.sfdxAuthUrl;
}
if(typeof authFileJson === 'object' && authFileJson !== null && ('result' in authFileJson)) {
if(typeof authFileJson.result === 'object' && authFileJson.result !== null && ('sfdxAuthUrl' in authFileJson.result)) {
return authFileJson.result.sfdxAuthUrl;
}
}
return '';
};

0 comments on commit 355488c

Please sign in to comment.