Skip to content

Remove unnecessary Auth for offline pac solution version command #292

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
Aug 24, 2023
Merged

Remove unnecessary Auth for offline pac solution version command #292

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
9 changes: 0 additions & 9 deletions src/actions/updateVersionSolution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { HostParameterEntry, IHostAbstractions, CommonActionParameters } from "../host/IHostAbstractions";
import { InputValidator } from "../host/InputValidator";
import { authenticateEnvironment, clearAuthentication } from "../pac/auth/authenticate";
import createPacRunner from "../pac/createPacRunner";
import { RunnerParameters } from "../Parameters";
import { AuthCredentials } from "../pac/auth/authParameters";

export interface UpdateVersionSolutionParameters extends CommonActionParameters {
credentials: AuthCredentials;
environmentUrl: string;
buildVersion?: HostParameterEntry;
revisionVersion?: HostParameterEntry;
Expand All @@ -20,9 +17,6 @@ export async function updateVersionSolution(parameters: UpdateVersionSolutionPar
const pac = createPacRunner(runnerParameters);

try {
const authenticateResult = await authenticateEnvironment(pac, parameters.credentials, parameters.environmentUrl, logger);
logger.log("The Authentication Result: " + authenticateResult);

const pacArgs = ["solution", "version"]
const validator = new InputValidator(host);

Expand All @@ -39,8 +33,5 @@ export async function updateVersionSolution(parameters: UpdateVersionSolutionPar
} catch (error) {
logger.error(`failed: ${error instanceof Error ? error.message : error}`);
throw error;
} finally {
const clearAuthResult = await clearAuthentication(pac);
logger.log("The Clear Authentication Result: " + clearAuthResult);
}
}
13 changes: 2 additions & 11 deletions test/actions/updateVersionSolution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import * as sinonChai from "sinon-chai";
import * as chaiAsPromised from "chai-as-promised";
import { should, use } from "chai";
import { restore, stub } from "sinon";
import { ClientCredentials, RunnerParameters } from "../../src";
import { createDefaultMockRunnerParameters, createMockClientCredentials, mockEnvironmentUrl } from "./mock/mockData";
import { RunnerParameters } from "../../src";
import { createDefaultMockRunnerParameters, mockEnvironmentUrl } from "./mock/mockData";
import { UpdateVersionSolutionParameters } from "../../src/actions/updateVersionSolution";
import Sinon = require("sinon");
import { mockHost } from "./mock/mockHost";
Expand All @@ -18,7 +18,6 @@ describe("action: updateVersion solution", () => {
let authenticateEnvironmentStub: Sinon.SinonStub<any[],any>;
let clearAuthenticationStub: Sinon.SinonStub<any[], any>;
const host = new mockHost();
const mockClientCredentials: ClientCredentials = createMockClientCredentials();
const envUrl: string = mockEnvironmentUrl;
let updateVersionSolutionParameters: UpdateVersionSolutionParameters;

Expand All @@ -35,11 +34,6 @@ describe("action: updateVersion solution", () => {
const mockedActionModule = await rewiremock.around(() => import("../../src/actions/updateVersionSolution"),
(mock) => {
mock(() => import("../../src/pac/createPacRunner")).withDefault(() => pacStub);
mock(() => import("../../src/pac/auth/authenticate")).with(
{
authenticateEnvironment: authenticateEnvironmentStub,
clearAuthentication: clearAuthenticationStub
});
});

authenticateEnvironmentStub.returns("Authentication successfully created.");
Expand All @@ -49,7 +43,6 @@ describe("action: updateVersion solution", () => {
}

const createUpdateVersionSolutionParameters = (): UpdateVersionSolutionParameters => ({
credentials: mockClientCredentials,
environmentUrl: envUrl,
buildVersion: { name: 'BuildVersion', required: true },
strategy: { name: 'Strategy', required: false },
Expand All @@ -60,8 +53,6 @@ describe("action: updateVersion solution", () => {
it("with required params, calls pac runner with correct args", async () => {
await runActionWithMocks(updateVersionSolutionParameters);

authenticateEnvironmentStub.should.have.been.calledOnceWith(pacStub, mockClientCredentials, envUrl);
pacStub.should.have.been.calledOnceWith("solution", "version", "--buildversion", host.buildVersion);
clearAuthenticationStub.should.have.been.calledOnceWith(pacStub);
});
});