Skip to content

Beautiful Open-Source Form Builder

Submissions UUID (#970)

Chirag Chhatrala4859dcfe9a50
diff --git a/api/app/Http/Controllers/Forms/PublicFormController.php b/api/app/Http/Controllers/Forms/PublicFormController.php
index f5eda701e..e179db8c5 100644
--- a/api/app/Http/Controllers/Forms/PublicFormController.php
+++ b/api/app/Http/Controllers/Forms/PublicFormController.php
@@ -11,6 +11,7 @@ use App\Jobs\Form\StoreFormSubmissionJob;
use App\Service\Forms\Analytics\UserAgentHelper;
use App\Service\Forms\FormSubmissionProcessor;
use App\Service\Forms\FormCleaner;
+use App\Service\Forms\SubmissionUrlService;
use App\Service\WorkspaceHelper;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -135,7 +136,7 @@ class PublicFormController extends Controller
return $this->success([
'message' => 'Partial submission saved',
- 'submission_hash' => Hashids::encode($job->getSubmissionId())
+ 'submission_hash' => SubmissionUrlService::getSubmissionIdentifierById($form, $job->getSubmissionId())
]);
}
@@ -156,7 +157,7 @@ class PublicFormController extends Controller
: $request->validated();
// Process submission hash and ID
- $submissionData = $this->processSubmissionIdentifiers($request, $submissionData);
+ $submissionData = $this->processSubmissionIdentifiers($request, $submissionData, $form);
// Add IP address for tracking if enabled
unset($submissionData['submitter_ip']);
@@ -175,7 +176,9 @@ class PublicFormController extends Controller
// Process the submission
if ($formSubmissionProcessor->shouldProcessSynchronously($form)) {
$job->handle();
- $encodedSubmissionId = Hashids::encode($job->getSubmissionId());
+
+ $encodedSubmissionId = SubmissionUrlService::getSubmissionIdentifierById($form, $job->getSubmissionId());
+
// Update submission data with generated values for redirect URL
$submissionData = $job->getProcessedData();
} else {
@@ -191,60 +194,89 @@ class PublicFormController extends Controller
}
/**
- * Processes submission identifiers to ensure consistent numeric format
+ * Processes submission identifiers to ensure consistent format
*
- * Takes a submission hash or string ID and converts it to a numeric submission_id.
- * This allows submissions to be identified by either a hashed value or direct ID
- * while ensuring consistent internal storage format.
+ * Handles both UUID (new format) and Hashid (legacy format) in submission_id field.
+ * For UUID: Looks up submission and converts to numeric ID if found
+ * For Hashid: Decodes to numeric ID
*
* @param Request $request
* @param array $submissionData
+ * @param Form $form
* @return array
*/
- private function processSubmissionIdentifiers(Request $request, array $submissionData): array
+ private function processSubmissionIdentifiers(Request $request, array $submissionData, Form $form): array
{
- // Handle submission hash if present (convert to numeric submission_id)
- $submissionHash = $request->get('submission_hash');
- if ($submissionHash) {
- $decodedHash = Hashids::decode($submissionHash);
- if (!empty($decodedHash)) {
- $submissionData['submission_id'] = (int)($decodedHash[0] ?? null);
+ $submissionIdentifier = $request->get('submission_hash')
+ ?? $request->get('submission_id')
+ ?? ($submissionData['submission_id'] ?? null);
+
+ if (!$submissionIdentifier) {
+ return $submissionData;
+ }
+
+ // Check if it's a UUID (new format)
+ if (Str::isUuid($submissionIdentifier)) {
+ $submission = $form->submissions()
+ ->where('public_id', $submissionIdentifier)
+ ->first();
+ if (!$submission) {
+ abort(404, 'Submission not found');
}
+ $submissionData['submission_id'] = $submission->id;
unset($submissionData['submission_hash']);
+ return $submissionData;
}
- // Handle string submission_id if present (convert to numeric)
- if (isset($submissionData['submission_id']) && is_string($submissionData['submission_id']) && !is_numeric($submissionData['submission_id'])) {
- $decodedId = Hashids::decode($submissionData['submission_id']);
- if (!empty($decodedId)) {
- $submissionData['submission_id'] = (int)($decodedId[0] ?? null);
- }
+ // Legacy Hashid support (backward compatibility)
+ $decodedId = Hashids::decode($submissionIdentifier);
+ if (!empty($decodedId)) {
+ $submissionData['submission_id'] = (int)($decodedId[0] ?? null);
}
+ unset($submissionData['submission_hash']);
return $submissionData;
}
public function fetchSubmission(Request $request, Form $form, string $submission_id)
{
- // Decode the submission ID using the same approach as in processSubmissionIdentifiers
- $decodedId = Hashids::decode($submission_id);
- $submissionId = !empty($decodedId) ? (int)($decodedId[0]) : false;
-
// Ensure form is public and allows editable submissions
if ($form->visibility !== 'public') {
abort(404);
}
- if ($form->workspace == null || !$form->editable_submissions || !$submissionId) {
- return $this->error([
- 'message' => 'Not allowed.',
- ]);
+ if ($form->workspace == null || !$form->editable_submissions) {
+ abort(403);
+ }
+
+ $submission = null;
+
+ // Try UUID lookup first (new format)
+ if (Str::isUuid($submission_id)) {
+ $submission = $form->submissions()
+ ->where('public_id', $submission_id)
+ ->first();
+ }
+
+ // Fallback to Hashid decode (backward compatibility - strict migration)
+ if (!$submission) {
+ $decodedId = Hashids::decode($submission_id);
+ $numericId = !empty($decodedId) ? (int)($decodedId[0]) : false;
+ if ($numericId) {
+ $submission = $form->submissions()->find($numericId);
+
+ // CRITICAL: If submission has UUID, return 404 (force UUID usage)
+ if ($submission && $submission->public_id) {
+ return $this->error([
+ 'message' => 'Submission not found.'
+ ], 404);
+ }
+ }
}
- $submission = $form->submissions()->find($submissionId);
if (!$submission) {
return $this->error([
'message' => 'Submission not found.',
- ]);
+ ], 404);
}
$submission->setRelation('form', $form);
diff --git a/api/app/Http/Resources/FormSubmissionResource.php b/api/app/Http/Resources/FormSubmissionResource.php
index 7e2e1e95a..031478722 100644
--- a/api/app/Http/Resources/FormSubmissionResource.php
+++ b/api/app/Http/Resources/FormSubmissionResource.php
@@ -4,8 +4,8 @@ namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\URL;
-use Vinkla\Hashids\Facades\Hashids;
use Stevebauman\Purify\Facades\Purify;
+use App\Service\Forms\SubmissionUrlService;
/**
* @property array $data
@@ -35,7 +35,7 @@ class FormSubmissionResource extends JsonResource
], ($this->publiclyAccessed) ? [] : [
'form_id' => $this->form_id,
'id' => $this->id,
- 'submission_id' => Hashids::encode($this->id),
+ 'submission_id' => SubmissionUrlService::getSubmissionIdentifier($this->resource),
]);
}
@@ -51,7 +51,7 @@ class FormSubmissionResource extends JsonResource
'status' => $this->status,
'created_at' => $this->created_at->toDateTimeString(),
'id' => $this->id,
- 'submission_id' => Hashids::encode($this->id)
+ 'submission_id' => SubmissionUrlService::getSubmissionIdentifier($this->resource)
];
if ($this->form->enable_ip_tracking && $this->form->is_pro && !empty($this->meta)) {
$extraData['ip_address'] = $this->meta['ip_address'] ?? null;
diff --git a/api/app/Integrations/Google/Google.php b/api/app/Integrations/Google/Google.php
index 6910a5bb3..7509db82f 100644
--- a/api/app/Integrations/Google/Google.php
+++ b/api/app/Integrations/Google/Google.php
@@ -36,14 +36,25 @@ class Google
public function refreshToken(): static
{
- $this->client->refreshToken($this->formIntegration->provider->refresh_token);
+ $provider = $this->formIntegration->provider;
+ if (!$provider?->refresh_token) {
+ return $this;
+ }
+
+ $this->client->refreshToken($provider->refresh_token);
$token = $this->client->getAccessToken();
+ if (!$token || !isset($token['access_token'])) {
+ return $this;
+ }
- $this->formIntegration->provider->update([
- 'access_token' => $token['access_token'],
- 'refresh_token' => $token['refresh_token'],
- ]);
+ $updateData = ['access_token' => $token['access_token']];
+
+ if (isset($token['refresh_token'])) {
+ $updateData['refresh_token'] = $token['refresh_token'];
+ }
+
+ $provider->update($updateData);
return $this;
}
diff --git a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php b/api/app/Integrations/Handlers/AbstractIntegrationHandler.php
index 429cda8b2..e1d330a95 100644
--- a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php
+++ b/api/app/Integrations/Handlers/AbstractIntegrationHandler.php
@@ -8,10 +8,10 @@ use App\Models\Forms\Form;
use App\Models\Integration\FormIntegrationsEvent;
use App\Service\Forms\FormSubmissionFormatter;
use App\Service\Forms\FormLogicConditionChecker;
+use App\Service\Forms\SubmissionUrlService;
use Illuminate\Http\Client\RequestException;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log;
-use Vinkla\Hashids\Facades\Hashids;
abstract class AbstractIntegrationHandler
{
@@ -142,7 +142,7 @@ abstract class AbstractIntegrationHandler
'message' => 'Please do not use the `submission` field. It is deprecated and will be removed in the future.'
];
if ($form->is_pro && $form->editable_submissions && isset($submissionData['submission_id'])) {
- $data['edit_link'] = $form->share_url . '?submission_id=' . Hashids::encode($submissionData['submission_id']);
+ $data['edit_link'] = SubmissionUrlService::buildEditUrl($form, $submissionData['submission_id']);
}
return $data;
diff --git a/api/app/Integrations/Handlers/DiscordIntegration.php b/api/app/Integrations/Handlers/DiscordIntegration.php
index a11cdab75..57bdb22f9 100644
--- a/api/app/Integrations/Handlers/DiscordIntegration.php
+++ b/api/app/Integrations/Handlers/DiscordIntegration.php
@@ -5,8 +5,8 @@ namespace App\Integrations\Handlers;
use App\Models\Forms\Form;
use App\Open\MentionParser;
use App\Service\Forms\FormSubmissionFormatter;
+use App\Service\Forms\SubmissionUrlService;
use Illuminate\Support\Arr;
-use Vinkla\Hashids\Facades\Hashids;
class DiscordIntegration extends AbstractIntegrationHandler
{
@@ -46,8 +46,8 @@ class DiscordIntegration extends AbstractIntegrationHandler
$externalLinks[] = '[**✍️ Edit Form**](' . $editFormURL . ')';
}
if (Arr::get($settings, 'link_edit_submission', true) && $this->form->editable_submissions) {
- $submissionId = Hashids::encode($this->submissionData['submission_id']);
- $externalLinks[] = '[**✍️ ' . $this->form->editable_submissions_button_text . '**](' . $this->form->share_url . '?submission_id=' . $submissionId . ')';
+ $editUrl = SubmissionUrlService::buildEditUrl($this->form, $this->submissionData['submission_id']);
+ $externalLinks[] = '[**✍️ ' . $this->form->editable_submissions_button_text . '**](' . $editUrl . ')';
}
$color = hexdec(str_replace('#', '', $this->form->color));
diff --git a/api/app/Integrations/Handlers/SlackIntegration.php b/api/app/Integrations/Handlers/SlackIntegration.php
index 378ed96d0..259d75e3f 100644
--- a/api/app/Integrations/Handlers/SlackIntegration.php
+++ b/api/app/Integrations/Handlers/SlackIntegration.php
@@ -5,8 +5,8 @@ namespace App\Integrations\Handlers;
use App\Models\Forms\Form;
use App\Open\MentionParser;
use App\Service\Forms\FormSubmissionFormatter;
+use App\Service\Forms\SubmissionUrlService;
use Illuminate\Support\Arr;
-use Vinkla\Hashids\Facades\Hashids;
class SlackIntegration extends AbstractIntegrationHandler
{
@@ -46,8 +46,8 @@ class SlackIntegration extends AbstractIntegrationHandler
$externalLinks[] = '*<' . $editFormURL . '|✍️ Edit Form>*';
}
if (Arr::get($settings, 'link_edit_submission', true) && $this->form->editable_submissions) {
- $submissionId = Hashids::encode($this->submissionData['submission_id']);
- $externalLinks[] = '*<' . $this->form->share_url . '?submission_id=' . $submissionId . '|✍️ ' . $this->form->editable_submissions_button_text . '>*';
+ $editUrl = SubmissionUrlService::buildEditUrl($this->form, $this->submissionData['submission_id']);
+ $externalLinks[] = '*<' . $editUrl . '|✍️ ' . $this->form->editable_submissions_button_text . '>*';
}
$formattedData = (new FormSubmissionFormatter($this->form, $this->submissionData))->outputStringsOnly()->showHiddenFields()->getFieldsWithValue();
diff --git a/api/app/Integrations/Handlers/TelegramIntegration.php b/api/app/Integrations/Handlers/TelegramIntegration.php
index ed9d7ff18..3ea4b3b4a 100644
--- a/api/app/Integrations/Handlers/TelegramIntegration.php
+++ b/api/app/Integrations/Handlers/TelegramIntegration.php
@@ -5,9 +5,9 @@ namespace App\Integrations\Handlers;
use App\Models\Forms\Form;
use App\Open\MentionParser;
use App\Service\Forms\FormSubmissionFormatter;
+use App\Service\Forms\SubmissionUrlService;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Arr;
-use Vinkla\Hashids\Facades\Hashids;
class TelegramIntegration extends AbstractIntegrationHandler
{
@@ -86,9 +86,9 @@ class TelegramIntegration extends AbstractIntegrationHandler
$links[] = "[✍️ Edit Form](" . $url . ")";
}
if (Arr::get($settings, 'link_edit_submission', true) && $this->form->editable_submissions) {
- $submissionId = Hashids::encode($this->submissionData['submission_id']);
+ $editUrl = SubmissionUrlService::buildEditUrl($this->form, $this->submissionData['submission_id']);
$buttonText = $this->escapeMarkdownV2($this->form->editable_submissions_button_text);
- $url = $this->escapeMarkdownV2($this->form->share_url . "?submission_id=" . $submissionId);
+ $url = $this->escapeMarkdownV2($editUrl);
$links[] = "[✍️ " . $buttonText . "](" . $url . ")";
}
if (count($links) > 0) {
diff --git a/api/app/Jobs/Form/StoreFormSubmissionJob.php b/api/app/Jobs/Form/StoreFormSubmissionJob.php
index 4eca016f6..831bccfd0 100644
--- a/api/app/Jobs/Form/StoreFormSubmissionJob.php
+++ b/api/app/Jobs/Form/StoreFormSubmissionJob.php
@@ -197,6 +197,11 @@ class StoreFormSubmissionJob implements ShouldQueue
$submission->status = FormSubmission::STATUS_COMPLETED;
}
+ // Generate a new UUID for new submissions
+ if (!$this->submissionId) {
+ $submission->public_id = \Illuminate\Support\Str::uuid()->toString();
+ }
+
// Store IP address in meta if IP tracking is enabled
if ($this->form->enable_ip_tracking && $this->form->is_pro && $this->submitterIp) {
$existingMeta = $submission->meta ?? [];
diff --git a/api/app/Models/Forms/FormSubmission.php b/api/app/Models/Forms/FormSubmission.php
index 7814546fa..910fbb6ef 100644
--- a/api/app/Models/Forms/FormSubmission.php
+++ b/api/app/Models/Forms/FormSubmission.php
@@ -17,7 +17,8 @@ class FormSubmission extends Model
'data',
'completion_time',
'status',
- 'meta'
+ 'meta',
+ 'public_id'
];
protected function casts(): array
@@ -26,6 +27,7 @@ class FormSubmission extends Model
'data' => 'array',
'completion_time' => 'integer',
'meta' => 'array',
+ 'public_id' => 'string',
];
}
diff --git a/api/app/Notifications/Forms/FormEmailNotification.php b/api/app/Notifications/Forms/FormEmailNotification.php
index fd641a15a..89835fe8a 100644
--- a/api/app/Notifications/Forms/FormEmailNotification.php
+++ b/api/app/Notifications/Forms/FormEmailNotification.php
@@ -5,10 +5,10 @@ namespace App\Notifications\Forms;
use App\Events\Forms\FormSubmitted;
use App\Open\MentionParser;
use App\Service\Forms\FormSubmissionFormatter;
+use App\Service\Forms\SubmissionUrlService;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Str;
-use Vinkla\Hashids\Facades\Hashids;
use Symfony\Component\Mime\Email;
class FormEmailNotification extends Notification
@@ -204,7 +204,11 @@ class FormEmailNotification extends Notification
private function getEncodedSubmissionId(): ?string
{
$submissionId = $this->event->data['submission_id'] ?? null;
- return $submissionId ? Hashids::encode($submissionId) : null;
+ if (!$submissionId) {
+ return null;
+ }
+
+ return SubmissionUrlService::getSubmissionIdentifierById($this->event->form, $submissionId);
}
public static function validateEmail($email): bool
diff --git a/api/app/Service/Forms/SubmissionUrlService.php b/api/app/Service/Forms/SubmissionUrlService.php
new file mode 100644
index 000000000..49427d183
--- /dev/null
+++ b/api/app/Service/Forms/SubmissionUrlService.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Service\Forms;
+
+use App\Models\Forms\Form;
+use App\Models\Forms\FormSubmission;
+use Vinkla\Hashids\Facades\Hashids;
+
+class SubmissionUrlService
+{
+ /**
+ * Get the submission identifier (UUID or Hashid) for a submission.
+ * Returns UUID if available, otherwise falls back to Hashid.
+ *
+ * @param FormSubmission $submission
+ * @return string
+ */
+ public static function getSubmissionIdentifier(FormSubmission $submission): string
+ {
+ return $submission->public_id ?? Hashids::encode($submission->id);
+ }
+
+ /**
+ * Get the submission identifier by submission ID.
+ * Fetches the submission and returns UUID if available, otherwise Hashid.
+ *
+ * @param Form $form
+ * @param int $submissionId
+ * @return string
+ */
+ public static function getSubmissionIdentifierById(Form $form, int $submissionId): string
+ {
+ $submission = $form->submissions()->find($submissionId);
+
+ if (!$submission) {
+ // Fallback to Hashid if submission not found (shouldn't happen in normal flow)
+ return Hashids::encode($submissionId);
+ }
+
+ return self::getSubmissionIdentifier($submission);
+ }
+
+ /**
+ * Build the edit URL for a submission.
+ *
+ * @param Form $form
+ * @param FormSubmission|int $submission Submission instance or submission ID
+ * @return string
+ */
+ public static function buildEditUrl(Form $form, FormSubmission|int $submission): string
+ {
+ $identifier = $submission instanceof FormSubmission
+ ? self::getSubmissionIdentifier($submission)
+ : self::getSubmissionIdentifierById($form, $submission);
+
+ return $form->share_url . '?submission_id=' . $identifier;
+ }
+}
diff --git a/api/database/migrations/2025_11_27_094735_add_public_id_to_form_submissions_table.php b/api/database/migrations/2025_11_27_094735_add_public_id_to_form_submissions_table.php
new file mode 100644
index 000000000..85b13c252
--- /dev/null
+++ b/api/database/migrations/2025_11_27_094735_add_public_id_to_form_submissions_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+ /**
+ * Run the migrations.
+ */
+ public function up(): void
+ {
+ Schema::table('form_submissions', function (Blueprint $table) {
+ $table->uuid('public_id')->nullable()->unique()->after('id');
+ $table->index('public_id');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('form_submissions', function (Blueprint $table) {
+ $table->dropIndex(['public_id']);
+ $table->dropColumn('public_id');
+ });
+ }
+};
diff --git a/api/tests/Feature/Forms/SubmissionIdentifierTest.php b/api/tests/Feature/Forms/SubmissionIdentifierTest.php
new file mode 100644
index 000000000..a960df8d0
--- /dev/null
+++ b/api/tests/Feature/Forms/SubmissionIdentifierTest.php
@@ -0,0 +1,210 @@
+<?php
+
+use App\Models\Forms\FormSubmission;
+use Illuminate\Support\Str;
+use Vinkla\Hashids\Facades\Hashids;
+
+describe('Submission UUID Identifiers', function () {
+ beforeEach(function () {
+ $this->user = $this->actingAsProUser();
+ $this->workspace = $this->createUserWorkspace($this->user);
+ $this->form = $this->createForm($this->user, $this->workspace, [
+ 'editable_submissions' => true,
+ ]);
+ });
+
+ it('generates UUID for new submissions', function () {
+ $submissionData = $this->generateFormSubmissionData($this->form);
+
+ $response = $this->postJson(route('forms.answer', $this->form), $submissionData)
+ ->assertSuccessful();
+
+ $submissionId = $response->json('submission_id');
+ expect($submissionId)->not->toBeNull();
+ expect(Str::isUuid($submissionId))->toBeTrue();
+
+ // Verify UUID is stored in database
+ $submission = $this->form->submissions()->first();
+ expect($submission->public_id)->not->toBeNull();
+ expect(Str::isUuid($submission->public_id))->toBeTrue();
+ expect($submission->public_id)->toBe($submissionId);
+ });
+
+ it('fetches submission using UUID', function () {
+ // Create a submission
+ $submissionData = $this->generateFormSubmissionData($this->form);
+ $response = $this->postJson(route('forms.answer', $this->form), $submissionData)
+ ->assertSuccessful();
+
+ $uuid = $response->json('submission_id');
+
+ // Fetch using UUID
+ $this->actingAsGuest();
+ $fetchResponse = $this->getJson(route('forms.fetchSubmission', [
+ 'form' => $this->form->slug,
+ 'submission_id' => $uuid,
+ ]))->assertSuccessful();
+
+ // Verify response contains submission data (submission_id is hidden in public access)
+ expect($fetchResponse->json('data'))->not->toBeNull();
+ });
+
+ it('returns 404 for invalid UUID', function () {
+ $invalidUuid = Str::uuid()->toString();
+
+ $this->actingAsGuest();
+ $this->getJson(route('forms.fetchSubmission', [
+ 'form' => $this->form->slug,
+ 'submission_id' => $invalidUuid,
+ ]))->assertStatus(404);
+ });
+
+ it('returns 404 when editing submission with invalid UUID', function () {
+ $invalidUuid = Str::uuid()->toString();
+
+ $submissionData = $this->generateFormSubmissionData($this->form);
+ $submissionData['submission_id'] = $invalidUuid;
+
+ $this->actingAsGuest();
+ $this->postJson(route('forms.answer', $this->form), $submissionData)
+ ->assertStatus(404);
+ });
+
+ it('allows editing submission using UUID', function () {
+ // Create initial submission
+ $initialData = $this->generateFormSubmissionData($this->form);
+ $response = $this->postJson(route('forms.answer', $this->form), $initialData)
+ ->assertSuccessful();
+
+ $uuid = $response->json('submission_id');
+
+ // Edit using UUID
+ $editData = $this->generateFormSubmissionData($this->form);
+ $editData['submission_id'] = $uuid;
+
+ $this->postJson(route('forms.answer', $this->form), $editData)
+ ->assertSuccessful();
+
+ // Verify only one submission exists (was updated, not created new)
+ expect($this->form->submissions()->count())->toBe(1);
+ });
+});
+
+describe('Legacy Hashid Backward Compatibility', function () {
+ beforeEach(function () {
+ $this->user = $this->actingAsProUser();
+ $this->workspace = $this->createUserWorkspace($this->user);
+ $this->form = $this->createForm($this->user, $this->workspace, [
+ 'editable_submissions' => true,
+ ]);
+ });
+
+ it('allows fetching legacy submission without UUID using hashid', function () {
+ // Create a legacy submission (without UUID)
+ $submission = new FormSubmission();
+ $submission->form_id = $this->form->id;
+ $submission->data = ['test' => 'data'];
+ $submission->public_id = null; // Legacy submission
+ $submission->save();
+
+ $hashid = Hashids::encode($submission->id);
+
+ $this->actingAsGuest();
+ $this->getJson(route('forms.fetchSubmission', [
+ 'form' => $this->form->slug,
+ 'submission_id' => $hashid,
+ ]))->assertSuccessful();
+ });
+
+ it('rejects hashid access when submission has UUID', function () {
+ // Create a submission with UUID
+ $submission = new FormSubmission();
+ $submission->form_id = $this->form->id;
+ $submission->data = ['test' => 'data'];
+ $submission->public_id = Str::uuid()->toString();
+ $submission->save();
+
+ $hashid = Hashids::encode($submission->id);
+
+ $this->actingAsGuest();
+ $this->getJson(route('forms.fetchSubmission', [
+ 'form' => $this->form->slug,
+ 'submission_id' => $hashid,
+ ]))->assertStatus(404);
+ });
+
+ it('returns 404 for invalid hashid', function () {
+ $this->actingAsGuest();
+ $this->getJson(route('forms.fetchSubmission', [
+ 'form' => $this->form->slug,
+ 'submission_id' => 'invalid-hashid-xyz',
+ ]))->assertStatus(404);
+ });
+});
+
+describe('Submission Fetch Authorization', function () {
+ it('returns 404 for non-public forms', function () {
+ $user = $this->actingAsProUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace, [
+ 'editable_submissions' => true,
+ 'visibility' => 'private',
+ ]);
+
+ $submission = new FormSubmission();
+ $submission->form_id = $form->id;
+ $submission->data = ['test' => 'data'];
+ $submission->public_id = Str::uuid()->toString();
+ $submission->save();
+
+ $this->actingAsGuest();
+ $this->getJson(route('forms.fetchSubmission', [
+ 'form' => $form->slug,
+ 'submission_id' => $submission->public_id,
+ ]))->assertStatus(404);
+ });
+
+ it('returns 403 when editable submissions disabled', function () {
+ $user = $this->actingAsProUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace, [
+ 'editable_submissions' => false,
+ ]);
+
+ $submission = new FormSubmission();
+ $submission->form_id = $form->id;
+ $submission->data = ['test' => 'data'];
+ $submission->public_id = Str::uuid()->toString();
+ $submission->save();
+
+ $this->actingAsGuest();
+ $this->getJson(route('forms.fetchSubmission', [
+ 'form' => $form->slug,
+ 'submission_id' => $submission->public_id,
+ ]))->assertStatus(403);
+ });
+});
+
+describe('Partial Submissions with UUID', function () {
+ it('generates UUID for partial submissions', function () {
+ $user = $this->actingAsProUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace, [
+ 'enable_partial_submissions' => true,
+ ]);
+
+ $submissionData = $this->generateFormSubmissionData($form);
+ $submissionData['is_partial'] = true;
+
+ $response = $this->postJson(route('forms.answer', $form), $submissionData)
+ ->assertSuccessful();
+
+ $submissionHash = $response->json('submission_hash');
+ expect($submissionHash)->not->toBeNull();
+ expect(Str::isUuid($submissionHash))->toBeTrue();
+
+ // Verify UUID is stored
+ $submission = $form->submissions()->first();
+ expect($submission->public_id)->toBe($submissionHash);
+ });
+});
diff --git a/client/components/forms/components/FormSubmissionFormatter.js b/client/components/forms/components/FormSubmissionFormatter.js
index ea7cab15e..65dcb5203 100644
--- a/client/components/forms/components/FormSubmissionFormatter.js
+++ b/client/components/forms/components/FormSubmissionFormatter.js
@@ -58,7 +58,7 @@ export class FormSubmissionFormatter {
case 'people':
return this.formatPeopleValue(value)
case 'multi_select':
- return this.outputStringsOnly ? value.join(', ') : value
+ return this.outputStringsOnly && Array.isArray(value) ? value.join(', ') : value
case 'relation':
return this.formatRelationValue(value)
default:
diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue
index 3c05a7eef..aed7e7652 100644
--- a/client/components/open/forms/OpenCompleteForm.vue
+++ b/client/components/open/forms/OpenCompleteForm.vue
@@ -153,6 +153,7 @@ const workingFormStore = useWorkingFormStore()
const { data: user } = useAuth().user()
const passwordForm = useForm({ password: null })
// Removed unused hidePasswordDisabledMsg (was always false and unused)
+// submission_id can be UUID (new secure format) or Hashid (legacy format)
const submissionId = ref(route.query.submission_id || null)
const submittedData = ref(null)
const showFirstSubmissionModal = ref(false)
diff --git a/client/lib/forms/composables/useFormInitialization.js b/client/lib/forms/composables/useFormInitialization.js
index 87cd27b8f..a537ce822 100644
--- a/client/lib/forms/composables/useFormInitialization.js
+++ b/client/lib/forms/composables/useFormInitialization.js
@@ -1,6 +1,7 @@
import { toValue } from 'vue'
import { formsApi } from '~/api'
import clonedeep from 'clone-deep'
+import { createError } from '#app'
/**
* @fileoverview Composable for initializing form data, with complete handling of
@@ -32,8 +33,16 @@ export function useFormInitialization(formConfig, form, pendingSubmission) {
// 2. Try loading from submission ID
if (options.submissionId) {
- const loaded = await tryLoadFromSubmissionId(options.submissionId)
- if (loaded) return // Exit if loaded successfully
+ try {
+ const loaded = await tryLoadFromSubmissionId(options.submissionId)
+ if (loaded) return // Exit if loaded successfully
+ } catch (error) {
+ // If 404 error, re-throw to show 404 page
+ if (error?.statusCode === 404) {
+ throw error
+ }
+ // For other errors, continue with form initialization
+ }
}
// 3. Try loading from pendingSubmission
@@ -200,7 +209,8 @@ export function useFormInitialization(formConfig, form, pendingSubmission) {
/**
* Attempts to load form data from an existing submission.
- * @param {String} submissionId - ID of the submission to load
+ * Supports both UUID (new format) and Hashid (legacy format) identifiers.
+ * @param {String} submissionId - UUID or Hashid of the submission to load
* @returns {Promise<Boolean>} - Whether loading was successful
*/
const tryLoadFromSubmissionId = async (submissionId) => {
@@ -225,15 +235,25 @@ export function useFormInitialization(formConfig, form, pendingSubmission) {
})
return true
} else {
- console.warn(`Submission ${submissionIdValue} for form ${slug} loaded but returned no data.`)
- form.reset()
- return false
+ // No data returned - throw 404 error to show 404 page instead of rendering form
+ throw createError({
+ statusCode: 404,
+ statusMessage: 'Submission not found'
+ })
}
})
.catch(error => {
- console.error(`Error loading submission ${submissionIdValue} for form ${slug}:`, error)
- form.reset()
- return false
+ // Handle 404 errors - throw to show 404 page instead of rendering form
+ if (error?.response?.status === 404 || error?.statusCode === 404) {
+ throw createError({
+ statusCode: 404,
+ statusMessage: 'Submission not found'
+ })
+ } else {
+ console.error(`Error loading submission ${submissionIdValue} for form ${slug}:`, error)
+ form.reset()
+ return false
+ }
})
}
diff --git a/client/lib/forms/composables/useFormSubmission.js b/client/lib/forms/composables/useFormSubmission.js
index f5576b4c9..8d669ed1a 100644
--- a/client/lib/forms/composables/useFormSubmission.js
+++ b/client/lib/forms/composables/useFormSubmission.js
@@ -30,6 +30,7 @@ export function useFormSubmission(formConfig, form) {
}
// Add submission ID if provided (for editable submissions)
+ // Supports both UUID (new secure format) and Hashid (legacy format)
if (options.submissionId) {
metadata.submission_id = options.submissionId
}
@@ -44,7 +45,7 @@ export function useFormSubmission(formConfig, form) {
* @param {Number} [options.completionTime] - Form completion time in seconds.
* @param {String} [options.captchaToken] - Captcha verification token.
* @param {String} [options.submissionHash] - Hash for partial submissions.
- * @param {String} [options.submissionId] - ID for editable submissions.
+ * @param {String} [options.submissionId] - UUID or Hashid for editable submissions.
* @returns {Promise<Object>} The response data from the submission endpoint.
* @throws {Error} If submission fails.
*/