feat: removed result endpoint

GemeenteNijmegen · Oct 16, 2022 · 2d5f542 · 2d5f542
1 parent fe1992b
commit 2d5f542
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 281 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.projen/files.json b/.projen/files.json
diff --git a/.projen/tasks.json b/.projen/tasks.json
diff --git a/package.json b/package.json
diff --git a/src/ApiStack.ts b/src/ApiStack.ts
@@ -9,7 +9,6 @@ import { AuthFunction } from './app/auth/auth-function';
 import { IssueFunction } from './app/issue/issue-function';
 import { LoginFunction } from './app/login/login-function';
 import { LogoutFunction } from './app/logout/logout-function';
-import { ResultFunction } from './app/result/result-function';
 import { DynamoDbReadOnlyPolicy } from './iam/dynamodb-readonly-policy';
 import { SessionsTable } from './SessionsTable';
 import { Statics } from './statics';
@@ -126,25 +125,6 @@ export class ApiStack extends Stack {
     secretIrmaApiSecretKey.grantRead(issueFunction.lambda);
     secretIrmaApiKey.grantRead(issueFunction.lambda);
 
-    const resultFunction = new ApiFunction(this, 'irma-issue-result-function', {
-      description: 'Result endpoint voor de IRMA issue-applicatie.',
-      table: this.sessionsTable,
-      tablePermissions: 'ReadWrite',
-      applicationUrlBase: baseUrl,
-      readOnlyRole,
-      environment: {
-        IRMA_API_HOST: irmaApiHost,
-        IRMA_API_DEMO: irmaApiDemo,
-        IRMA_API_ACCESS_KEY_ID_ARN: secretIrmaApiAccessKeyId.secretArn,
-        IRMA_API_SECRET_KEY_ARN: secretIrmaApiSecretKey.secretArn,
-        IRMA_API_KEY_ARN: secretIrmaApiKey.secretArn,
-      },
-    }, ResultFunction);
-    secretIrmaApiAccessKeyId.grantRead(resultFunction.lambda);
-    secretIrmaApiSecretKey.grantRead(resultFunction.lambda);
-    secretIrmaApiKey.grantRead(resultFunction.lambda);
-
-
     this.api.addRoutes({
       integration: new HttpLambdaIntegration('irma-issue-login', loginFunction.lambda),
       path: '/login',
@@ -163,12 +143,6 @@ export class ApiStack extends Stack {
       methods: [apigatewayv2.HttpMethod.GET],
     });
 
-    this.api.addRoutes({ // Endpoint for relaying signed request to IRMA issue server (secured with AWS credentials)
-      integration: new HttpLambdaIntegration('irma-issue-result', resultFunction.lambda),
-      path: '/result',
-      methods: [apigatewayv2.HttpMethod.GET],
-    });
-
     this.api.addRoutes({ // Also availabel at / due to CloudFront defaultRootObject
       integration: new HttpLambdaIntegration('irma-issue-issue', issueFunction.lambda),
       path: '/issue',

diff --git a/src/CloudfrontStack.ts b/src/CloudfrontStack.ts
@@ -257,7 +257,7 @@ export class CloudfrontStack extends Stack {
    *
    * @returns string csp header values
    */
-  cspHeaderValue() {  // TODO make environment dependent (gw-test.nijmegen.nl vs prod)
+  cspHeaderValue() { // TODO make environment dependent (gw-test.nijmegen.nl vs prod)
     const cspValues = 'default-src \'self\';\
     frame-ancestors \'self\';\
     frame-src \'self\';\

diff --git a/src/DNSStack.ts b/src/DNSStack.ts
@@ -73,7 +73,7 @@ export class DNSStack extends Stack {
     let dsValue = '';
     switch (this.branch) {
       case 'acceptance':
-        dsValue = '52561 13 2 EBD9ED03EC245E70D458F7B300606FB1DBB3C6D185E19EDB835FBC47B396530A'; // TODO manually removed so add again when deploying DNSSEC stack to accp again
+        dsValue = '52561 13 2 EBD9ED03EC245E70D458F7B300606FB1DBB3C6D185E19EDB835FBC47B396530A';
         break;
       case 'production':
         dsValue = '60066 13 2 932CD585B029E674E17C4C33DFE7DE2C84353ACD8C109760FD17A6CDBD0CF3FA'; // TODO fix in prod

diff --git a/src/app/code/IrmaApi.ts b/src/app/code/IrmaApi.ts
@@ -124,16 +124,6 @@ export class IrmaApi {
     // Get persoonsgegevens
     const gegevens = brpData.Persoon.Persoonsgegevens;
 
-    // Calculate age attributes
-    // const birthDateStr: string = gegevens.Geboortedatum;
-    // const birthDate = parse(birthDateStr, 'dd-MM-yyyy', new Date());
-    // const age = differenceInYears(birthDate, new Date());
-    // const over12 = age >= 12 ? 'yes' : 'no';
-    // const over16 = age >= 16 ? 'yes' : 'no';
-    // const over18 = age >= 18 ? 'yes' : 'no';
-    // const over21 = age >= 21 ? 'yes' : 'no';
-    // const over65 = age >= 65 ? 'yes' : 'no';
-
     // Return the issue request
     return {
       type: 'issuing',

diff --git a/src/app/issue/homeRequestHandler.ts b/src/app/issue/homeRequestHandler.ts
@@ -36,14 +36,14 @@ async function handleLoggedinRequest(session: Session, brpClient: ApiClient, irm
   let brpFailed = naam == 'Onbekende gebruiker';
   let irmaFailed = false;
   let irmaSession = {
-    irmaSessionPtrU:  undefined,
+    irmaSessionPtrU: undefined,
     irmaSessionPtrQr: undefined,
-    irmaSessionToken: undefined, 
-  }
-  if(!brpFailed){
+    irmaSessionToken: undefined,
+  };
+  if (!brpFailed) {
     // Start IRMA session
     const irmaResponse = await irmaApi.startSession(brpData);
-    if(!irmaResponse || irmaResponse.error){
+    if (!irmaResponse || irmaResponse.error) {
       irmaFailed = true;
     } else {
       irmaSession.irmaSessionPtrQr = irmaResponse.sessionPtr.irmaqr;

diff --git a/src/app/result/handleRequest.ts b/src/app/result/handleRequest.ts
diff --git a/src/app/result/result-function.ts b/src/app/result/result-function.ts
diff --git a/src/app/result/result.lambda.ts b/src/app/result/result.lambda.ts
diff --git a/src/app/static-resources/static/scripts/issue.js b/src/app/static-resources/static/scripts/issue.js
@@ -14,11 +14,7 @@ const irmaClient = irma.newWeb({
             sessionPtr: r => { return { "u": sessionPtrU, "irmaqr": sessionPtrQr } },
             sessionToken: r => { return sessionToken },
         },
-        result: false
-        //{
-        //    url: (o, {ptr, token}) => `${sessionResultEndpoint}?token=${token}`,
-        //    parseResponse: r => r.json()
-        //}
+        result: false,
     },
     state: {
         serverSentEvents: false,