Skip to content
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.

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

fix(claim_validator): Update the same id claim validator instead of adding a new one #269

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

- Updated the `SessionClaimValidatorStore.addClaimValidatorFromOtherRecipe` function to update the claimValidator to the latest if added again with the same id instead of adding a new claimValidator.

## [20.1.5] - 2024-10-03

### Changes
Expand Down
2 changes: 1 addition & 1 deletion bundle/bundle.js

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion lib/build/utils/sessionClaimValidatorStore.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion lib/ts/utils/sessionClaimValidatorStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,22 @@ export class SessionClaimValidatorStore {
private static claimValidatorsAddedByOtherRecipes: SessionClaimValidator[] = [];

static addClaimValidatorFromOtherRecipe = (builder: SessionClaimValidator) => {
SessionClaimValidatorStore.claimValidatorsAddedByOtherRecipes.push(builder);
const existingBuilderIdIndex: number = SessionClaimValidatorStore.claimValidatorsAddedByOtherRecipes.findIndex(
claimValidator => claimValidator.id === builder.id
);

/*
* Updating the claim validator in the claimValidatorsAddedByOtherRecipes list if the
* validator already exists with the same builder id else we push the new builder in
* the claimValidatorsAddedByOtherRecipes.
* Hence, always the last added claim validator for the recipe will exist in the
* claimValidatorsAddedByOtherRecipes list.
*/
if (existingBuilderIdIndex > -1) {
SessionClaimValidatorStore.claimValidatorsAddedByOtherRecipes[existingBuilderIdIndex] = builder;
} else {
SessionClaimValidatorStore.claimValidatorsAddedByOtherRecipes.push(builder);
}
};

static getClaimValidatorsAddedByOtherRecipes = (): SessionClaimValidator[] => {
Expand Down
41 changes: 41 additions & 0 deletions test/sessionClaimValidator.Store.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
*
* This software is licensed under the Apache License, Version 2.0 (the
* "License") as published by the Apache Software Foundation.
*
* You may not use this file except in compliance with the License. You may
* obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/

const assert = require("assert");
const { BooleanClaim } = require("../lib/build");
const { SessionClaimValidatorStore } = require("../lib/build/utils/sessionClaimValidatorStore");

describe("SessionClaimValidatorStore:addClaimValidatorFromOtherRecipe", () => {
it("SessionClaimValidatorStore addClaimValidatorFromOtherRecipe should update the existing validator rather than adding new one", function () {
const claimFirst = new BooleanClaim({
id: "st-test",
refresh: () => {},
defaultMaxAgeInSeconds: 10
});

const claimSecond = new BooleanClaim({
id: "st-test",
refresh: () => {},
defaultMaxAgeInSeconds: 10
});

SessionClaimValidatorStore.addClaimValidatorFromOtherRecipe(claimFirst);
SessionClaimValidatorStore.addClaimValidatorFromOtherRecipe(claimSecond);

const claimValidators = SessionClaimValidatorStore.getClaimValidatorsAddedByOtherRecipes();

assert.strictEqual(claimValidators.length, 1);
});
});