@functionalcms/svelte-components 5.24.5 → 5.24.7

package/dist/components/form/form.d.ts

@@ -128,4 +128,5 @@ export type ButtonConfig = {
     class?: string;
     action?: (event: Event) => Promise<void>;
 };
+export declare function convertResponseToFieldsFromFormData(fields: Array<Field>, formData: FormData): any;
 export declare function convertResponseToFields(fields: Array<Field>, request: Request): Promise<any>;

package/dist/components/form/form.js

@@ -124,8 +124,7 @@ export function createEditorField(id, label, type, value) {
         typeOfField: type,
     };
 }
-export async function convertResponseToFields(fields, request) {
-    const formData = await request.formData();
+export function convertResponseToFieldsFromFormData(fields, formData) {
     let result = {};
     for (const field of fields) {
         const value = formData.get(field.id);
@@ -133,3 +132,7 @@ export async function convertResponseToFields(fields, request) {
     }
     return result;
 }
+export async function convertResponseToFields(fields, request) {
+    const formData = await request.formData();
+    return convertResponseToFieldsFromFormData(fields, formData);
+}

package/dist/index.d.ts

@@ -11,7 +11,7 @@ export { default as Well } from './components/presentation/Well.svelte';
 export { default as FlexBox } from './components/presentation/FlexBox.svelte';
 export { default as StyleBox } from './components/presentation/StyleBox.svelte';
 export { default as ImageCompare } from './components/presentation/ImageCompare.svelte';
-export { InputType, type Field, type InputField, type TextareaField, type CollectionField, type SelectField, type FilePickerField, type TimePickerField, type PhoneInputField, type DatePickerField, type DropzoneField, type HiddenField, type ButtonConfig, type MarkdownEditorField, type HtmlEditorField, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, createDatePickerField, createEditorField, convertResponseToFields, } from './components/form/form.js';
+export { InputType, type Field, type InputField, type TextareaField, type CollectionField, type SelectField, type FilePickerField, type TimePickerField, type PhoneInputField, type DatePickerField, type DropzoneField, type HiddenField, type ButtonConfig, type MarkdownEditorField, type HtmlEditorField, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, createDatePickerField, createEditorField, convertResponseToFields, convertResponseToFieldsFromFormData, } from './components/form/form.js';
 export { default as AntiBot } from './components/form/AntiBot.svelte';
 export { default as SmartForm } from './components/form/SmartForm.svelte';
 export { default as EasyTools } from './components/integrations/EasyTools.svelte';

package/dist/index.js

@@ -10,7 +10,7 @@ export { default as Well } from './components/presentation/Well.svelte';
 export { default as FlexBox } from './components/presentation/FlexBox.svelte';
 export { default as StyleBox } from './components/presentation/StyleBox.svelte';
 export { default as ImageCompare } from './components/presentation/ImageCompare.svelte';
-export { InputType, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, createDatePickerField, createEditorField, convertResponseToFields, } from './components/form/form.js';
+export { InputType, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, createDatePickerField, createEditorField, convertResponseToFields, convertResponseToFieldsFromFormData, } from './components/form/form.js';
 export { default as AntiBot } from './components/form/AntiBot.svelte';
 export { default as SmartForm } from './components/form/SmartForm.svelte';
 export { default as EasyTools } from './components/integrations/EasyTools.svelte';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@functionalcms/svelte-components",
-	"version": "5.24.5",
+	"version": "5.24.7",
 	"license": "MIT",
 	"watch": {
 		"build": {

package/src/pages/auth/setup/[email]/+page.server.ts

@@ -1,30 +1,45 @@
 import { DOMAIN } from '$env/static/private';
 import { getUsersService } from '@functionalcms/svelte-components/index-server.js';
-import { convertResponseToFields } from '@functionalcms/svelte-components';
+import { convertResponseToFieldsFromFormData } from '@functionalcms/svelte-components';
 import { fields } from './fields';
 import * as m from "$lib/paraglide/messages.js";
 
 /** @type {import('./$types').PageServerLoad} */
 export async function load({ params, locals, url }) {
   const username = params.email;
-  return { username, success: false };
+  const code = url.searchParams.get("code");
+  return { username, code: code, success: false };
+}
+
+function convertResponseToFieldsFromFormData(fields: Array<Field>, formData: FormData) {
+  let result: any = {};
+
+  for (const field of fields) {
+    const value = formData.get(field.id);
+    result[field.id] = value;
+  }
+
+  return result;
 }
 
 export const actions = {
   setup: async ({ request, locals, params, url }) => {
     const userService = getUsersService(locals);
-    const code = url.searchParams.get("code");
 
-    const data = await convertResponseToFields(fields, request);
+    const formData = await request.formData();
+    const code = formData.get("code")
+
+    const data = convertResponseToFieldsFromFormData(fields(code), formData);
 
     if (data.password != data.confirm) {
       return {
+        code: data.code,
         errors: new Map<string, string>([["confirm", m.auth_password_do_not_match()]])
       }
     }
 
-    const result = await userService.setup(DOMAIN, params.email);
+    const result = await userService.setup(DOMAIN, params.email, data.code, data.password);
 
-    return { success: true };
+    return { code: data.code,success: true };
   },
 };

package/src/pages/auth/setup/[email]/+page.svelte

@@ -1,72 +1,72 @@
-<script lang="ts">
-	import { SmartForm } from '@functionalcms/svelte-components';
-	import * as m from '$lib/paraglide/messages.js';
-	import { deserialize } from '$app/forms';
-	import { fields } from './fields.js';
+  <script lang="ts">
+    import { SmartForm } from '@functionalcms/svelte-components';
+    import * as m from '$lib/paraglide/messages.js';
+    import { deserialize } from '$app/forms';
+    import { fields } from './fields.js';
 
-	interface Props {
-		data: {
-			username: string | null;
-			errors: string;
-		};
-		form: any;
-	}
+    interface Props {
+      data: {
+        username: string | null;
+        errors: string;
+      };
+      form: any;
+    }
 
-	let { data, form = {} } = $props();
+    let { data, form = {} } = $props();
 
-	let submitError = $state(false);
+    let submitError = $state(false);
 
-	let isProcesing = $state(false);
-	let resultMessage = $state('');
+    let isProcesing = $state(false);
+    let resultMessage = $state('');
 
-	async function resetPassword() {
-		isProcesing = true;
-		submitError = false;
+    async function resetPassword() {
+      isProcesing = true;
+      submitError = false;
 
-		const response = await fetch('?/setup', {
-			method: 'POST',
-			body: ''
-		});
+      const response = await fetch('?/setup', {
+        method: 'POST',
+        body: ''
+      });
 
-		const result = deserialize(await response.text());
+      const result = deserialize(await response.text());
 
-		resultMessage = result.type === 'success' ? m.auth_setup_success() : m.auth_setup_failure();
+      resultMessage = result.type === 'success' ? m.auth_setup_success() : m.auth_setup_failure();
 
-		isProcesing = false;
-	}
-</script>
+      isProcesing = false;
+    }
+  </script>
 
-<article class="w-full">
-	<main class="flex flex-col justify-around items-center gap-4 w-full m-auto p-4">
-		<h1>{m.auth_setup_title()}</h1>
-		{#if !data.username}
-			<p>{m.auth_setup_missing_code()}</p>
-		{:else}
-			<div>
-				{@html m.auth_setup_into()}
-			</div>
-			<SmartForm
-				{fields}
-				errors={form?.errors}
-				action="?/setup"
-				buttons={[
-					{
-						type: 'submit',
-						label: m.auth_submit(),
-						color: 'primary'
-					}
-				]}
-			/>
-			{#if resultMessage != ''}
-				<p>{resultMessage}</p>
-			{/if}
+  <article class="w-full">
+    <main class="flex flex-col justify-around items-center gap-4 w-full m-auto p-4">
+      <h1>{m.auth_setup_title()}</h1>
+      {#if !data.username}
+        <p>{m.auth_setup_missing_code()}</p>
+      {:else}
+        <div>
+          {@html m.auth_setup_into()}
+        </div>
+        <SmartForm
+          fields={fields(data.code ?? form.code)}
+          errors={form?.errors}
+          action="?/setup"
+          buttons={[
+            {
+              type: 'submit',
+              label: m.auth_submit(),
+              color: 'primary'
+            }
+          ]}
+        />
+        {#if resultMessage != ''}
+          <p>{resultMessage}</p>
+        {/if}
 
-			{#if submitError}
-				<p class="text-red-600">{m.auth_setup_error()}</p>
-			{/if}
-		{/if}
-	</main>
-</article>
+        {#if submitError}
+          <p class="text-red-600">{m.auth_setup_error()}</p>
+        {/if}
+      {/if}
+    </main>
+  </article>
 
-<style>
-</style>
+  <style>
+  </style>

package/src/pages/auth/setup/[email]/fields.ts

@@ -1,7 +1,7 @@
 import { m } from "$lib/paraglide/messages";
-import { createInputField, InputType } from "@functionalcms/svelte-components";
+import { createHiddenField, createInputField, InputType } from "@functionalcms/svelte-components";
 
-export const fields = [
+export const fields = (code: string) => [
     createInputField(
       "password",
       m.auth_password(),
@@ -20,4 +20,8 @@ export const fields = [
         required: true,
       },
     ),
+    createHiddenField(
+      "code",
+      code
+    )
   ];