CodeCow/stack
1
0
Fork 0
mirror of https://github.com/stack-auth/stack.git synced 2026-06-13 21:01:21 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Metadata fields should be set to null when left empty (#145)

Browse Source
This commit is contained in:
Konsti Wohlwend 2024-07-25 09:33:16 -07:00 committed by Stan Wohlwend
parent aa654ccdc1
commit 088e980c38
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/dashboard/src/components/data-table/user-table.tsx
View File

@ -1,7 +1,7 @@
'use client';
import { ServerUser } from '@stackframe/stack';
import { standardProviders } from "@stackframe/stack-shared/dist/interface/clientInterface";
import { jsonStringSchema } from "@stackframe/stack-shared/dist/schema-fields";
import { jsonStringOrEmptySchema, jsonStringSchema } from "@stackframe/stack-shared/dist/schema-fields";
import { ColumnDef, Row, Table } from "@tanstack/react-table";
import { useMemo, useState } from "react";
import * as yup from "yup";
@ -55,8 +55,8 @@ const userEditFormSchema = yup.object({
primaryEmail: yup.string().email("Primary Email must be a valid email address"),
signedUpAt: yup.date().required(),
primaryEmailVerified: yup.boolean().required(),
clientMetadata: jsonStringSchema,
serverMetadata: jsonStringSchema,
clientMetadata: jsonStringOrEmptySchema.default("null"),
serverMetadata: jsonStringOrEmptySchema.default("null"),
});
function EditUserDialog(props: {
@ -69,8 +69,8 @@ function EditUserDialog(props: {
primaryEmail: props.user.primaryEmail || undefined,
primaryEmailVerified: props.user.primaryEmailVerified,
signedUpAt: props.user.signedUpAt,
clientMetadata: props.user.clientMetadata ? JSON.stringify(props.user.clientMetadata) : undefined,
serverMetadata: props.user.serverMetadata ? JSON.stringify(props.user.serverMetadata) : undefined,
clientMetadata: props.user.clientMetadata == null ? "" : JSON.stringify(props.user.clientMetadata, null, 2),
serverMetadata: props.user.serverMetadata == null ? "" : JSON.stringify(props.user.serverMetadata, null, 2),
};
return <FormDialog
@ -96,8 +96,8 @@ function EditUserDialog(props: {
<DateField control={form.control} label="Signed Up At" name="signedUpAt" />
<TextAreaField rows={3} control={form.control} label="Client Metadata" name="clientMetadata" />
<TextAreaField rows={3} control={form.control} label="Server Metadata" name="serverMetadata" />
<TextAreaField rows={3} control={form.control} label="Client Metadata" name="clientMetadata" placeholder="null" monospace />
<TextAreaField rows={3} control={form.control} label="Server Metadata" name="serverMetadata" placeholder="null" monospace />
</>
)}
onSubmit={async (values) => { await props.user.update({

4
apps/dashboard/src/components/form-fields.tsx
View File

@ -32,6 +32,7 @@ export function TextAreaField<F extends FieldValues>(props: {
control: Control<F>,
name: Path<F>,
label: React.ReactNode,
monospace?: boolean,
}) {
return (
<FormField
@ -47,6 +48,9 @@ export function TextAreaField<F extends FieldValues>(props: {
rows={props.rows}
placeholder={props.placeholder}
value={field.value ?? ""}
style={{
fontFamily: props.monospace ? "ui-monospace, monospace" : undefined,
}}
/>
</FormControl>
<FormMessage />

9
packages/stack-shared/src/schema-fields.ts
View File

@ -94,6 +94,15 @@ export const jsonStringSchema = yupString().test("json", "Invalid JSON format",
return false;
}
});
export const jsonStringOrEmptySchema = yupString().test("json", "Invalid JSON format", (value) => {
if (!value) return true;
try {
JSON.parse(value);
return true;
} catch (error) {
return false;
}
});
export const emailSchema = yupString().email();
// Request auth