Merge branch 'main' into crisp-migration

Author: JhumanJ

app/Http/Controllers/Forms/FormSubmissionController.php

@@ -37,7 +37,8 @@ public function export(string $id)
             $formatter = (new FormSubmissionFormatter($form, $row['data']))
                 ->outputStringsOnly()
                 ->setEmptyForNoValue()
-                ->showRemovedFields();
+                ->showRemovedFields()
+                ->useSignedUrlForFiles();
             $tmp = $formatter->getCleanKeyValue();
             $tmp['Create Date'] = date("Y-m-d H:i", strtotime($row['created_at']));
             $allRows[] = $tmp;

app/Mail/Forms/SubmissionConfirmationMail.php

@@ -35,7 +35,8 @@ public function build()
 
         $formatter = (new FormSubmissionFormatter($form, $this->event->data))
             ->createLinks()
-            ->outputStringsOnly();
+            ->outputStringsOnly()
+            ->useSignedUrlForFiles();
 
         return $this
             ->replyTo($this->getReplyToEmail($form->creator->email))

app/Notifications/Forms/FormSubmissionNotification.php

@@ -49,7 +49,8 @@ public function toMail($notifiable)
         $formatter = (new FormSubmissionFormatter($this->event->form, $this->event->data))
             ->showHiddenFields()
             ->createLinks()
-            ->outputStringsOnly();
+            ->outputStringsOnly()
+            ->useSignedUrlForFiles();
 
         return (new MailMessage)
             ->replyTo($this->getReplyToEmail($notifiable->routes['mail']))

app/Service/Forms/FormSubmissionFormatter.php

@@ -29,6 +29,8 @@ class FormSubmissionFormatter
 
     private $showRemovedFields = false;
 
+    private $useSignedUrlForFiles = false;
+
     /**
      * Logic resolver needs an array id => value, so we create it here
      */
@@ -69,6 +71,12 @@ public function showRemovedFields()
         return $this;
     }
 
