Fix safe apps msg parsing

safe-global · Oct 29, 2023 · 97af353 · 97af353
1 parent 71222ef
commit 97af353
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/components/safe-apps/AppFrame/useAppCommunicator.ts b/src/components/safe-apps/AppFrame/useAppCommunicator.ts
@@ -90,6 +90,8 @@ const useAppCommunicator = (
     const initCommunicator = (iframeRef: MutableRefObject<HTMLIFrameElement>, app?: SafeAppData) => {
       communicatorInstance = new AppCommunicator(iframeRef, {
         onMessage: (msg) => {
+          if (!msg.data) return
+
           const isCustomApp = app && app.id < 1
 
           trackSafeAppEvent(

diff --git a/src/components/safe-apps/AppFrame/useFromAppAnalytics.ts b/src/components/safe-apps/AppFrame/useFromAppAnalytics.ts
@@ -16,6 +16,7 @@ const ALLOWED_DOMAINS: RegExp[] = [
 const useAnalyticsFromSafeApp = (iframeRef: MutableRefObject<HTMLIFrameElement | null>): void => {
   const isValidMessage = useCallback(
     (msg: MessageEvent<AnalyticsEvent>) => {
+      if (!msg.data) return false
       const isFromIframe = iframeRef.current?.contentWindow === msg.source
       const isCategoryAllowed = msg.data.category === SAFE_APPS_ANALYTICS_CATEGORY
       const isDomainAllowed = ALLOWED_DOMAINS.find((regExp) => regExp.test(msg.origin)) !== undefined

diff --git a/src/services/safe-apps/AppCommunicator.ts b/src/services/safe-apps/AppCommunicator.ts
@@ -29,6 +29,7 @@ class AppCommunicator {
   }
 
   private isValidMessage = (msg: SDKMessageEvent): boolean => {
+    if (!msg.data) return false
     if (msg.data.hasOwnProperty('isCookieEnabled')) {
       return true
     }
@@ -40,6 +41,7 @@ class AppCommunicator {
   }
 
   private canHandleMessage = (msg: SDKMessageEvent): boolean => {
+    if (!msg.data) return false
     return Boolean(this.handlers.get(msg.data.method))
   }