fix: add H5P integration url to packed item wrapper (#2027)

* fix: add integration url to packed item wrapper

* fix: update with comments

Author: spaenleh

src/services/item/item.service.ts

@@ -2,6 +2,7 @@ import { Readable } from 'stream';
 import { delay, inject, singleton } from 'tsyringe';
 
 import {
+  H5PItemExtra,
   ItemType,
   ItemVisibilityType,
   MAX_DESCENDANTS_FOR_COPY,
@@ -31,6 +32,7 @@ import type {
 } from '../../drizzle/types';
 import { BaseLogger } from '../../logger';
 import type { AuthenticatedUser, MaybeUser, MinimalMember } from '../../types';
+import { H5P_INTEGRATION_URL } from '../../utils/config';
 import {
   CannotReorderRootItem,
   InvalidMembership,
@@ -464,7 +466,13 @@ export class ItemService {
     );
     const thumbnails = await this.itemThumbnailService.getUrlsByItems([item]);
 
-    return new ItemWrapper(item, itemMembership, visibilities, thumbnails[item.id]).packed();
+    const packedItem = new ItemWrapper(
+      item,
+      itemMembership,
+      visibilities,
+      thumbnails[item.id],
+    ).packed();
+    return this.transformItemByType(packedItem);
   }
 
   async getAccessible(
@@ -527,7 +535,7 @@ export class ItemService {
     const thumbnails = await this.itemThumbnailService.getUrlsByItems(children);
 
     // TODO optimize?
-    return filterOutPackedItems(
+    const filteredChildren = await filterOutPackedItems(
       dbConnection,
       actor,
       {
@@ -537,6 +545,7 @@ export class ItemService {
       children,
       thumbnails,
     );
+    return filteredChildren.map((children) => this.transformItemByType(children));
   }
 
   async getDescendants(
@@ -1045,4 +1054,24 @@ export class ItemService {
       await this.itemRepository.rescaleOrder(dbConnection, parentItem);
     }
   }
+
+  private transformItemByType(item: PackedItem) {
+    switch (item.type) {
+      case ItemType.H5P: {
+        const { h5p: h5pExtraProperties } = item.extra as H5PItemExtra;
+        const integrationUrl = new URL(H5P_INTEGRATION_URL);
+        // add the contentId param to the integration
+        integrationUrl.searchParams.set('contentId', h5pExtraProperties.contentId);
+        const newExtra = {
+          h5p: {
+            ...h5pExtraProperties,
+            integrationUrl: integrationUrl.toString(),
+          },
+        };
+        return { ...item, extra: newExtra };
+      }
+      default:
+        return item;
+    }
+  }
 }

src/utils/config.ts

@@ -21,6 +21,10 @@ export const CLIENT_HOST = process.env.CLIENT_HOST ?? 'http://localhost:3114';
 
 export const LIBRARY_HOST = process.env.LIBRARY_CLIENT_HOST ?? CLIENT_HOST;
 
+// Fallback to the server-provided integration is only available in dev
+export const H5P_INTEGRATION_URL =
+  process.env.H5P_INTEGRATION_URL ?? 'http://localhost:3000/h5p-integration';
+
 export const ALLOWED_ORIGINS = [new URL(CLIENT_HOST).origin, new URL(LIBRARY_HOST).origin];
 
 // Add the hosts of the different clients