+    public function useSignedUrlForFiles()
+    {
+        $this->useSignedUrlForFiles = true;
+        return $this;
+    }
+
     /**
      * Return a nice "FieldName": "Field Response" array
      * - If createLink enabled, returns html link for emails and links
@@ -117,14 +125,14 @@ public function getCleanKeyValue()
                     $formId = $this->form->id;
                     $returnArray[$field['name']] = implode(', ',
                         collect($data[$field['id']])->map(function ($file) use ($formId) {
-                            return route('open.forms.submissions.file', [$formId, $file]);
+                            return $this->getFileUrl($formId, $file);
                         })->toArray()
                     );
                 } else {
                     $formId = $this->form->id;
                     $returnArray[$field['name']] = collect($data[$field['id']])->map(function ($file) use ($formId) {
                             return [
-                                'file_url' => route('open.forms.submissions.file', [$formId, $file]),
+                                'file_url' => $this->getFileUrl($formId, $file),
                                 'file_name' => $file,
                             ];
                         });
@@ -185,14 +193,22 @@ public function getFieldsWithValue()
                     $formId = $this->form->id;
                     $field['value'] = implode(', ',
                         collect($data[$field['id']])->map(function ($file) use ($formId) {
-                            return route('open.forms.submissions.file', [$formId, $file]);
+                            return $this->getFileUrl($formId,  $file);
                         })->toArray()
                     );
+                    $field['email_data'] = collect($data[$field['id']])->map(function ($file) use ($formId) {
+                        $splitText = explode('.', $file);
+                        return [
+                            "unsigned_url" => route('open.forms.submissions.file', [$formId, $file]),
+                            "signed_url" => $this->getFileUrl($formId, $file),
+                            "label" => \Str::limit($file, 20, '[...].'.end($splitText))
+                        ];
+                    })->toArray();
                 } else {
                     $formId = $this->form->id;
                     $field['value'] = collect($data[$field['id']])->map(function ($file) use ($formId) {
                         return [
-                            'file_url' => route('open.forms.submissions.file', [$formId, $file]),
+                            'file_url' => $this->getFileUrl($formId, $file),
                             'file_name' => $file,
                         ];
                     });
@@ -222,4 +238,11 @@ private function initIdFormData() {
         }
     }
 
+    private function getFileUrl($formId, $file)
+    {
+        return $this->useSignedUrlForFiles ? \URL::signedRoute(
+            'open.forms.submissions.file',
+            [$formId, $file]) : route('open.forms.submissions.file', [$formId, $file]);
+    }
+
 }

client/components/forms/PhoneInput.vue

@@ -93,6 +93,9 @@ export default {
         }
       }
     },
+    compVal(newVal,  oldVal){
+        this.initState()
+    },
     selectedCountryCode (newVal, oldVal) {
       if (this.compVal && newVal && oldVal) {
         this.compVal = this.compVal.replace(oldVal.code + oldVal.dial_code, newVal.code + newVal.dial_code)
@@ -102,17 +105,7 @@ export default {
 
   mounted () {
     if (this.compVal) {
-      if (!this.compVal.startsWith('+')) {
-        this.selectedCountryCode = this.getCountryBy(this.compVal.substring(2, 0))
-      }
-
-      const phoneObj = parsePhoneNumber(this.compVal)
-      if (phoneObj !== undefined && phoneObj) {
-        if (!this.selectedCountryCode && phoneObj.country !== undefined && phoneObj.country) {
-          this.selectedCountryCode = this.getCountryBy(phoneObj.country)
-        }
-        this.inputVal = phoneObj.nationalNumber
-      }
+      this.initState()
     }
     if (!this.selectedCountryCode) {
       this.selectedCountryCode = this.getCountryBy()
@@ -131,6 +124,7 @@ export default {
     },
     onInput (event) {
       this.inputVal = event?.target?.value.replace(/[^0-9]/g, '')
+
     },
     onChangeCountryCode () {
       if (!this.selectedCountryCode && this.countries.length > 0) {
@@ -139,6 +133,22 @@ export default {
       if (this.canOnlyCountry && (this.inputVal === null || this.inputVal === '' || !this.inputVal)) {
         this.compVal = this.selectedCountryCode.code + this.selectedCountryCode.dial_code
       }
+    },
+    initState() {
+      if(this.compVal  === null){
+        return;
+      }
+      if (!this.compVal.startsWith('+')) {
+        this.selectedCountryCode = this.getCountryBy(this.compVal.substring(2, 0))
+      }
+
+      const phoneObj = parsePhoneNumber(this.compVal)
+      if (phoneObj !== undefined && phoneObj) {
+        if (!this.selectedCountryCode && phoneObj.country !== undefined && phoneObj.country) {
+          this.selectedCountryCode = this.getCountryBy(phoneObj.country)
+        }
+        this.inputVal = phoneObj.nationalNumber
+      }
     }
   }
 }

resources/views/mail/form/confirmation-submission-notification.blade.php

@@ -17,9 +17,14 @@
 --------------------------------------------------------------------------------
 
 **{{$field['name']}}**
-
+@if($field['type'] == 'files')
+<br/>
+@foreach($field['email_data'] as $link)
+<a href="{{$link['signed_url']}}">{{$link['label']}}</a> <br/>
+@endforeach
+@else
 {!! is_array($field['value'])?implode(',',$field['value']):$field['value']!!}
-
+@endif
 @endif
 @endforeach
 @endif

resources/views/mail/form/submission-notification.blade.php

@@ -10,9 +10,14 @@
 --------------------------------------------------------------------------------
 
 **{{$field['name']}}**
-
+@if($field['type'] == 'files')
+<br/>
+@foreach($field['email_data'] as $link)
+<a href="{{$link['signed_url']}}">{{$link['label']}}</a> <br/>
+@endforeach
+@else
 {!! is_array($field['value'])?implode(',',$field['value']):$field['value']!!}
-
+@endif
 @endif
 @endforeach