Merge pull request #1144 from serlo/wallet-user-journey

fix(enmeshed): Fix endpoints to reenable user journey
serlo · Dec 1, 2023 · d5533a8 · d5533a8
2 parents e6c7c0f + fc05519
commit d5533a8
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v0.59.2](https://github.com/serlo/api.serlo.org/compare/v0.59.1..v0.59.2) - December 1, 2023
+
+### Fixed
+
+- Fix enmeshed endpoints to reenable user journey
+
+- Set always a ttl for each key
+
+### Internal
+
+- Add pact tests to github repo
+
+- Remove unnecessary test redis
+
+- Improve CI speed
+
+- Make tests run parallel
+
 ## [v0.59.1](https://github.com/serlo/api.serlo.org/compare/v0.59.0..v0.59.1) - November 30, 2023
 
 ### Internal

diff --git a/lerna.json b/lerna.json
@@ -3,6 +3,6 @@
     "packages/*"
   ],
   "npmClient": "yarn",
-  "version": "0.59.1",
+  "version": "0.59.2",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/packages/authorization/package.json b/packages/authorization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serlo/authorization",
-  "version": "0.59.1",
+  "version": "0.59.2",
   "repository": "serlo/api.serlo.org",
   "license": "Apache-2.0",
   "author": "Serlo Education e.V.",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serlo/api.serlo.org",
-  "version": "0.59.1",
+  "version": "0.59.2",
   "private": true,
   "repository": "serlo/api.serlo.org",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "@nmshd/connector-sdk": "^2.2.4",
     "@ory/client": "^1.4.3",
     "@sentry/node": "^7.82.0",
-    "@serlo/authorization": "^0.59.1",
+    "@serlo/authorization": "^0.59.2",
     "@types/basic-auth": "^1.1.6",
     "@types/bull-arena": "^3.0.10",
     "@types/jsonwebtoken": "^9.0.5",

