Add fullName to magic link form

Signed-off-by: Émile Ré <emile@getprobo.com>

apps/trust/src/pages/auth/ConnectPage.tsx

@@ -37,6 +37,7 @@ const sendMagicLinkMutation = graphql`
 `;
 
 const schema = z.object({
+  fullName: z.string().min(2),
   email: z.string().email(),
 });
 
@@ -103,6 +104,7 @@ export function ConnectPage(props: {
   } = useFormWithSchema(schema, {
     defaultValues: {
       email: "",
+      fullName: "",
     },
   });
 
@@ -110,8 +112,8 @@ export function ConnectPage(props: {
     sendMagicLinkMutation,
   );
 
-  const handleSubmit = handleSubmitWrapper(({ email }: FormData) => {
+  const handleSubmit = handleSubmitWrapper(({ email, fullName }: FormData) => {
-    const input: SendMagicLinkInput = { email };
+    const input: SendMagicLinkInput = { email, fullName };
     if (safeContinueUrl) {
       input.continue = safeContinueUrl;
     }
@@ -119,6 +121,7 @@ export function ConnectPage(props: {
       variables: {
         input: {
           email,
+          fullName,
           continue: safeContinueUrl,
         },
       },
@@ -170,11 +173,20 @@ export function ConnectPage(props: {
       </div>
 
       <form onSubmit={e => void handleSubmit(e)} className="space-y-6">
+        <Field
+          label={__("Full Name")}
+          placeholder="John Doe"
+          {...register("fullName")}
+          type="text"
+          required
+          error={formState.errors.fullName?.message}
+        />
         <Field
           label={__("Email")}
           placeholder="john.doe@acme.com"
           {...register("email")}
           type="email"
+          required
           error={formState.errors.email?.message}
         />
 

apps/trust/src/pages/auth/__generated__/ConnectPageMutation.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<711ecaa392c23004a3bd1dfb24a5751f>>
+ * @generated SignedSource<<f567da0a977d6ae788cdd5d6eff1d59f>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -12,6 +12,7 @@ import { ConcreteRequest } from 'relay-runtime';
 export type SendMagicLinkInput = {
   continue?: string | null | undefined;
   email: any;
+  fullName: string;
 };
 export type ConnectPageMutation$variables = {
   input: SendMagicLinkInput;

pkg/iam/auth_service.go

@@ -61,6 +61,7 @@ type (
 	}
 
 	SendMagicLinkRequest struct {
+		FullName       string
 		Email          mail.Addr
 		URLPath        string
 		OrganizationID gid.GID
@@ -74,6 +75,7 @@ type (
 	}
 
 	MagicLinkData struct {
+		FullName string    `json:"fullName"`
 		Email    mail.Addr `json:"email"`
 		Continue *string   `json:"continue"`
 	}
@@ -595,6 +597,7 @@ func (s AuthService) SendMagicLink(ctx context.Context, req *SendMagicLinkReques
 		TokenTypeMagicLink,
 		s.magicLinkTokenValidity,
 		MagicLinkData{
+			FullName: req.FullName,
 			Email:    req.Email,
 			Continue: req.Continue,
 		},
@@ -616,20 +619,9 @@ func (s AuthService) SendMagicLink(ctx context.Context, req *SendMagicLinkReques
 				return fmt.Errorf("cannot insert token: %w", err)
 			}
 
-			fullName := req.Email.Username()
+			fullName := req.FullName
-			identity := &coredata.Identity{}
 			organization := &coredata.Organization{}
 
-			if err := identity.LoadByEmail(ctx, tx, req.Email); err == nil {
-				if identity.FullName != "" {
-					fullName = identity.FullName
-				}
-			} else {
-				if !errors.Is(err, coredata.ErrResourceNotFound) {
-					return fmt.Errorf("cannot load identity: %w", err)
-				}
-			}
-
 			if err := organization.LoadByID(ctx, tx, coredata.NewNoScope(), req.OrganizationID); err != nil {
 				return fmt.Errorf("cannot load organization: %w", err)
 			}
@@ -728,6 +720,10 @@ func (s AuthService) OpenSessionWithMagicLink(ctx context.Context, tokenString s
 						UpdatedAt:            now,
 					}
 
+					if identity.FullName == "" {
+						identity.FullName = payload.Data.FullName
+					}
+
 					if err := identity.Insert(ctx, tx); err != nil {
 						return fmt.Errorf("cannot create identity: %w", err)
 					}

pkg/server/api/trust/v1/schema.graphql

@@ -611,6 +611,7 @@ type DocumentAccess implements Node {
 }
 
 input SendMagicLinkInput {
+  fullName: String!
   email: EmailAddr!
   continue: String
 }

pkg/server/api/trust/v1/schema/schema.go

@@ -2033,6 +2033,7 @@ type DocumentAccess implements Node {
 }
 
 input SendMagicLinkInput {
+  fullName: String!
   email: EmailAddr!
   continue: String
 }
@@ -9515,13 +9516,20 @@ func (ec *executionContext) unmarshalInputSendMagicLinkInput(ctx context.Context
 		asMap[k] = v
 	}
 
-	fieldsInOrder := [...]string{"email", "continue"}
+	fieldsInOrder := [...]string{"fullName", "email", "continue"}
 	for _, k := range fieldsInOrder {
 		v, ok := asMap[k]
 		if !ok {
 			continue
 		}
 		switch k {
+		case "fullName":
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("fullName"))
+			data, err := ec.unmarshalNString2string(ctx, v)
+			if err != nil {
+				return it, err
+			}
+			it.FullName = data
 		case "email":
 			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("email"))
 			data, err := ec.unmarshalNEmailAddr2goᚗproboᚗincᚋproboᚋpkgᚋmailᚐAddr(ctx, v)

pkg/server/api/trust/v1/types/types.go

@@ -214,6 +214,7 @@ type RequestTrustCenterFileAccessInput struct {
 }
 
 type SendMagicLinkInput struct {
+	FullName string    `json:"fullName"`
 	Email    mail.Addr `json:"email"`
 	Continue *string   `json:"continue,omitempty"`
 }

pkg/server/api/trust/v1/v1_resolver.go

@@ -193,6 +193,7 @@ func (r *mutationResolver) SendMagicLink(ctx context.Context, input types.SendMa
 	}
 
 	req := &iam.SendMagicLinkRequest{
+		FullName:         input.FullName,
 		Email:            input.Email,
 		CompliancePageID: &trustCenter.ID,
 		OrganizationID:   trustCenter.OrganizationID,