Merge pull request #641 from solita/feature/AE-2356-signing-tool-version

AE-2356: Fetch signing tool version
solita · Dec 4, 2024 · 7edff45 · 7edff45
2 parents 8d09c51 + 22e86f7
commit 7edff45
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 12 deletions.
diff --git a/e2e-tests/cypress/cypress/e2e/kaytonvalvonta/kaytonvalvonta.cy.js b/e2e-tests/cypress/cypress/e2e/kaytonvalvonta/kaytonvalvonta.cy.js
@@ -728,8 +728,10 @@ context('Käytönvalvonta', () => {
     submitToimenpide();
 
     now.setDate(desired);
+    // This works for december, setting month to January and incrementing year
+    now.setMonth(now.getMonth() + 1);
     cy.get('[data-cy="deadline"]').contains(
-      `${now.getDate()}.${now.getMonth() + 2}.${now.getFullYear()}`
+      `${now.getDate()}.${now.getMonth() + 1}.${now.getFullYear()}`
     );
   });
 });
diff --git a/etp-front/__snapshots__/checkbox--with-label-and-checked-disabled.png b/etp-front/__snapshots__/checkbox--with-label-and-checked-disabled.png
diff --git a/etp-front/__snapshots__/checkbox--with-label-and-checked.png b/etp-front/__snapshots__/checkbox--with-label-and-checked.png
diff --git a/etp-front/__snapshots__/checkbox--with-label-disabled.png b/etp-front/__snapshots__/checkbox--with-label-disabled.png
diff --git a/etp-front/__snapshots__/checkbox--with-label.png b/etp-front/__snapshots__/checkbox--with-label.png
diff --git a/etp-front/__snapshots__/footer--with-text.png b/etp-front/__snapshots__/footer--with-text.png
diff --git a/etp-front/__snapshots__/h1--with-text.png b/etp-front/__snapshots__/h1--with-text.png
diff --git a/etp-front/__snapshots__/input--with-caret.png b/etp-front/__snapshots__/input--with-caret.png
diff --git a/etp-front/__snapshots__/input--with-failed-validation.png b/etp-front/__snapshots__/input--with-failed-validation.png
diff --git a/etp-front/__snapshots__/input--with-required.png b/etp-front/__snapshots__/input--with-required.png
diff --git a/etp-front/__snapshots__/input--with-text.png b/etp-front/__snapshots__/input--with-text.png
diff --git a/etp-front/__snapshots__/radio--with-label.png b/etp-front/__snapshots__/radio--with-label.png
diff --git a/etp-front/__snapshots__/radio--with-selected.png b/etp-front/__snapshots__/radio--with-selected.png
diff --git a/etp-front/__snapshots__/toimintaalueetchecklist--with-toimintaalueet.png b/etp-front/__snapshots__/toimintaalueetchecklist--with-toimintaalueet.png
diff --git a/etp-front/src/pages/energiatodistus/signing/signature-api.js b/etp-front/src/pages/energiatodistus/signing/signature-api.js
@@ -6,31 +6,37 @@ const mpolluxUrl = 'https://localhost:53952';
 const mpolluxVersionUrl = `${mpolluxUrl}/version`;
 const mpolluxSignUrl = `${mpolluxUrl}/sign`;
 
-const signatureOptions = {
-  version: '1.1',
+const signatureOptions = version => ({
+  version: version,
   selector: {
     keyusages: ['nonrepudiation'],
     keyalgorithms: ['rsa']
   },
   contentType: 'data',
   hashAlgorithm: 'SHA256',
   signatureType: 'signature'
-};
+});
 
+// Example of mPollux response can be found in etp-core/docker/mpollux/api/version
 export const versionInfo = fetch => Fetch.getJson(fetch, mpolluxVersionUrl);
 
+const getSignatureOptions = fetch =>
+  R.map(R.compose(signatureOptions, R.prop('version')), versionInfo(fetch));
+
 export const isValidSignatureResponse = R.compose(
   R.equals('ok'),
   R.prop('status')
 );
 
 export const getSignature = R.curry((fetch, content) =>
-  R.compose(
-    R.map(R.pick(['signature', 'chain'])),
-    Future.filter(isValidSignatureResponse, 'error'),
-    Fetch.responseAsJson,
-    Future.encaseP(Fetch.fetchWithMethod(fetch, 'post', mpolluxSignUrl)),
-    R.assoc('content', R.__, signatureOptions),
-    R.prop('digest')
-  )(content)
+  R.chain(
+    R.compose(
+      R.map(R.pick(['signature', 'chain'])),
+      Future.filter(isValidSignatureResponse, 'error'),
+      Fetch.responseAsJson,
+      Future.encaseP(Fetch.fetchWithMethod(fetch, 'post', mpolluxSignUrl)),
+      R.assoc('content', R.prop('digest', content))
+    ),
+    getSignatureOptions(fetch)
+  )
 );