diff --git a/src/pac/auth/authenticate.ts b/src/pac/auth/authenticate.ts index fa47bffe..748845c5 100644 --- a/src/pac/auth/authenticate.ts +++ b/src/pac/auth/authenticate.ts @@ -4,13 +4,13 @@ import { ClientCredentials, AuthCredentials, UsernamePassword, FederatedCredenti export function authenticateAdmin(pac: CommandRunner, credentials: AuthCredentials, logger: Logger): Promise { logger.log(`authN to admin API: authType=${isUsernamePassword(credentials) ? 'UserPass' : 'SPN'}; cloudInstance: ${credentials.cloudInstance || ''}`); - 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 { logger.log(`authN to env. authType:${isUsernamePassword(credentials) ? 'UserPass' : 'SPN'} authScheme:${isUsernamePassword(credentials) ? '' : `${credentials.scheme}`}; cloudInstance: ${credentials.cloudInstance || ''}; 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 { @@ -18,8 +18,8 @@ export function clearAuthentication(pac: CommandRunner): Promise { return pac("auth", "clear"); } -function addUrl(url: string) { - return ["--url", url]; +function addEnvironment(env: string) { + return ["--environment", env]; } function addCredentials(credentials: AuthCredentials) { diff --git a/test/pac/auth/authenticate.test.ts b/test/pac/auth/authenticate.test.ts index 6da25db5..5b746011 100644 --- a/test/pac/auth/authenticate.test.ts +++ b/test/pac/auth/authenticate.test.ts @@ -57,8 +57,6 @@ describe("pac", () => { pac.should.have.been.calledOnceWith( "auth", "create", - "--kind", - "ADMIN", "--tenant", spnCreds.tenantId, "--applicationId", @@ -78,8 +76,6 @@ describe("pac", () => { pac.should.have.been.calledOnceWith( "auth", "create", - "--kind", - "ADMIN", "--tenant", spnCreds.tenantId, "--applicationId", @@ -97,8 +93,6 @@ describe("pac", () => { pac.should.have.been.calledOnceWith( "auth", "create", - "--kind", - "ADMIN", "--username", userCreds.username, "--password", @@ -114,8 +108,6 @@ describe("pac", () => { pac.should.have.been.calledOnceWith( "auth", "create", - "--kind", - "ADMIN", "--username", userCreds.username, "--password", @@ -146,7 +138,7 @@ describe("pac", () => { pac.should.have.been.calledOnceWith( "auth", "create", - "--url", + "--environment", envUrl, "--tenant", spnCreds.tenantId, @@ -165,7 +157,7 @@ describe("pac", () => { pac.should.have.been.calledOnceWith( "auth", "create", - "--url", + "--environment", envUrl, "--username", userCreds.username,