fix: resolve file URLs when previewing messages

Author: gyoshev

dist/leanplum.js

@@ -13,7 +13,6 @@ import ValueTransforms from './ValueTransforms'
 type MessageId = string
 type Timestamp = number
 type MessageHash = { [key: string]: Message }
-// TODO: validation
 export type ActionContext = {
   // matches the ActionContext API in Android/iOS
   // https://docs.leanplum.com/reference#section-android-custom-templates
@@ -202,10 +201,10 @@ export default class Messages {
     this.handleMessage({
       isPreview: true,
 
-      message: {
+      message: this.addDefaults({
         messageId: message.messageId,
         ...vars,
-      },
+      }),
 
       context,
     })
@@ -455,26 +454,35 @@ export default class Messages {
   }
 
   private addDefaults(vars: MessageVariables): MessageVariables {
-    const kinds = this.getMessages().actionDefinitions || {}
-    const defaults = kinds[vars.__name__]
+    const definitions = this.getMessages().actionDefinitions || {}
+    const definition = definitions[vars.__name__]
+    const kinds = definition?.kinds
 
-    if (!defaults) {
+    if (!definition) {
       return vars
     }
 
-    function useDefaults(obj: MessageVariables, defaultValues: MessageVariables): MessageVariables {
+    const useDefaults = (
+      obj: MessageVariables,
+      defaultValues: MessageVariables,
+      path = ''
+    ): MessageVariables => {
       for (const key of Object.keys(defaultValues)) {
         const value = defaultValues[key]
         if (typeof value === 'object') {
-          obj[key] = useDefaults(obj[key] || {}, value)
+          obj[key] = useDefaults(obj[key] || {}, value, `${path}${key}.`)
         } else if (typeof obj[key] === 'undefined') {
           obj[key] = value
         }
+
+        if (kinds[`${path}${key}`] === 'FILE') {
+          obj[key] = this.getFileUrl(obj[key])
+        }
       }
       return obj
     }
 
-    return useDefaults({ ...vars }, defaults.values)
+    return useDefaults({ ...vars }, definition.values)
   }
 
   private resolveFiles(vars: MessageVariables): MessageVariables {

dist/leanplum.min.js

@@ -93,7 +93,7 @@ describe(Messages, () => {
       expect(secondMessage).toHaveProperty('Title', 'Confirm again')
     })
 
-    it('triggers showMessage for chained message', () => {
+    it('triggers chained registerForPush', () => {
       const registerForPush = jest.fn()
       events.on('registerForPush', registerForPush)
 
@@ -1073,6 +1073,48 @@ describe(Messages, () => {
       expect(message).toHaveProperty('Green Color', 'rgba(0,255,0,1)')
       expect(message).toHaveProperty('White Color', 'rgba(255,255,255,1)')
     })
+
+    it('resolves file URLs', () => {
+      const fileUrl = 'https://api.leanplum.com/api?appId'
+
+      getFileUrl.mockReturnValue(fileUrl)
+
+      const actionDefinitions = {
+        Confirm: {
+          "kind": 3,
+          "kinds": {
+            "Image": "FILE",
+            "Button": "GROUP",
+            "Button.Image": "FILE"
+          },
+          "values": {
+            "Image": "",
+            "Button": {
+              "Image": ""
+            }
+          }
+        }
+      }
+      events.emit('messagesReceived', {
+        actionDefinitions
+      })
+
+      events.emit('previewRequest', {
+        messageId: 123,
+        action: {
+          __name__: 'Confirm',
+          Image: 'example.png',
+          Button: {
+            Image: 'button.png',
+          }
+        }
+      })
+
+      const message = showMessage.mock.calls[0][0].message
+      expect(message).toHaveProperty('Image')
+      expect(message.Image).toContain('https://api.leanplum.com/api?appId')
+      expect(message.Button.Image).toContain('https://api.leanplum.com/api?appId')
+    })
   })
 
   describe("rich in-app message rendering", () => {