add entity configuration

pagopa · Aug 10, 2023 · e3856f6 · e3856f6
1 parent c44b2fd
commit e3856f6
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/...ution-backend/src/infra/http/handlers/__test__/create-wallet-instance-attestation.spec.ts b/...ution-backend/src/infra/http/handlers/__test__/create-wallet-instance-attestation.spec.ts
@@ -106,7 +106,7 @@ describe("CreateWalletInstanceAttestationHandler", async () => {
     .setExpirationTime("2h")
     .sign(josePrivateKey);
 
-  it("should return a 201 HTTP response", () => {
+  it("should return a 201 HTTP response", async () => {
     const run = CreateWalletInstanceAttestationHandler({
       input: pipe(H.request("https://wallet-provider.example.org"), (req) => ({
         ...req,
@@ -124,11 +124,16 @@ describe("CreateWalletInstanceAttestationHandler", async () => {
       federationEntityMetadata,
       signer,
     });
-    expect(run()).resolves.toEqual(
+    const result = await run();
+
+    if (E.isLeft(result)) {
+      throw new Error(`Failed with error: ${result.left.message}`);
+    }
+
+    expect(result.right).toEqual(
       expect.objectContaining({
-        right: expect.objectContaining({
-          statusCode: 201,
-        }),
+        statusCode: 201,
+        body: expect.any(String),
       })
     );
   });

diff --git a/apps/io-func-wallet-solution-backend/src/wallet-instance-attestation.ts b/apps/io-func-wallet-solution-backend/src/wallet-instance-attestation.ts
@@ -3,11 +3,12 @@ import * as t from "io-ts";
 import * as TE from "fp-ts/TaskEither";
 import * as RTE from "fp-ts/ReaderTaskEither";
 import { pipe } from "fp-ts/function";
-import { sequenceS } from "fp-ts/lib/Apply";
+import { sequenceS, sequenceT } from "fp-ts/lib/Apply";
 
 import {
   EntityConfigurationEnvironment,
   FederationEntity,
+  getEntityConfiguration,
 } from "./entity-configuration";
 import { verifyWalletInstanceAttestationRequest } from "./wallet-instance-attestation-request";
 import { LoA, getLoAUri } from "./wallet-provider";
@@ -29,6 +30,29 @@ export type WalletInstanceAttestationPayload = t.TypeOf<
   typeof WalletInstanceAttestationPayload
 >;
 
+const composeTrustChain = ({
+  federationEntityMetadata,
+  signer,
+}: EntityConfigurationEnvironment) => {
+  const walletProviderEntityStatement = pipe(
+    new EidasTrustAnchor(federationEntityMetadata),
+    (ta) => ta.getEntityStatement(),
+    TE.map(({ encoded }) => encoded)
+  );
+
+  const walletProviderEntityConfiguration = getEntityConfiguration()({
+    federationEntityMetadata,
+    signer,
+  });
+
+  return pipe(
+    sequenceT(TE.ApplicativePar)(
+      walletProviderEntityConfiguration,
+      walletProviderEntityStatement
+    )
+  );
+};
+
 // Build the JWT of the Wallet Instance Attestation given a Wallet Instance Attestation Request
 export const createWalletInstanceAttestation =
   (
@@ -46,11 +70,7 @@ export const createWalletInstanceAttestation =
           signer.getSupportedSignAlgorithms(),
           TE.fromEither
         ),
-        trustChain: pipe(
-          new EidasTrustAnchor(federationEntityMetadata),
-          (ta) => ta.getEntityStatement(),
-          TE.map(({ encoded }) => [encoded])
-        ),
+        trustChain: composeTrustChain({ federationEntityMetadata, signer }),
       }),
       TE.chain(({ request, publicJwk, supportedSignAlgorithms, trustChain }) =>
         pipe(