diff --git a/packages/server/src/internals/server/enmeshed-middleware.ts b/packages/server/src/internals/server/enmeshed-middleware.ts
@@ -59,7 +59,7 @@ export function applyEnmeshedMiddleware({
   return `${basePath}/init`
 }
 
-const EventBody = t.type({
+const GenericEventBody = t.type({
   trigger: t.string,
 })
 
@@ -80,9 +80,24 @@ const Relationship = t.type({
 
 type Relationship = t.TypeOf<typeof Relationship>
 
-const RelationshipChangedEventBody = t.type({
-  data: Relationship,
-  trigger: t.literal('transport.relationshipChanged'),
+const Attribute = t.type({
+  id: t.string,
+  content: t.type({
+    '@type': t.union([
+      t.literal('IdentityAttribute'),
+      t.literal('RelationshipAttribute'),
+    ]),
+    owner: t.string,
+    value: t.unknown,
+  }),
+})
+
+const EventBody = t.type({
+  data: t.union([Relationship, Attribute]),
+  trigger: t.union([
+    t.literal('transport.relationshipChanged'),
+    t.literal('consumption.attributeCreated'),
+  ]),
 })
 
 const Session = t.intersection([
@@ -397,62 +412,68 @@ function createEnmeshedWebhookMiddleware(
 
     const body = req.body as unknown
 
-    if (!EventBody.is(body)) {
+    if (!GenericEventBody.is(body)) {
       res.status(400).send('Illegal trigger body')
       return
     }
 
-    if (body.trigger !== 'transport.relationshipChanged') {
+    if (
+      body.trigger !== 'transport.relationshipChanged' &&
+      body.trigger !== 'consumption.attributeCreated'
+    ) {
       res.sendStatus(200)
       return
     }
 
-    if (!RelationshipChangedEventBody.is(body)) {
+    if (!EventBody.is(body)) {
       captureErrorEvent({
-        error: new Error('Illegal body for relationship change event'),
+        error: new Error('Illegal body event'),
         errorContext: { body, route: '/enmeshed/webhook' },
       })
       res.status(400).send('Illegal trigger body')
       return
     }
 
-    const relationship = body.data
-
-    const sessionId =
-      relationship.template.content?.onNewRelationship?.metadata?.sessionId ??
-      null
-
-    for (const change of relationship.changes) {
-      if (
-        [ConnectorRelationshipChangeType.CREATION as string].includes(
-          change.type,
-        ) &&
-        [
-          ConnectorRelationshipChangeStatus.PENDING as string,
-          ConnectorRelationshipChangeStatus.REJECTED as string,
-        ].includes(change.status)
-      ) {
-        await acceptRelationshipRequest(relationship, change, client)
-        if (!sessionId) {
-          await sendWelcomeMessage({ relationship, client })
-          await sendAttributesChangeRequest({ relationship, client })
+    const data = body.data
+
+    if (Relationship.is(data)) {
+      const sessionId =
+        data.template.content?.onNewRelationship?.metadata?.sessionId ?? null
+
+      for (const change of data.changes) {
+        if (
+          [ConnectorRelationshipChangeType.CREATION as string].includes(
+            change.type,
+          ) &&
+          [
+            ConnectorRelationshipChangeStatus.PENDING as string,
+            ConnectorRelationshipChangeStatus.REJECTED as string,
+          ].includes(change.status)
+        ) {
+          await acceptRelationshipRequest(data, change, client)
+          if (!sessionId) {
+            await sendWelcomeMessage({ relationship: data, client })
+            await sendAttributesChangeRequest({ relationship: data, client })
+          }
         }
       }
-    }
 
-    // FIXME: Uncomment next line when prototype frontend has been replaced
-    // if (!sessionId) return validationError(res, 'Missing required parameter: sessionId.')
-    const session = await getSession(cache, sessionId)
+      // FIXME: Uncomment next line when prototype frontend has been replaced
+      // if (!sessionId) return validationError(res, 'Missing required parameter: sessionId.')
+      const session = await getSession(cache, sessionId)
 
-    if (session) {
-      await setSession(cache, sessionId, {
-        relationshipTemplateId: relationship.template.id,
-        content: relationship.template.content as Session['content'],
-      })
+      if (session) {
+        await setSession(cache, sessionId, {
+          relationshipTemplateId: data.template.id,
+          enmeshedId: data.peer,
+          content: data.template.content as Session['content'],
+        })
+      }
     }
 
     res.status(200).end('')
   }
+
   return (request, response) => {
     handleRequest(request, response).catch((error: Error) => {
       captureErrorEvent({

diff --git a/scripts/changelog.ts b/scripts/changelog.ts
@@ -1650,6 +1650,20 @@ async function exec(): Promise<void> {
         date: '2023-11-30',
         internal: ['`@serlo/authorization`: Remove dependency of `@ſerlo/api`'],
       },
+      {
+        tagName: 'v0.59.2',
+        date: '2023-12-01',
+        internal: [
+          'Add pact tests to github repo',
+          'Remove unnecessary test redis',
+          'Improve CI speed',
+          'Make tests run parallel',
+        ],
+        fixed: [
+          'Fix enmeshed endpoints to reenable user journey',
+          'Set always a ttl for each key',
+        ],
+      },
     ],
   })
 

diff --git a/yarn.lock b/yarn.lock
@@ -4096,7 +4096,7 @@ __metadata:
     "@nmshd/connector-sdk": ^2.2.4
     "@ory/client": ^1.4.3
     "@sentry/node": ^7.82.0
-    "@serlo/authorization": ^0.59.1
+    "@serlo/authorization": ^0.59.2
     "@types/basic-auth": ^1.1.6
     "@types/bull-arena": ^3.0.10
     "@types/jsonwebtoken": ^9.0.5
@@ -4137,7 +4137,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@serlo/authorization@^0.59.1, @serlo/authorization@workspace:packages/authorization":
+"@serlo/authorization@^0.59.2, @serlo/authorization@workspace:packages/authorization":
   version: 0.0.0-use.local
   resolution: "@serlo/authorization@workspace:packages/authorization"
   languageName: unknown