Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: authts/oidc-client-ts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: jgarplind/oidc-client-ts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 8, 2025

  1. Ensure test fails.

    jgarplind committed Jan 8, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    049732f View commit details
  2. Copy the full SHA
    e20074f View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/MetadataService.test.ts
  2. +1 −1 src/MetadataService.ts
2 changes: 1 addition & 1 deletion src/MetadataService.test.ts
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ describe("MetadataService", () => {
};
subject = new MetadataService(new OidcClientSettingsStore(settings));
const jsonService = subject["_jsonService"]; // access private member
jest.spyOn(jsonService, "getJson").mockImplementation(() => Promise.resolve({ jwks_uri: "two" }));
jest.spyOn(jsonService, "getJson").mockImplementation(() => Promise.resolve({ issuer: "two", jwks_uri: "two" }));

// act
const result = await subject.getMetadata();
2 changes: 1 addition & 1 deletion src/MetadataService.ts
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ export class MetadataService {
const metadata = await this._jsonService.getJson(this._metadataUrl, { credentials: this._fetchRequestCredentials, timeoutInSeconds: this._settings.requestTimeoutInSeconds });

logger.debug("merging remote JSON with seed metadata");
this._metadata = Object.assign({}, this._settings.metadataSeed, metadata);
this._metadata = Object.assign({}, metadata, this._settings.metadataSeed);
return this._metadata;
}