diff --git a/example.env b/example.env index 2ce634892dbe26b8100c95c8ffbc281b082e5663..d4f4252493264bae073713b61b58a3030734cc5a 100644 --- a/example.env +++ b/example.env @@ -21,10 +21,11 @@ GITHUB_PERSONAL_ACCESS_TOKEN=null OAUTH2_ACCESS_TOKEN_URL="https://IDENTITY_PROVIDER/REALM/token" OAUTH2_AUTHORIZATION_URL="https://IDENTITY_PROVIDER/REALM/auth" OAUTH2_PROFILE_URL="https://IDENTITY_PROVIDER/REALM/userinfo" -# different values for developement and production modes +# set different values for developement and production modes OAUTH2_CLIENT_ID="OAUTH2_CLIENT_ID" OAUTH2_CLIENT_SECRET="OAUTH2_CLIENT_SECRET" OAUTH2_JWT_SECRET="OAUTH2_JWT_SECRET" +BUDGET_OAUTH2_JWT_TEST_TOKEN="OAUTH2_JWT_TEST_TOKEN__GET_FROM_INTEGRATION_RESPONSE" # Description of OpenFisca country repository (for edition / contribution) OPENFISCA_BRANCH="harmonisation_ui_emmanuel" diff --git a/src/app.d.ts b/src/app.d.ts index 384c1e66367c71aa11adefc7315aeb2f02eb82ec..b063e02397e2b408b1a276e7778311fcde06691e 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -24,6 +24,7 @@ declare namespace App { apiBudgetEndpointName: string calculationBaseYear: number calculationPlfYear: number + jwtTestToken?: string } openfiscaRepository: SessionOpenFiscaRepository portalUrl: string diff --git a/src/lib/api-budget.test.ts b/src/lib/api-budget.test.ts index d699d9e9a4a1f0f88ae52b04f9aabad983d20bb9..74d86bbc252712d55ed701b50c200a7365021099 100644 --- a/src/lib/api-budget.test.ts +++ b/src/lib/api-budget.test.ts @@ -74,7 +74,7 @@ test("calculateBudget", () => { "https://api-simu-etat-integ.leximpact.dev/state_simulation" const YEAR_BASE = "2022" const YEAR_PLF = "" - const UNKNOWN_USER = config.oauth2.jwtSecret + const TOKEN_TEST_USER = config.budget.jwtTestToken const AMENDEMENT_EXAMPLE = { // AmendementRequest "prelevements_sociaux.contributions_sociales.csg.activite.imposable.taux": 0.064, @@ -149,7 +149,7 @@ test("calculateBudget", () => { calculateBudget( fetch, API_ENDPOINT_URL, - UNKNOWN_USER, + TOKEN_TEST_USER, YEAR_BASE, YEAR_PLF, AMENDEMENT_EXAMPLE_2, diff --git a/src/lib/auditors/config.ts b/src/lib/auditors/config.ts index ec2f45f75946c5b9a26ee92b8814eba1bc12676b..9aaac70b465d16af874312d2c2df13c8c830deba 100644 --- a/src/lib/auditors/config.ts +++ b/src/lib/auditors/config.ts @@ -198,8 +198,8 @@ export function auditOpenFiscaRepository( true, errors, remainingKeys, + auditString, auditTrimString, - auditRequire, ) } for (const key of ["rawUrlTemplate", "urlTemplate"]) { @@ -261,6 +261,16 @@ function auditBudget(audit: Audit, dataUnknown: unknown): [unknown, unknown] { ) } + audit.attribute( + data, + "jwtTestToken", + true, + errors, + remainingKeys, + auditString, + auditTrimString, + ) + return audit.reduceRemaining(data, errors, remainingKeys) } diff --git a/src/lib/config-csg-activite.ts b/src/lib/config-csg-activite.ts index a3452920fbc6f33267d6e2f10779fc1d7ec398dc..eed537ac8eb1662074264b020acef82417b59123 100644 --- a/src/lib/config-csg-activite.ts +++ b/src/lib/config-csg-activite.ts @@ -12,7 +12,6 @@ const API_OUTPUT_VARIABLES: string[] = [ "assiette_csg_abattue", "assiette_csg_non_abattue", "csg_imposable_salaire", - "csg_deductible_salaire", ] const API_QUANTILES_BASE_VARIABLES: string[] = [ diff --git a/src/lib/server/config.ts b/src/lib/server/config.ts index cf013951b2f5372a6b4fa5ab3937616e7022623a..fe04e51d2e059a28ee52e3f9e495f7b8fd15d11c 100644 --- a/src/lib/server/config.ts +++ b/src/lib/server/config.ts @@ -17,6 +17,7 @@ export interface Config { clientId: string clientSecret: string jwtSecret: string + jwtTestToken: string profileUrl: string } openfiscaRepository: { @@ -36,6 +37,7 @@ export interface Config { apiBudgetEndpointName: string calculationBaseYear: number calculationPlfYear: number + jwtTestToken?: string } } @@ -79,6 +81,7 @@ const [validConfig, error] = validateConfig({ apiBudgetEndpointName: process.env["API_BUDGET_ENDPOINT_NAME"], calculationBaseYear: process.env["CALCULATION_BASE_YEAR"], calculationPlfYear: process.env["CALCULATION_PLF_YEAR"], + jwtTestToken: process.env["BUDGET_OAUTH2_JWT_TEST_TOKEN"], } : null, })