Skip to content

fix: Restrict past dates for file token expiry #2539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 13, 2025
Merged

fix: Restrict past dates for file token expiry #2539

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebc271e
fix: Restrict past dates for file token expiry
hmacr Nov 3, 2025
fa714ae
tiny
hmacr Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/lib/components/expirationInput.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</script>

<script lang="ts">
import { InputDateTime, InputSelect } from '$lib/elements/forms';
import { isSameDay, isValidDate, toLocaleDate } from '$lib/helpers/date';
import { InputDate, InputSelect } from '$lib/elements/forms';
import { isSameDay, isValidDate, toLocaleDate, toLocaleDateISO } from '$lib/helpers/date';

function incrementToday(value: number, type: 'day' | 'month' | 'year'): string {
const date = new Date();
Expand Down Expand Up @@ -74,6 +74,10 @@
export let resourceType: string | 'key' | 'token' | undefined = 'key';
export let expiryOptions: 'default' | 'limited' | ExpirationOptions[] = 'default';

const tomorrow = new Date();
tomorrow.setDate(tomorrow.getDate() + 1);
let minDate: string = toLocaleDateISO(tomorrow.getTime());

const options = Array.isArray(expiryOptions)
? expiryOptions
: expiryOptions === 'default'
Expand Down Expand Up @@ -129,6 +133,8 @@
if (hasUserInteracted && !isSameDay(new Date(expirationSelect), new Date(value))) {
value = expirationSelect === 'custom' ? expirationCustom : expirationSelect;
}

value = toLocaleDateISO(new Date(value).getTime());
}

$: helper =
Expand All @@ -147,11 +153,11 @@
on:change={() => (hasUserInteracted = true)} />

{#if expirationSelect === 'custom'}
<InputDateTime
<InputDate
required
type="date"
id="expire"
min={minDate}
label={dateSelectorLabel}
bind:value={expirationCustom}
on:change={() => (hasUserInteracted = true)} />
on:input={() => (hasUserInteracted = true)} />
{/if}