mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-06-15 05:22:44 +01:00
Compare commits
2 Commits
4432174439
...
c8623b7e70
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c8623b7e70 | ||
|
|
3b1702221b |
@@ -8,20 +8,22 @@ import {
|
||||
import { getCurrentUserViaApi } from './utils/api';
|
||||
import { registerUser } from './utils/members';
|
||||
import type { Page } from '@playwright/test';
|
||||
import path from 'path';
|
||||
|
||||
async function goToProfilePage(page: Page) {
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
|
||||
}
|
||||
|
||||
function profileInformationForm(page: Page) {
|
||||
return page
|
||||
.getByRole('heading', { name: 'Profile Information', exact: true })
|
||||
.locator('xpath=ancestor::*[descendant::form][1]');
|
||||
}
|
||||
|
||||
async function saveProfileForm(page: Page): Promise<void> {
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(resp) =>
|
||||
resp.url().includes('/user/profile-information') &&
|
||||
resp.request().method() === 'POST'
|
||||
),
|
||||
page.getByRole('button', { name: 'Save' }).first().click(),
|
||||
]);
|
||||
const form = profileInformationForm(page);
|
||||
await form.getByRole('button', { name: 'Save' }).click();
|
||||
await expect(form.getByText('Saved.', { exact: true })).toBeVisible();
|
||||
}
|
||||
|
||||
test('user name can be updated', async ({ page }) => {
|
||||
@@ -48,6 +50,64 @@ test('week-start change persists across reload', async ({ page }) => {
|
||||
await expect(page.getByLabel('Start of the week')).toHaveValue('sunday');
|
||||
});
|
||||
|
||||
test('profile photo can be uploaded, persists across reload, and can be removed', async ({
|
||||
page,
|
||||
}) => {
|
||||
await goToProfilePage(page);
|
||||
const form = profileInformationForm(page);
|
||||
const profilePhoto = form.getByRole('img', { name: 'John Doe' });
|
||||
|
||||
await expect(profilePhoto).toBeVisible();
|
||||
await expect(profilePhoto).toHaveAttribute('src', /ui-avatars\.com/);
|
||||
await expect(form.getByRole('button', { name: 'Remove Photo' })).toBeHidden();
|
||||
|
||||
await form.locator('#photo').setInputFiles(path.resolve('resources/testfiles/test.png'));
|
||||
await saveProfileForm(page);
|
||||
await expect(profilePhoto).toHaveAttribute('src', /profile-photos/);
|
||||
await expect(form.getByRole('button', { name: 'Remove Photo' })).toBeVisible();
|
||||
|
||||
await page.reload();
|
||||
const reloadedForm = profileInformationForm(page);
|
||||
const reloadedProfilePhoto = reloadedForm.getByRole('img', { name: 'John Doe' });
|
||||
await expect(reloadedProfilePhoto).toHaveAttribute('src', /profile-photos/);
|
||||
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(response) =>
|
||||
response.url().includes('/api/v1/users/') &&
|
||||
response.request().method() === 'PUT' &&
|
||||
response.status() === 200
|
||||
),
|
||||
reloadedForm.getByRole('button', { name: 'Remove Photo' }).click(),
|
||||
]);
|
||||
await expect(reloadedProfilePhoto).toHaveAttribute('src', /ui-avatars\.com/);
|
||||
|
||||
await page.reload();
|
||||
const finalForm = profileInformationForm(page);
|
||||
await expect(finalForm.getByRole('img', { name: 'John Doe' })).toHaveAttribute(
|
||||
'src',
|
||||
/ui-avatars\.com/
|
||||
);
|
||||
});
|
||||
|
||||
test('field-level validation errors render inline when the server returns 422', async ({
|
||||
page,
|
||||
}) => {
|
||||
await goToProfilePage(page);
|
||||
const form = profileInformationForm(page);
|
||||
await form.getByLabel('Name').fill('a'.repeat(256));
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(response) =>
|
||||
response.url().includes('/api/v1/users/') &&
|
||||
response.request().method() === 'PUT' &&
|
||||
response.status() === 422
|
||||
),
|
||||
form.getByRole('button', { name: 'Save' }).click(),
|
||||
]);
|
||||
await expect(form.getByRole('alert').filter({ hasText: /255 characters/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test('submitting a new email keeps the current email displayed after reload', async ({
|
||||
page,
|
||||
ctx,
|
||||
@@ -111,6 +171,59 @@ test('re-submitting the current email does not send a verification email', async
|
||||
expect(afterCount).toBe(beforeCount);
|
||||
});
|
||||
|
||||
test('after submitting a new email the pending-email banner is shown with a resend button', async ({
|
||||
page,
|
||||
}) => {
|
||||
await goToProfilePage(page);
|
||||
const newEmail = `pending+${Date.now()}@test.com`;
|
||||
await page.getByLabel('Email').fill(newEmail);
|
||||
await saveProfileForm(page);
|
||||
|
||||
await expect(page.getByText(`A verification link was sent to`)).toBeVisible();
|
||||
await expect(page.getByText(newEmail)).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: 'Resend verification email' })).toBeVisible();
|
||||
});
|
||||
|
||||
test('clicking resend sends a second verification email and shows confirmation', async ({
|
||||
page,
|
||||
request,
|
||||
}) => {
|
||||
await goToProfilePage(page);
|
||||
const newEmail = `resend+${Date.now()}@test.com`;
|
||||
await page.getByLabel('Email').fill(newEmail);
|
||||
await saveProfileForm(page);
|
||||
|
||||
const beforeCount = await waitForEmailCount(request, newEmail, 'Verify Email Address', 1);
|
||||
await page.getByRole('button', { name: 'Resend verification email' }).click();
|
||||
|
||||
await expect(page.getByText('Verification email sent.')).toBeVisible();
|
||||
const afterCount = await waitForEmailCount(
|
||||
request,
|
||||
newEmail,
|
||||
'Verify Email Address',
|
||||
beforeCount + 1
|
||||
);
|
||||
expect(afterCount).toBeGreaterThan(beforeCount);
|
||||
});
|
||||
|
||||
test('re-submitting the same pending email does not send another verification email', async ({
|
||||
page,
|
||||
request,
|
||||
}) => {
|
||||
await goToProfilePage(page);
|
||||
const newEmail = `dup+${Date.now()}@test.com`;
|
||||
await page.getByLabel('Email').fill(newEmail);
|
||||
await saveProfileForm(page);
|
||||
const beforeCount = await waitForEmailCount(request, newEmail, 'Verify Email Address', 1);
|
||||
|
||||
await page.getByLabel('Email').fill(newEmail);
|
||||
await saveProfileForm(page);
|
||||
|
||||
await new Promise((r) => setTimeout(r, 1000));
|
||||
const afterCount = await countEmailsWithSubject(request, newEmail, 'Verify Email Address');
|
||||
expect(afterCount).toBe(beforeCount);
|
||||
});
|
||||
|
||||
test('clicking the verification link swaps the email and shows a success banner', async ({
|
||||
page,
|
||||
}) => {
|
||||
@@ -184,6 +297,43 @@ test('visiting the verification link while logged out redirects to login', async
|
||||
}
|
||||
});
|
||||
|
||||
test('delete account shows an error when the password is wrong', async ({ page }) => {
|
||||
await goToProfilePage(page);
|
||||
await page.getByRole('button', { name: 'Delete Account' }).click();
|
||||
const dialog = page.getByRole('dialog');
|
||||
await dialog.getByPlaceholder('Password').fill('not-the-real-password');
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(response) =>
|
||||
response.url().includes('/user/confirm-password') &&
|
||||
response.request().method() === 'POST' &&
|
||||
response.status() === 422
|
||||
),
|
||||
dialog.getByRole('button', { name: 'Delete Account' }).click(),
|
||||
]);
|
||||
await expect(dialog.getByRole('alert')).toBeVisible();
|
||||
await expect(dialog).toBeVisible();
|
||||
});
|
||||
|
||||
test('delete account succeeds with the correct password and logs the user out', async ({
|
||||
page,
|
||||
}) => {
|
||||
await goToProfilePage(page);
|
||||
await page.getByRole('button', { name: 'Delete Account' }).click();
|
||||
const dialog = page.getByRole('dialog');
|
||||
await dialog.getByPlaceholder('Password').fill(TEST_USER_PASSWORD);
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(response) =>
|
||||
response.url().includes('/api/v1/users/') &&
|
||||
response.request().method() === 'DELETE' &&
|
||||
response.status() === 204
|
||||
),
|
||||
dialog.getByRole('button', { name: 'Delete Account' }).click(),
|
||||
]);
|
||||
await page.waitForURL(/\/login/);
|
||||
});
|
||||
|
||||
async function createNewApiToken(page) {
|
||||
await page.getByLabel('API Key Name').fill('NEW API KEY');
|
||||
await Promise.all([
|
||||
|
||||
@@ -1,40 +1,57 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
import { useForm } from '@inertiajs/vue3';
|
||||
import axios from 'axios';
|
||||
import ActionSection from '@/Components/ActionSection.vue';
|
||||
import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
|
||||
import DialogModal from '@/packages/ui/src/DialogModal.vue';
|
||||
import { Field, FieldError } from '@/packages/ui/src/field';
|
||||
import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
|
||||
import TextInput from '@/packages/ui/src/Input/TextInput.vue';
|
||||
import { useDeleteUserMutation, useUserQuery } from '@/utils/useUserQuery';
|
||||
|
||||
const { user } = useUserQuery();
|
||||
const deleteUserMutation = useDeleteUserMutation();
|
||||
|
||||
const confirmingUserDeletion = ref(false);
|
||||
const passwordInput = ref<HTMLElement | null>(null);
|
||||
const passwordInput = ref<HTMLInputElement | null>(null);
|
||||
const password = ref('');
|
||||
const passwordError = ref('');
|
||||
const processing = ref(false);
|
||||
|
||||
const form = useForm({
|
||||
password: '',
|
||||
});
|
||||
|
||||
const confirmUserDeletion = () => {
|
||||
function confirmUserDeletion() {
|
||||
confirmingUserDeletion.value = true;
|
||||
|
||||
setTimeout(() => passwordInput.value?.focus(), 250);
|
||||
};
|
||||
}
|
||||
|
||||
const deleteUser = () => {
|
||||
form.delete(route('current-user.destroy'), {
|
||||
preserveScroll: true,
|
||||
onSuccess: () => closeModal(),
|
||||
onError: () => passwordInput.value?.focus(),
|
||||
onFinish: () => form.reset(),
|
||||
});
|
||||
};
|
||||
async function deleteUser() {
|
||||
if (!user.value || processing.value) return;
|
||||
processing.value = true;
|
||||
passwordError.value = '';
|
||||
try {
|
||||
await axios.post(route('password.confirm'), { password: password.value });
|
||||
} catch (error) {
|
||||
processing.value = false;
|
||||
if (axios.isAxiosError(error) && error.response?.status === 422) {
|
||||
passwordError.value = error.response.data?.errors?.password?.[0] ?? 'Invalid password.';
|
||||
} else {
|
||||
passwordError.value = 'Could not confirm password. Please try again.';
|
||||
}
|
||||
passwordInput.value?.focus();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
await deleteUserMutation.mutateAsync(user.value.id);
|
||||
window.location.href = '/';
|
||||
} catch {
|
||||
processing.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
const closeModal = () => {
|
||||
function closeModal() {
|
||||
confirmingUserDeletion.value = false;
|
||||
|
||||
form.reset();
|
||||
};
|
||||
password.value = '';
|
||||
passwordError.value = '';
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -66,16 +83,14 @@ const closeModal = () => {
|
||||
<Field class="mt-4">
|
||||
<TextInput
|
||||
ref="passwordInput"
|
||||
v-model="form.password"
|
||||
v-model="password"
|
||||
type="password"
|
||||
class="block w-3/4"
|
||||
placeholder="Password"
|
||||
autocomplete="current-password"
|
||||
@keyup.enter="deleteUser" />
|
||||
|
||||
<FieldError v-if="form.errors.password">{{
|
||||
form.errors.password
|
||||
}}</FieldError>
|
||||
<FieldError v-if="passwordError">{{ passwordError }}</FieldError>
|
||||
</Field>
|
||||
</template>
|
||||
|
||||
@@ -84,8 +99,8 @@ const closeModal = () => {
|
||||
|
||||
<DangerButton
|
||||
class="ms-3"
|
||||
:class="{ 'opacity-25': form.processing }"
|
||||
:disabled="form.processing"
|
||||
:class="{ 'opacity-25': processing }"
|
||||
:disabled="processing"
|
||||
@click="deleteUser">
|
||||
Delete Account
|
||||
</DangerButton>
|
||||
|
||||
@@ -1,93 +1,176 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
import { Link, router, useForm, usePage } from '@inertiajs/vue3';
|
||||
import { computed, onBeforeUnmount, ref, watch } from 'vue';
|
||||
import { usePage } from '@inertiajs/vue3';
|
||||
import axios from 'axios';
|
||||
import ActionMessage from '@/Components/ActionMessage.vue';
|
||||
import FormSection from '@/Components/FormSection.vue';
|
||||
import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
|
||||
import { Field, FieldError, FieldLabel } from '@/packages/ui/src/field';
|
||||
import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
|
||||
import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
|
||||
import TextInput from '@/packages/ui/src/Input/TextInput.vue';
|
||||
import type { User } from '@/types/models';
|
||||
import {
|
||||
useResendUserEmailVerificationMutation,
|
||||
useUpdateUserMutation,
|
||||
useUserQuery,
|
||||
} from '@/utils/useUserQuery';
|
||||
import type { UpdateUserBody, User } from '@/packages/api/src';
|
||||
|
||||
const props = defineProps<{
|
||||
user: User;
|
||||
}>();
|
||||
const { user } = useUserQuery();
|
||||
const updateUser = useUpdateUserMutation();
|
||||
const resendVerification = useResendUserEmailVerificationMutation();
|
||||
|
||||
const form = useForm({
|
||||
_method: 'PUT',
|
||||
name: props.user.name,
|
||||
email: props.user.email,
|
||||
photo: null as File | null,
|
||||
timezone: props.user.timezone,
|
||||
week_start: props.user.week_start,
|
||||
});
|
||||
const name = ref('');
|
||||
const email = ref('');
|
||||
const timezone = ref('');
|
||||
const weekStart = ref('');
|
||||
|
||||
const verificationLinkSent = ref<boolean | null>(null);
|
||||
const photoPreview = ref<ArrayBuffer | undefined | string | null>(null);
|
||||
const photoBase64 = ref<string | null>(null);
|
||||
const photoPreview = ref<string | null>(null);
|
||||
const photoInput = ref<HTMLInputElement | null>(null);
|
||||
|
||||
const updateProfileInformation = () => {
|
||||
if (photoInput.value && photoInput.value.files && photoInput.value.files?.length > 0) {
|
||||
form.photo = photoInput.value?.files[0] ?? null;
|
||||
const recentlySaved = ref(false);
|
||||
const resendCooldown = ref(false);
|
||||
let resendCooldownTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
function seedForm(u: User) {
|
||||
name.value = u.name;
|
||||
email.value = u.email;
|
||||
timezone.value = u.timezone;
|
||||
weekStart.value = u.week_start;
|
||||
}
|
||||
|
||||
watch(
|
||||
user,
|
||||
(u, prev) => {
|
||||
if (u && prev === undefined) seedForm(u);
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
const isUserLoaded = computed(() => user.value !== undefined);
|
||||
const isSaveDisabled = computed(() => !isUserLoaded.value || updateUser.isPending.value);
|
||||
const pendingEmail = computed(() => user.value?.pending_email ?? null);
|
||||
const hasUploadedPhoto = computed(() => {
|
||||
const url = user.value?.profile_photo_url;
|
||||
return !!url && !url.includes('ui-avatars.com');
|
||||
});
|
||||
|
||||
const fieldErrors = computed<Record<string, string>>(() => {
|
||||
const err = updateUser.error.value;
|
||||
if (!axios.isAxiosError(err) || err.response?.status !== 422) return {};
|
||||
const raw = err.response.data?.errors as Record<string, string[]> | undefined;
|
||||
if (!raw) return {};
|
||||
const flat: Record<string, string> = {};
|
||||
for (const [key, messages] of Object.entries(raw)) {
|
||||
if (Array.isArray(messages) && messages[0]) flat[key] = messages[0];
|
||||
}
|
||||
return flat;
|
||||
});
|
||||
|
||||
function buildPayload(): UpdateUserBody {
|
||||
if (!user.value) return {};
|
||||
const body: UpdateUserBody = {};
|
||||
if (name.value !== user.value.name) body.name = name.value;
|
||||
|
||||
const typedEmail = email.value.trim().toLowerCase();
|
||||
const currentEmail = user.value.email.toLowerCase();
|
||||
const currentPending = (user.value.pending_email ?? '').toLowerCase();
|
||||
if (typedEmail !== currentEmail && typedEmail !== currentPending) {
|
||||
body.email = email.value.trim();
|
||||
}
|
||||
|
||||
form.post(route('user-profile-information.update'), {
|
||||
errorBag: 'updateProfileInformation',
|
||||
preserveScroll: true,
|
||||
onSuccess: () => clearPhotoFileInput(),
|
||||
});
|
||||
};
|
||||
if (timezone.value !== user.value.timezone) body.timezone = timezone.value;
|
||||
if (weekStart.value !== user.value.week_start) {
|
||||
body.week_start = weekStart.value as UpdateUserBody['week_start'];
|
||||
}
|
||||
if (photoBase64.value !== null) body.photo = photoBase64.value;
|
||||
return body;
|
||||
}
|
||||
|
||||
const sendEmailVerification = () => {
|
||||
verificationLinkSent.value = true;
|
||||
};
|
||||
function clearPhotoInput() {
|
||||
if (photoInput.value) photoInput.value.value = '';
|
||||
photoBase64.value = null;
|
||||
photoPreview.value = null;
|
||||
}
|
||||
|
||||
const selectNewPhoto = () => {
|
||||
function selectNewPhoto() {
|
||||
if (!isUserLoaded.value) return;
|
||||
photoInput.value?.click();
|
||||
};
|
||||
}
|
||||
|
||||
const updatePhotoPreview = () => {
|
||||
if (photoInput.value?.files) {
|
||||
const photo = photoInput.value?.files[0];
|
||||
if (!photo) return;
|
||||
function readSelectedPhoto() {
|
||||
if (!isUserLoaded.value) return;
|
||||
const file = photoInput.value?.files?.[0];
|
||||
if (!file) return;
|
||||
const reader = new FileReader();
|
||||
reader.onload = (e) => {
|
||||
const dataUrl = e.target?.result as string;
|
||||
photoBase64.value = dataUrl;
|
||||
photoPreview.value = dataUrl;
|
||||
};
|
||||
reader.readAsDataURL(file);
|
||||
}
|
||||
|
||||
const reader = new FileReader();
|
||||
|
||||
reader.onload = (e) => {
|
||||
photoPreview.value = e.target?.result;
|
||||
};
|
||||
|
||||
reader.readAsDataURL(photo);
|
||||
async function save() {
|
||||
if (isSaveDisabled.value || !user.value) return;
|
||||
const body = buildPayload();
|
||||
if (Object.keys(body).length === 0) {
|
||||
flashSaved();
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const deletePhoto = () => {
|
||||
router.delete(route('current-user-photo.destroy'), {
|
||||
preserveScroll: true,
|
||||
onSuccess: () => {
|
||||
photoPreview.value = null;
|
||||
clearPhotoFileInput();
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const clearPhotoFileInput = () => {
|
||||
if (photoInput.value?.value) {
|
||||
photoInput.value.value = '';
|
||||
try {
|
||||
const updated = await updateUser.mutateAsync({ userId: user.value.id, body });
|
||||
seedForm(updated);
|
||||
clearPhotoInput();
|
||||
flashSaved();
|
||||
} catch {
|
||||
// 422: field errors render via fieldErrors. Other errors: toast handled in the mutation.
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
async function removePhoto() {
|
||||
if (!isUserLoaded.value || updateUser.isPending.value || !user.value) return;
|
||||
try {
|
||||
await updateUser.mutateAsync({ userId: user.value.id, body: { photo: null } });
|
||||
clearPhotoInput();
|
||||
} catch {
|
||||
// notification handled by mutation
|
||||
}
|
||||
}
|
||||
|
||||
async function clickResend() {
|
||||
if (!user.value || resendCooldown.value || resendVerification.isPending.value) return;
|
||||
try {
|
||||
await resendVerification.mutateAsync(user.value.id);
|
||||
resendCooldown.value = true;
|
||||
if (resendCooldownTimer) clearTimeout(resendCooldownTimer);
|
||||
resendCooldownTimer = setTimeout(() => {
|
||||
resendCooldown.value = false;
|
||||
}, 5000);
|
||||
} catch {
|
||||
// notification handled by mutation
|
||||
}
|
||||
}
|
||||
|
||||
function flashSaved() {
|
||||
recentlySaved.value = true;
|
||||
setTimeout(() => (recentlySaved.value = false), 2000);
|
||||
}
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
if (resendCooldownTimer) clearTimeout(resendCooldownTimer);
|
||||
});
|
||||
|
||||
const page = usePage<{
|
||||
jetstream: {
|
||||
managesProfilePhotos: boolean;
|
||||
hasEmailVerification: boolean;
|
||||
};
|
||||
jetstream: { managesProfilePhotos: boolean };
|
||||
timezones: Record<string, string>;
|
||||
weekdays: Record<string, string>;
|
||||
}>();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormSection @submitted="updateProfileInformation">
|
||||
<template #title> Profile Information</template>
|
||||
<FormSection @submitted="save">
|
||||
<template #title>Profile Information</template>
|
||||
|
||||
<template #description>
|
||||
Update your account's profile information and email address.
|
||||
@@ -96,44 +179,51 @@ const page = usePage<{
|
||||
<template #form>
|
||||
<!-- Profile Photo -->
|
||||
<div v-if="page.props.jetstream.managesProfilePhotos" class="col-span-6 sm:col-span-4">
|
||||
<!-- Profile Photo File Input -->
|
||||
<input
|
||||
id="photo"
|
||||
ref="photoInput"
|
||||
type="file"
|
||||
accept="image/jpeg,image/png"
|
||||
class="hidden"
|
||||
@change="updatePhotoPreview" />
|
||||
:disabled="!isUserLoaded"
|
||||
@change="readSelectedPhoto" />
|
||||
|
||||
<FieldLabel for="photo">Photo</FieldLabel>
|
||||
|
||||
<!-- Current Profile Photo -->
|
||||
<div v-show="!photoPreview" class="mt-2">
|
||||
<img
|
||||
v-if="user"
|
||||
:src="user.profile_photo_url"
|
||||
:alt="user.name"
|
||||
class="rounded-full h-20 w-20 object-cover" />
|
||||
</div>
|
||||
|
||||
<!-- New Profile Photo Preview -->
|
||||
<div v-show="photoPreview" class="mt-2">
|
||||
<span
|
||||
class="block rounded-full w-20 h-20 bg-cover bg-no-repeat bg-center"
|
||||
:style="'background-image: url(\'' + photoPreview + '\');'" />
|
||||
</div>
|
||||
|
||||
<SecondaryButton class="mt-2 me-2" type="button" @click.prevent="selectNewPhoto">
|
||||
<SecondaryButton
|
||||
class="mt-2 me-2"
|
||||
type="button"
|
||||
:disabled="!isUserLoaded"
|
||||
@click.prevent="selectNewPhoto">
|
||||
Select A New Photo
|
||||
</SecondaryButton>
|
||||
|
||||
<SecondaryButton
|
||||
v-if="user.profile_photo_path"
|
||||
v-if="hasUploadedPhoto"
|
||||
type="button"
|
||||
class="mt-2"
|
||||
@click.prevent="deletePhoto">
|
||||
:disabled="!isUserLoaded || updateUser.isPending.value"
|
||||
@click.prevent="removePhoto">
|
||||
Remove Photo
|
||||
</SecondaryButton>
|
||||
|
||||
<FieldError v-if="form.errors.photo">{{ form.errors.photo }}</FieldError>
|
||||
<FieldError v-if="fieldErrors.photo" class="mt-2">
|
||||
{{ fieldErrors.photo }}
|
||||
</FieldError>
|
||||
</div>
|
||||
|
||||
<!-- Name -->
|
||||
@@ -141,12 +231,13 @@ const page = usePage<{
|
||||
<FieldLabel for="name">Name</FieldLabel>
|
||||
<TextInput
|
||||
id="name"
|
||||
v-model="form.name"
|
||||
v-model="name"
|
||||
type="text"
|
||||
class="block w-full"
|
||||
required
|
||||
:disabled="!isUserLoaded"
|
||||
autocomplete="name" />
|
||||
<FieldError v-if="form.errors.name">{{ form.errors.name }}</FieldError>
|
||||
<FieldError v-if="fieldErrors.name">{{ fieldErrors.name }}</FieldError>
|
||||
</Field>
|
||||
|
||||
<!-- Email -->
|
||||
@@ -154,35 +245,29 @@ const page = usePage<{
|
||||
<FieldLabel for="email">Email</FieldLabel>
|
||||
<TextInput
|
||||
id="email"
|
||||
v-model="form.email"
|
||||
v-model="email"
|
||||
type="email"
|
||||
class="block w-full"
|
||||
required
|
||||
:disabled="!isUserLoaded"
|
||||
autocomplete="username" />
|
||||
<FieldError v-if="form.errors.email">{{ form.errors.email }}</FieldError>
|
||||
<FieldError v-if="fieldErrors.email">{{ fieldErrors.email }}</FieldError>
|
||||
|
||||
<div
|
||||
v-if="
|
||||
page.props.jetstream.hasEmailVerification && user.email_verified_at === null
|
||||
">
|
||||
<p class="text-sm mt-2 text-text-primary">
|
||||
Your email address is unverified.
|
||||
|
||||
<Link
|
||||
:href="route('verification.send')"
|
||||
method="post"
|
||||
as="button"
|
||||
class="underline text-sm text-text-secondary hover:text-text-secondary rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
|
||||
@click.prevent="sendEmailVerification">
|
||||
Click here to re-send the verification email.
|
||||
</Link>
|
||||
<div v-if="pendingEmail" class="mt-2 text-sm">
|
||||
<p class="text-text-primary">
|
||||
A verification link was sent to
|
||||
<span class="font-medium">{{ pendingEmail }}</span
|
||||
>. Click the link in the email to confirm the change.
|
||||
</p>
|
||||
|
||||
<div
|
||||
v-show="verificationLinkSent"
|
||||
class="mt-2 font-medium text-sm text-green-400">
|
||||
A new verification link has been sent to your email address.
|
||||
</div>
|
||||
<button
|
||||
v-if="!resendCooldown"
|
||||
type="button"
|
||||
class="mt-1 underline text-text-secondary hover:text-text-primary rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
|
||||
:disabled="!isUserLoaded || resendVerification.isPending.value"
|
||||
@click="clickResend">
|
||||
Resend verification email
|
||||
</button>
|
||||
<p v-else class="mt-1 font-medium text-green-400">Verification email sent.</p>
|
||||
</div>
|
||||
</Field>
|
||||
|
||||
@@ -191,19 +276,20 @@ const page = usePage<{
|
||||
<FieldLabel for="timezone">Timezone</FieldLabel>
|
||||
<select
|
||||
id="timezone"
|
||||
v-model="form.timezone"
|
||||
v-model="timezone"
|
||||
name="timezone"
|
||||
required
|
||||
:disabled="!isUserLoaded"
|
||||
class="block w-full border-input-border bg-input-background text-text-primary focus:border-input-border-active rounded-md shadow-sm">
|
||||
<option value="" disabled>Select a Timezone</option>
|
||||
<option
|
||||
v-for="(timezoneTranslated, timezoneKey) in $page.props.timezones"
|
||||
:key="timezoneKey"
|
||||
:value="timezoneKey">
|
||||
v-for="(timezoneTranslated, timezoneValue) in page.props.timezones"
|
||||
:key="timezoneValue"
|
||||
:value="timezoneValue">
|
||||
{{ timezoneTranslated }}
|
||||
</option>
|
||||
</select>
|
||||
<FieldError v-if="form.errors.timezone">{{ form.errors.timezone }}</FieldError>
|
||||
<FieldError v-if="fieldErrors.timezone">{{ fieldErrors.timezone }}</FieldError>
|
||||
</Field>
|
||||
|
||||
<!-- Week start -->
|
||||
@@ -211,26 +297,27 @@ const page = usePage<{
|
||||
<FieldLabel for="week_start">Start of the week</FieldLabel>
|
||||
<select
|
||||
id="week_start"
|
||||
v-model="form.week_start"
|
||||
v-model="weekStart"
|
||||
name="week_start"
|
||||
required
|
||||
:disabled="!isUserLoaded"
|
||||
class="block w-full border-input-border bg-input-background text-text-primary focus:border-input-border-active rounded-md shadow-sm">
|
||||
<option value="" disabled>Select a week day</option>
|
||||
<option
|
||||
v-for="(weekdayTranslated, weekdayKey) in $page.props.weekdays"
|
||||
:key="weekdayKey"
|
||||
:value="weekdayKey">
|
||||
v-for="(weekdayTranslated, weekdayValue) in page.props.weekdays"
|
||||
:key="weekdayValue"
|
||||
:value="weekdayValue">
|
||||
{{ weekdayTranslated }}
|
||||
</option>
|
||||
</select>
|
||||
<FieldError v-if="form.errors.week_start">{{ form.errors.week_start }}</FieldError>
|
||||
<FieldError v-if="fieldErrors.week_start">{{ fieldErrors.week_start }}</FieldError>
|
||||
</Field>
|
||||
</template>
|
||||
|
||||
<template #actions>
|
||||
<ActionMessage :on="form.recentlySuccessful" class="me-3"> Saved. </ActionMessage>
|
||||
<ActionMessage :on="recentlySaved" class="me-3"> Saved. </ActionMessage>
|
||||
|
||||
<PrimaryButton :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
|
||||
<PrimaryButton :class="{ 'opacity-25': isSaveDisabled }" :disabled="isSaveDisabled">
|
||||
Save
|
||||
</PrimaryButton>
|
||||
</template>
|
||||
|
||||
@@ -39,7 +39,7 @@ const page = usePage<{
|
||||
<div>
|
||||
<div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
|
||||
<div v-if="page.props.jetstream.canUpdateProfileInformation">
|
||||
<UpdateProfileInformationForm :user="page.props.auth.user" />
|
||||
<UpdateProfileInformationForm />
|
||||
|
||||
<SectionBorder />
|
||||
</div>
|
||||
|
||||
@@ -4486,6 +4486,45 @@ The report is considered public if the `is_public` field is set to &#x
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
method: 'delete',
|
||||
path: '/v1/users/:user',
|
||||
alias: 'deleteUser',
|
||||
description: `This endpoint is independent of the organization.`,
|
||||
requestFormat: 'json',
|
||||
parameters: [
|
||||
{
|
||||
name: 'user',
|
||||
type: 'Path',
|
||||
schema: z.string(),
|
||||
},
|
||||
],
|
||||
response: z.void(),
|
||||
errors: [
|
||||
{
|
||||
status: 400,
|
||||
description: `API exception`,
|
||||
schema: z
|
||||
.object({ error: z.boolean(), key: z.string(), message: z.string() })
|
||||
.passthrough(),
|
||||
},
|
||||
{
|
||||
status: 401,
|
||||
description: `Unauthenticated`,
|
||||
schema: z.object({ message: z.string() }).passthrough(),
|
||||
},
|
||||
{
|
||||
status: 403,
|
||||
description: `Authorization error`,
|
||||
schema: z.object({ message: z.string() }).passthrough(),
|
||||
},
|
||||
{
|
||||
status: 404,
|
||||
description: `Not found`,
|
||||
schema: z.object({ message: z.string() }).passthrough(),
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
method: 'post',
|
||||
path: '/v1/users/:user/resend-email-verification',
|
||||
|
||||
95
resources/js/utils/useUserQuery.ts
Normal file
95
resources/js/utils/useUserQuery.ts
Normal file
@@ -0,0 +1,95 @@
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query';
|
||||
import { computed } from 'vue';
|
||||
import axios from 'axios';
|
||||
import { api, type UpdateUserBody, type User } from '@/packages/api/src';
|
||||
import { useNotificationsStore } from '@/utils/notification';
|
||||
|
||||
const ME_QUERY_KEY = ['me'] as const;
|
||||
|
||||
export function useUserQuery() {
|
||||
const query = useQuery({
|
||||
queryKey: ME_QUERY_KEY,
|
||||
queryFn: async () => {
|
||||
const response = await api.getMe();
|
||||
return response.data;
|
||||
},
|
||||
staleTime: 1000 * 30,
|
||||
});
|
||||
|
||||
const user = computed<User | undefined>(() => query.data.value);
|
||||
|
||||
return { ...query, user };
|
||||
}
|
||||
|
||||
export function useUpdateUserMutation() {
|
||||
const queryClient = useQueryClient();
|
||||
const { addNotification } = useNotificationsStore();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async ({
|
||||
userId,
|
||||
body,
|
||||
}: {
|
||||
userId: string;
|
||||
body: UpdateUserBody;
|
||||
}): Promise<User> => {
|
||||
try {
|
||||
const response = await api.updateUser(body, { params: { user: userId } });
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
// 422 field errors are rendered inline by the form; suppress the toast for those.
|
||||
// Re-throw the AxiosError so consumers can read response.data.errors.
|
||||
if (!axios.isAxiosError(error) || error.response?.status !== 422) {
|
||||
addNotification(
|
||||
'error',
|
||||
'Failed to update profile',
|
||||
axios.isAxiosError(error)
|
||||
? (error.response?.data?.message ?? 'Please try again later.')
|
||||
: 'Please try again later.'
|
||||
);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ME_QUERY_KEY });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useDeleteUserMutation() {
|
||||
const { addNotification } = useNotificationsStore();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (userId: string) => {
|
||||
try {
|
||||
await api.deleteUser(undefined, { params: { user: userId } });
|
||||
} catch (error) {
|
||||
if (!axios.isAxiosError(error) || error.response?.status !== 422) {
|
||||
addNotification(
|
||||
'error',
|
||||
'Failed to delete account',
|
||||
axios.isAxiosError(error)
|
||||
? (error.response?.data?.message ?? 'Please try again later.')
|
||||
: 'Please try again later.'
|
||||
);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useResendUserEmailVerificationMutation() {
|
||||
const { handleApiRequestNotifications } = useNotificationsStore();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (userId: string) => {
|
||||
return handleApiRequestNotifications(
|
||||
() => api.resendUserEmailVerification(undefined, { params: { user: userId } }),
|
||||
'Verification email sent',
|
||||
'Failed to resend verification email'
|
||||
);
|
||||
},
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user