fix(app): use memberId for legacy apps (#1045)

* refactor: update sdk * refactor: resolve PR requested issues
graasp · Sep 18, 2024 · 37791ad · 37791ad
1 parent c555bba
commit 37791ad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
     "@emotion/cache": "~11.10.7 || ~11.11.0 || ~11.13.0",
     "@emotion/react": "~11.10.6 || ~11.11.0 || ~11.13.0",
     "@emotion/styled": "~11.10.6 || ~11.11.0 || ~11.13.0",
-    "@graasp/sdk": "^4.14.0",
+    "@graasp/sdk": "^4.29.0",
     "@graasp/stylis-plugin-rtl": "^2",
     "@graasp/translations": "^1.23.0",
     "@mui/icons-material": "~5.14.0 || ~5.15.0 || ~5.16.0",

diff --git a/src/items/appItemHooks.ts b/src/items/appItemHooks.ts
@@ -1,25 +1,19 @@
 import { useEffect } from 'react';
 
-import {
-  AppItemType,
-  Context,
-  DiscriminatedItem,
-  Member,
-  PermissionLevel,
-  UUID,
-} from '@graasp/sdk';
+import { DiscriminatedItem, LocalContext, UUID } from '@graasp/sdk';
 
 export type Token = string;
 
-export type ContextPayload = {
-  apiHost: string;
-  itemId: AppItemType['id'];
-  settings: AppItemType['settings'];
-  memberId?: Member['id'];
-  permission: `${PermissionLevel}` | PermissionLevel;
-  lang: string;
-  context: `${Context}` | Context;
-};
+export type ContextPayload = Pick<
+  LocalContext,
+  | 'apiHost'
+  | 'itemId'
+  | 'settings'
+  | 'permission'
+  | 'lang'
+  | 'context'
+  | 'accountId'
+>;
 
 const buildPostMessageKeys = (
   itemId: UUID,
@@ -129,7 +123,14 @@ const useAppCommunication = ({
         iFrameRef?.current?.contentWindow?.postMessage(
           JSON.stringify({
             type: POST_MESSAGE_KEYS.GET_CONTEXT_SUCCESS,
-            payload: contextPayload,
+
+            payload: {
+              /**
+               * Legacy for old apps or apps that does not use apps-query-client
+               */
+              memberId: contextPayload.accountId,
+              ...contextPayload,
+            },
           }),
           targetOrigin,
           [channel.port2],

diff --git a/yarn.lock b/yarn.lock
@@ -1430,7 +1430,7 @@ __metadata:
     "@emotion/cache": ~11.10.7 || ~11.11.0 || ~11.13.0
     "@emotion/react": ~11.10.6 || ~11.11.0 || ~11.13.0
     "@emotion/styled": ~11.10.6 || ~11.11.0 || ~11.13.0
-    "@graasp/sdk": ^4.14.0
+    "@graasp/sdk": ^4.29.0
     "@graasp/stylis-plugin-rtl": ^2
     "@graasp/translations": ^1.23.0
     "@mui/icons-material": ~5.14.0 || ~5.15.0 || ~5.16.0