Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-10-27 00:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: User Registration Form Validation and Other Setup Wizard Things (#5920)

Browse Source
This commit is contained in:
Michael Genson
2025-08-14 02:26:24 -05:00
committed by GitHub
parent 040fb48807
commit ad60b4445b
4 changed files with 70 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/composables/use-setup/common-settings-form.ts
View File

@@ -4,7 +4,7 @@ import type { AutoFormItems } from "~/types/auto-forms";
export const useCommonSettingsForm = () => {
const i18n = useI18n();
const commonSettingsForm: AutoFormItems = [
const commonSettingsForm = computed<AutoFormItems>(() => [
{
section: i18n.t("profile.group-settings"),
label: i18n.t("group.enable-public-access"),
@@ -21,7 +21,7 @@ export const useCommonSettingsForm = () => {
type: fieldTypes.BOOLEAN,
rules: ["required"],
},
];
]);
return {
commonSettingsForm,

20
frontend/composables/use-users/user-registration-form.ts
View File

@@ -1,5 +1,5 @@
import { useAsyncValidator } from "~/composables/use-validators";
import type { VForm } from "~/types/vuetify";
import type { VForm } from "~/types/auto-forms";
import { usePublicApi } from "~/composables/api/api-client";
const domAccountForm = ref<VForm | null>(null);
@@ -13,11 +13,13 @@ const advancedOptions = ref(false);
export const useUserRegistrationForm = () => {
const i18n = useI18n();
function safeValidate(form: Ref<VForm | null>) {
if (form.value && form.value.validate) {
return form.value.validate();
async function safeValidate(form: Ref<VForm | null>) {
if (!form.value) {
return false;
}
return false;
const result = await form.value.validate();
return result.valid;
}
// ================================================================
// Provide Group Details
@@ -45,11 +47,15 @@ export const useUserRegistrationForm = () => {
email,
advancedOptions,
validate: async () => {
if (!(validUsername.value && validEmail.value)) {
if (!validUsername.value || !validEmail.value) {
await Promise.all([validateUsername(), validateEmail()]);
}
return (safeValidate(domAccountForm as Ref<VForm>) && validUsername.value && validEmail.value);
if (!validUsername.value || !validEmail.value) {
return false;
}
return await safeValidate(domAccountForm as Ref<VForm>);
},
reset: () => {
accountDetails.username.value = "";