Updates types

waspc/data/Generator/templates/react-app/src/auth/forms/internal/common/LoginSignupForm.tsx

@@ -145,6 +145,7 @@ export const LoginSignupForm = ({
     isLogin,
     onError: onErrorHandler,
     showEmailVerificationPending() {
+      hookForm.reset()
       setSuccessMessage(`You've signed up successfully! Check your email for the confirmation link.`)
     },
     onLoginSuccess() {

waspc/data/Generator/templates/server/src/auth/providers/email/types.ts

@@ -1,4 +1,4 @@
-import { AdditionalSignupFieldsConfig as AdditionalSignupFieldsConfigGeneric } from '../types'
+import { createDefineAdditionalSignupFieldsFn } from '../types.js'
 
 export type GetVerificationEmailContentFn = (params: { verificationLink: string }) => EmailContent;
 
@@ -14,4 +14,4 @@ export const tokenVerificationErrors = {
     TokenExpiredError: 'TokenExpiredError',
 };
 
-export type AdditionalSignupFieldsConfig = AdditionalSignupFieldsConfigGeneric<"email" | "password">
+export const defineAdditionalSignupFields = createDefineAdditionalSignupFieldsFn<"email" | "password">()

waspc/data/Generator/templates/server/src/auth/providers/local/types.ts

@@ -1,3 +1,3 @@
-import { AdditionalSignupFieldsConfig as AdditionalSignupFieldsConfigGeneric } from '../types'
+import { createDefineAdditionalSignupFieldsFn } from '../types.js'
 
-export type AdditionalSignupFieldsConfig = AdditionalSignupFieldsConfigGeneric<"username" | "password">
+export const defineAdditionalSignupFields = createDefineAdditionalSignupFieldsFn<"username" | "password">()

waspc/data/Generator/templates/server/src/auth/providers/types.ts

@@ -20,21 +20,17 @@ export type InitData = {
 
 export type RequestWithWasp = Request & { wasp?: { [key: string]: any } }
 
-export type AdditionalSignupFieldsConfig<
-  ExistingUserFields extends keyof User,
-> = Expand<
-  Omit<
-    Partial<{ [key in keyof User]: AdditionalFieldDefinition }>,
-    ExistingUserFields
-  >
->
-
-type AdditionalFieldDefinition = {
-  get: (data: PossibleUserFields) => unknown;
-  // Expected to throw an error if validation fails
-  validate: (value: unknown) => void;
+export function createDefineAdditionalSignupFieldsFn<AlreadyIncludedUserFields extends keyof User>() {
+  return function defineFields(config: {
+    [key in keyof Partial<Omit<User, AlreadyIncludedUserFields>>]: FieldDefinition<Partial<Omit<User, AlreadyIncludedUserFields>>[key]>
+  }) {
+    return config
+  }
 }
 
-type PossibleUserFields = Partial<{
-  [key in keyof User]: unknown
-}>
+type FieldDefinition<T> = {
+  get: (data: Partial<{
+    [key in keyof User]: unknown
+  }>) => T | undefined;
+  validate: (value: T | undefined) => void;
+}

waspc/data/Generator/templates/server/src/auth/utils.ts

@@ -12,7 +12,6 @@ import { isValidEmail } from '../core/auth/validators.js'
 import { emailSender } from '../email/index.js';
 import { Email } from '../email/core/types.js';
 {=/ isEmailAuthEnabled =}
-import { AdditionalSignupFieldsConfig } from './providers/types.js'
 {=# additionalSignupFieldsFn.isDefined =}
 {=& additionalSignupFieldsFn.importStatement =}
 {=/ additionalSignupFieldsFn.isDefined =}
@@ -22,7 +21,7 @@ import { AdditionalSignupFieldsConfig } from './providers/types.js'
 const _waspAdditionalSignupFieldsConfig = {= additionalSignupFieldsFn.importIdentifier =}
 {=/ additionalSignupFieldsFn.isDefined =}
 {=^ additionalSignupFieldsFn.isDefined =}
-const _waspAdditionalSignupFieldsConfig = (): AdditionalSignupFieldsConfig<never> => ({})
+const _waspAdditionalSignupFieldsConfig = {}
 {=/ additionalSignupFieldsFn.isDefined =}
 
 type {= userEntityUpper =}Id = {= userEntityUpper =}['id']
@@ -234,9 +233,8 @@ function throwValidationError(message: string): void {
 
 
 export function validateAndGetAdditionalFields(data: unknown) {
-  const additionalFieldsDefinition = _waspAdditionalSignupFieldsConfig()
   const result: Record<string, any> = {};
-  for (const [field, options] of Object.entries(additionalFieldsDefinition)) {
+  for (const [field, options] of Object.entries(_waspAdditionalSignupFieldsConfig)) {
     const value = options.get(data)
     validate(options, value)
     result[field] = value

waspc/data/Generator/templates/server/src/types/index.ts

@@ -18,9 +18,9 @@ export type { GetUserFieldsFn } from '../auth/providers/oauth/types';
 {=/ isExternalAuthEnabled =}
 
 {=# isEmailAuthEnabled =}
-export type { GetVerificationEmailContentFn, GetPasswordResetEmailContentFn, AdditionalSignupFieldsConfig } from '../auth/providers/email/types';
+export { type GetVerificationEmailContentFn, type GetPasswordResetEmailContentFn, defineAdditionalSignupFields } from '../auth/providers/email/types.js';
 {=/ isEmailAuthEnabled =}
 
 {=# isLocalAuthEnabled =}
-export type { AdditionalSignupFieldsConfig } from '../auth/providers/local/types';
+export { defineAdditionalSignupFields } from '../auth/providers/local/types.js';
 {=/ isLocalAuthEnabled =}

waspc/examples/crud-testing/main.wasp

@@ -13,7 +13,7 @@ app crudTesting {
     },
     onAuthFailedRedirectTo: "/login",
     signupCustomization: {
-      additionalFieldsFn: import { getAdditionalFields } from "@server/auth.js",
+      additionalFieldsFn: import { fields } from "@server/auth.js",
     },
   },
 }

waspc/examples/crud-testing/src/server/auth.ts

@@ -1,23 +1,21 @@
-import { AdditionalSignupFieldsConfig } from "@wasp/types";
+import { defineAdditionalSignupFields } from "@wasp/types/index.js";
 
-export function getAdditionalFields() {
-  return {
-    address: {
-      get: (data): string => {
-        return ensureString(data.address, "Address is required");
-      },
-      validate: (value) => {
-        const address = ensureString(value, "Address is required");
-        if (!address) {
-          throw new Error("Address is required");
-        }
-        if (address.length < 5) {
-          throw new Error("Address must be at least 5 characters long");
-        }
-      },
+export const fields = defineAdditionalSignupFields({
+  address: {
+    get: (data) => {
+      return ensureString(data.address, "Address is required");
     },
-  } satisfies AdditionalSignupFieldsConfig;
-}
+    validate: (value) => {
+      const address = ensureString(value, "Address is required");
+      if (!address) {
+        throw new Error("Address is required");
+      }
+      if (address.length < 5) {
+        throw new Error("Address must be at least 5 characters long");
+      }
+    },
+  },
+});
 
 function ensureString(value: unknown, message: string): string {
   if (typeof value !== "string") {

waspc/examples/todoApp/src/server/auth/signup.js

@@ -1,12 +1,12 @@
-export function getAdditionalFields() {
-  return {
-    address: {
-      get: (value) => value,
-      validate: (value) => {
-        if (!value || value.length < 5) {
-          throw new Error('Address is required')
-        }
-      },
+import { defineAdditionalSignupFields } from '@wasp/types/index.js'
+
+export const fields = defineAdditionalSignupFields({
+  address: {
+    get: (data) => data.address,
+    validate: (value) => {
+      if (!value || value.length < 5) {
+        throw new Error('Address is required')
+      }
     },
-  }
-}
+  },
+})

waspc/examples/todoApp/todoApp.wasp

@@ -42,7 +42,7 @@ app todoApp {
       },
     },
     signupCustomization: {
-      additionalFieldsFn: import { getAdditionalFields } from "@server/auth/signup.js",
+      additionalFieldsFn: import { fields } from "@server/auth/signup.js",
     },
     onAuthFailedRedirectTo: "/login",
     onAuthSucceededRedirectTo: "/profile"