Skip to content

Auth Arg Cleanup - remove Kind, and change --url to --environment #422

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

Merged
tehcrashxor merged 1 commit into from
Jun 18, 2024
Merged

Auth Arg Cleanup - remove Kind, and change --url to --environment #422

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
8 changes: 4 additions & 4 deletions src/pac/auth/authenticate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ import { ClientCredentials, AuthCredentials, UsernamePassword, FederatedCredenti

export function authenticateAdmin(pac: CommandRunner, credentials: AuthCredentials, logger: Logger): Promise<string[]> {
logger.log(`authN to admin API: authType=${isUsernamePassword(credentials) ? 'UserPass' : 'SPN'}; cloudInstance: ${credentials.cloudInstance || '<not set>'}`);
return pac("auth", "create", "--kind", "ADMIN", ...addCredentials(credentials), ...addCloudInstance(credentials));
return pac("auth", "create", ...addCredentials(credentials), ...addCloudInstance(credentials));
}

export function authenticateEnvironment(pac: CommandRunner, credentials: AuthCredentials, environmentUrl: string, logger: Logger): Promise<string[]> {

logger.log(`authN to env. authType:${isUsernamePassword(credentials) ? 'UserPass' : 'SPN'} authScheme:${isUsernamePassword(credentials) ? '' : `${credentials.scheme}`}; cloudInstance: ${credentials.cloudInstance || '<not set>'}; envUrl: ${environmentUrl}`);
return pac("auth", "create", ...addUrl(environmentUrl), ...addCredentials(credentials), ...addCloudInstance(credentials));
return pac("auth", "create", ...addEnvironment(environmentUrl), ...addCredentials(credentials), ...addCloudInstance(credentials));
}

export function clearAuthentication(pac: CommandRunner): Promise<string[]> {
delete process.env.PAC_CLI_SPN_SECRET; // Will be cleaned up anyway by closing of the node process
return pac("auth", "clear");
}

function addUrl(url: string) {
return ["--url", url];
function addEnvironment(env: string) {
return ["--environment", env];
}

function addCredentials(credentials: AuthCredentials) {
Expand Down
12 changes: 2 additions & 10 deletions test/pac/auth/authenticate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ describe("pac", () => {
pac.should.have.been.calledOnceWith(
"auth",
"create",
"--kind",
"ADMIN",
"--tenant",
spnCreds.tenantId,
"--applicationId",
Expand All @@ -78,8 +76,6 @@ describe("pac", () => {
pac.should.have.been.calledOnceWith(
"auth",
"create",
"--kind",
"ADMIN",
"--tenant",
spnCreds.tenantId,
"--applicationId",
Expand All @@ -97,8 +93,6 @@ describe("pac", () => {
pac.should.have.been.calledOnceWith(
"auth",
"create",
"--kind",
"ADMIN",
"--username",
userCreds.username,
"--password",
Expand All @@ -114,8 +108,6 @@ describe("pac", () => {
pac.should.have.been.calledOnceWith(
"auth",
"create",
"--kind",
"ADMIN",
"--username",
userCreds.username,
"--password",
Expand Down Expand Up @@ -146,7 +138,7 @@ describe("pac", () => {
pac.should.have.been.calledOnceWith(
"auth",
"create",
"--url",
"--environment",
envUrl,
"--tenant",
spnCreds.tenantId,
Expand All @@ -165,7 +157,7 @@ describe("pac", () => {
pac.should.have.been.calledOnceWith(
"auth",
"create",
"--url",
"--environment",
envUrl,
"--username",
userCreds.username,
Expand Down