feat: add ability to define expiration of one time link

This commit is contained in:
Elias Schneider
2024-10-31 17:22:58 +01:00
parent 590cb02f6c
commit 2ccabf835c
4 changed files with 79 additions and 29 deletions

View File

@@ -42,10 +42,10 @@ export default class UserService extends APIService {
await this.api.delete(`/users/${id}`); await this.api.delete(`/users/${id}`);
} }
async createOneTimeAccessToken(userId: string) { async createOneTimeAccessToken(userId: string, expiresAt: Date) {
const res = await this.api.post(`/users/${userId}/one-time-access-token`, { const res = await this.api.post(`/users/${userId}/one-time-access-token`, {
userId, userId,
expiresAt: new Date(Date.now() + 1000 * 60 * 5).toISOString() expiresAt
}); });
return res.data.token; return res.data.token;
} }

View File

@@ -1,22 +1,51 @@
<script lang="ts"> <script lang="ts">
import { page } from '$app/stores';
import { Button } from '$lib/components/ui/button';
import * as Dialog from '$lib/components/ui/dialog'; import * as Dialog from '$lib/components/ui/dialog';
import Input from '$lib/components/ui/input/input.svelte'; import Input from '$lib/components/ui/input/input.svelte';
import Label from '$lib/components/ui/label/label.svelte'; import Label from '$lib/components/ui/label/label.svelte';
import * as Select from '$lib/components/ui/select/index.js';
import UserService from '$lib/services/user-service';
import { axiosErrorToast } from '$lib/utils/error-util';
let { let {
oneTimeLink = $bindable() userId = $bindable()
}: { }: {
oneTimeLink: string | null; userId: string | null;
} = $props(); } = $props();
const userService = new UserService();
let oneTimeLink: string | null = $state(null);
let selectedExpiration: keyof typeof availableExpirations = $state('1 hour');
let availableExpirations = {
'1 hour': 60 * 60,
'12 hours': 60 * 60 * 12,
'1 day': 60 * 60 * 24,
'1 week': 60 * 60 * 24 * 7,
'1 month': 60 * 60 * 24 * 30
};
async function createOneTimeAccessToken() {
try {
const expiration = new Date(Date.now() + availableExpirations[selectedExpiration] * 1000);
const token = await userService.createOneTimeAccessToken(userId!, expiration);
oneTimeLink = `${$page.url.origin}/login/${token}`;
} catch (e) {
axiosErrorToast(e);
}
}
function onOpenChange(open: boolean) { function onOpenChange(open: boolean) {
if (!open) { if (!open) {
oneTimeLink = null; oneTimeLink = null;
userId = null;
} }
} }
</script> </script>
<Dialog.Root open={!!oneTimeLink} {onOpenChange}> <Dialog.Root open={!!userId} {onOpenChange}>
<Dialog.Content class="max-w-md"> <Dialog.Content class="max-w-md">
<Dialog.Header> <Dialog.Header>
<Dialog.Title>One Time Link</Dialog.Title> <Dialog.Title>One Time Link</Dialog.Title>
@@ -25,9 +54,36 @@
have lost it.</Dialog.Description have lost it.</Dialog.Description
> >
</Dialog.Header> </Dialog.Header>
<div> {#if oneTimeLink === null}
<Label for="one-time-link">One Time Link</Label> <div>
<Label for="expiration">Expiration</Label>
<Select.Root
selected={{
label: Object.keys(availableExpirations)[0],
value: Object.keys(availableExpirations)[0]
}}
onSelectedChange={(v) =>
(selectedExpiration = v!.value as keyof typeof availableExpirations)}
>
<Select.Trigger class="h-9 ">
<Select.Value>{selectedExpiration}</Select.Value>
</Select.Trigger>
<Select.Content>
{#each Object.keys(availableExpirations) as key}
<Select.Item value={key}>{key}</Select.Item>
{/each}
</Select.Content>
</Select.Root>
</div>
<Button
onclick={() => createOneTimeAccessToken()}
disabled={!selectedExpiration}
>
Generate Link
</Button>
{:else}
<Label for="one-time-link" class="sr-only">One Time Link</Label>
<Input id="one-time-link" value={oneTimeLink} readonly /> <Input id="one-time-link" value={oneTimeLink} readonly />
</div> {/if}
</Dialog.Content> </Dialog.Content>
</Dialog.Root> </Dialog.Root>

View File

@@ -1,9 +1,9 @@
<script lang="ts"> <script lang="ts">
import { page } from '$app/stores'; import { goto } from '$app/navigation';
import AdvancedTable from '$lib/components/advanced-table.svelte'; import AdvancedTable from '$lib/components/advanced-table.svelte';
import { openConfirmDialog } from '$lib/components/confirm-dialog/'; import { openConfirmDialog } from '$lib/components/confirm-dialog/';
import { Badge } from '$lib/components/ui/badge/index'; import { Badge } from '$lib/components/ui/badge/index';
import { Button } from '$lib/components/ui/button'; import { buttonVariants } from '$lib/components/ui/button';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu'; import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
import * as Table from '$lib/components/ui/table'; import * as Table from '$lib/components/ui/table';
import UserService from '$lib/services/user-service'; import UserService from '$lib/services/user-service';
@@ -21,7 +21,7 @@
users = initialUsers; users = initialUsers;
}); });
let oneTimeLink = $state<string | null>(null); let userIdToCreateOneTimeLink: string | null = $state(null);;
const userService = new UserService(); const userService = new UserService();
@@ -48,15 +48,6 @@
} }
}); });
} }
async function createOneTimeAccessToken(userId: string) {
try {
const token = await userService.createOneTimeAccessToken(userId);
oneTimeLink = `${$page.url.origin}/login/${token}`;
} catch (e) {
axiosErrorToast(e);
}
}
</script> </script>
<AdvancedTable <AdvancedTable
@@ -82,22 +73,20 @@
</Table.Cell> </Table.Cell>
<Table.Cell> <Table.Cell>
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger asChild let:builder> <DropdownMenu.Trigger class={buttonVariants({ variant: 'ghost', size: 'icon' })}>
<Button aria-haspopup="true" size="icon" variant="ghost" builders={[builder]}> <Ellipsis class="h-4 w-4" />
<Ellipsis class="h-4 w-4" /> <span class="sr-only">Toggle menu</span>
<span class="sr-only">Toggle menu</span>
</Button>
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content align="end"> <DropdownMenu.Content align="end">
<DropdownMenu.Item on:click={() => createOneTimeAccessToken(item.id)} <DropdownMenu.Item onclick={() => (userIdToCreateOneTimeLink = item.id)}
><LucideLink class="mr-2 h-4 w-4" />One-time link</DropdownMenu.Item ><LucideLink class="mr-2 h-4 w-4" />One-time link</DropdownMenu.Item
> >
<DropdownMenu.Item href="/settings/admin/users/{item.id}" <DropdownMenu.Item onclick={() => goto(`/settings/admin/users/${item.id}`)}
><LucidePencil class="mr-2 h-4 w-4" /> Edit</DropdownMenu.Item ><LucidePencil class="mr-2 h-4 w-4" /> Edit</DropdownMenu.Item
> >
<DropdownMenu.Item <DropdownMenu.Item
class="text-red-500 focus:!text-red-700" class="text-red-500 focus:!text-red-700"
on:click={() => deleteUser(item)} onclick={() => deleteUser(item)}
><LucideTrash class="mr-2 h-4 w-4" />Delete</DropdownMenu.Item ><LucideTrash class="mr-2 h-4 w-4" />Delete</DropdownMenu.Item
> >
</DropdownMenu.Content> </DropdownMenu.Content>
@@ -106,4 +95,4 @@
{/snippet} {/snippet}
</AdvancedTable> </AdvancedTable>
<OneTimeLinkModal {oneTimeLink} /> <OneTimeLinkModal userId={userIdToCreateOneTimeLink} />

View File

@@ -57,8 +57,13 @@ test('Create one time access token', async ({ page }) => {
.getByRole('row', { name: `${users.craig.firstname} ${users.craig.lastname}` }) .getByRole('row', { name: `${users.craig.firstname} ${users.craig.lastname}` })
.getByRole('button') .getByRole('button')
.click(); .click();
await page.getByRole('menuitem', { name: 'One-time link' }).click(); await page.getByRole('menuitem', { name: 'One-time link' }).click();
await page.getByLabel('One Time Link').getByRole('combobox').click();
await page.getByRole('option', { name: '12 hours' }).click();
await page.getByRole('button', { name: 'Generate Link' }).click();
await expect(page.getByRole('textbox', { name: 'One Time Link' })).toHaveValue( await expect(page.getByRole('textbox', { name: 'One Time Link' })).toHaveValue(
/http:\/\/localhost\/login\/.*/ /http:\/\/localhost\/login\/.*/
); );