matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fa005 submissions file link in notifications (#298)

Browse Source 
* fix: unsigned url in form email

* fix: signed file link in email

* fix: use limit function for file  label name

* feat: use signed url  for files in email and csv export

---------

Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
Favour Olayinka
2024-01-31 12:21:28 +01:00
committed by GitHub
parent 428ab4f6cf
commit 38cb133e52
6 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Service/Forms/FormSubmissionFormatter.php
View File

@@ -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 @@ class FormSubmissionFormatter
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 @@ class FormSubmissionFormatter
$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 @@ class FormSubmissionFormatter
$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 @@ class FormSubmissionFormatter
}
}
private function getFileUrl($formId, $file)
{
return $this->useSignedUrlForFiles ? \URL::signedRoute(
'open.forms.submissions.file',
[$formId, $file]) : route('open.forms.submissions.file', [$formId, $file]);
}
}