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

Supprime l'identifiant eIDAS de la trame ebms #12

Merged
merged 1 commit into from
May 27, 2024
Merged
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
1 change: 0 additions & 1 deletion .env.oots.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
AVEC_REQUETE_PIECE_JUSTIFICATIVE= # active l'API /requete/pieceJustificative avec valeur true
IDENTIFIANT_EIDAS= # identifiant eIDAS injecté dans les requêtes (tant qu'on ne sait pas le récupérer)
URL_OOTS_FRANCE= # URL Serveur OOTS-France, ex. https://oots.gouv.fr

DELAI_MAX_ATTENTE_DOMIBUS= # délai maximum d'attente d'une réponse Domibus à une requête envoyée (en millisecondes)
Expand Down
3 changes: 0 additions & 3 deletions src/adaptateurs/adaptateurEnvironnement.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
const avecRequetePieceJustificative = () => process.env.AVEC_REQUETE_PIECE_JUSTIFICATIVE === 'true';

const identifiantEIDAS = () => process.env.IDENTIFIANT_EIDAS;

module.exports = {
avecRequetePieceJustificative,
identifiantEIDAS,
};
2 changes: 0 additions & 2 deletions src/api/pieceJustificative.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const estErreurMetier = (e) => estErreurAbsenceReponse(e) || estErreurReponseReq
const pieceJustificative = (
{
adaptateurDomibus,
adaptateurEnvironnement,
adaptateurUUID,
depotPointsAcces,
},
Expand All @@ -37,7 +36,6 @@ const pieceJustificative = (
codeDemarche,
destinataire,
idConversation,
identifiantEIDAS: adaptateurEnvironnement.identifiantEIDAS(),
typeJustificatif,
previsualisationRequise: (previsualisationRequise === 'true' || previsualisationRequise === ''),
}))
Expand Down
3 changes: 0 additions & 3 deletions src/ebms/requeteJustificatif.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ class RequeteJustificatif extends Message {
codeDemarche = 'T1',
destinataire = {},
idConversation = config.adaptateurUUID.genereUUID(),
identifiantEIDAS = 'DK/DE/123123123',
typeJustificatif = new TypeJustificatif({}),
previsualisationRequise = false,
} = {},
) {
super(config, { destinataire, idConversation });

this.codeDemarche = codeDemarche;
this.identifiantEIDAS = identifiantEIDAS;
this.typeJustificatif = typeJustificatif;
this.previsualisationRequise = previsualisationRequise;
}
Expand Down Expand Up @@ -113,7 +111,6 @@ class RequeteJustificatif extends Message {
<rim:SlotValue xsi:type="rim:AnyValueType">
<sdg:Person>
<sdg:LevelOfAssurance>High</sdg:LevelOfAssurance>
<sdg:Identifier schemeID="eidas">${this.identifiantEIDAS}</sdg:Identifier>
<sdg:FamilyName>Smith</sdg:FamilyName>
<sdg:GivenName>Jonas</sdg:GivenName>
<sdg:DateOfBirth>1999-03-01</sdg:DateOfBirth>
Expand Down
1 change: 0 additions & 1 deletion src/routes/routesRequete.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const routesRequete = (config) => {
pieceJustificative(
{
adaptateurDomibus,
adaptateurEnvironnement,
adaptateurUUID,
depotPointsAcces,
},
Expand Down
25 changes: 0 additions & 25 deletions test/api/pieceJustificative.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ describe('Le requêteur de pièce justificative', () => {
adaptateurDomibus.envoieMessageRequete = () => Promise.resolve();
adaptateurDomibus.pieceJustificativeDepuisReponse = () => Promise.resolve();
adaptateurDomibus.urlRedirectionDepuisReponse = () => Promise.resolve();
adaptateurEnvironnement.identifiantEIDAS = () => 'FR/BE/123456789';
adaptateurUUID.genereUUID = () => '';
depotPointsAcces.trouvePointAcces = () => Promise.resolve({});

Expand Down Expand Up @@ -82,30 +81,6 @@ describe('Le requêteur de pièce justificative', () => {
return pieceJustificative(config, requete, reponse);
});

describe('quand `process.env.IDENTIFIANT_EIDAS` vaut `FR/BE/123456789`', () => {
let identifiantTemporaire;

beforeEach(() => {
identifiantTemporaire = process.env.IDENTIFIANT_EIDAS;
process.env.IDENTIFIANT_EIDAS = 'FR/BE/123456789';
});

afterEach(() => {
process.env.IDENTIFIANT_EIDAS = identifiantTemporaire;
});

it('utilise cet identifiant', () => {
adaptateurDomibus.envoieMessageRequete = ({ identifiantEIDAS }) => {
try {
expect(identifiantEIDAS).toEqual('FR/BE/123456789');
return Promise.resolve();
} catch (e) { return Promise.reject(e); }
};

return pieceJustificative(config, requete, reponse);
});
});

it('utilise un identifiant de conversation', () => {
adaptateurUUID.genereUUID = () => '11111111-1111-1111-1111-111111111111';

Expand Down
11 changes: 0 additions & 11 deletions test/ebms/requeteJustificatif.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,6 @@ describe("La vue du message de requête d'un justificatif", () => {
expect(codeDemarche.LocalizedString['@_value']).toBe('T3');
});

it("injecte l'identifiant eIDAS spécifié en variable d'environnement", () => {
const requeteJustificatif = new RequeteJustificatif(
configurationRequete,
{ identifiantEIDAS: 'BE/FR/123456789' },
);
const xml = parseXML(requeteJustificatif.corpsMessageEnXML());

const personne = valeurSlot('NaturalPerson', xml.QueryRequest.Query);
expect(personne.Person.Identifier['#text']).toBe('BE/FR/123456789');
});

it("injecte l'identifiant de type de justificatif demandé", () => {
const requeteJustificatif = new RequeteJustificatif(
configurationRequete,
Expand Down
1 change: 0 additions & 1 deletion test/routes/serveurTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const serveurTest = () => {

adaptateurEnvironnement = {
avecRequetePieceJustificative: () => true,
identifiantEIDAS: () => 'FR/BE/123456789',
};

adaptateurUUID = {
Expand Down
Loading