@@ -33,31 +33,29 @@ export async function POST(req: NextRequest) {
33
33
34
34
let userRecord : typeof schema . userRecords . $inferSelect | undefined ;
35
35
if ( data . user ) {
36
- const { email, name, username, ...rest } = data . user ;
37
36
userRecord = await createOrUpdateUserRecord ( {
38
37
clerkOrganizationId,
39
- clientId : rest . clientId ,
40
- clientUrl : rest . clientUrl ,
41
- initialProtected : rest . protected ,
42
- stripeAccountId : rest . stripeAccountId ,
43
- metadata : rest . metadata ,
44
- ...( passthrough ? { } : { email, name, username } ) ,
38
+ clientId : data . user . clientId ,
39
+ clientUrl : data . user . clientUrl ,
40
+ initialProtected : data . user . protected ,
41
+ stripeAccountId : data . user . stripeAccountId ,
42
+ metadata : data . user . metadata ,
43
+ ...( passthrough ? { } : { email : data . user . email , name : data . user . name , username : data . user . username } ) ,
45
44
} ) ;
46
45
}
47
46
48
47
const content = typeof data . content === "string" ? { text : data . content } : data . content ;
49
48
50
- const { name, ...rest } = data ;
51
49
const record = await createOrUpdateRecord ( {
52
50
clerkOrganizationId,
53
- clientId : rest . clientId ,
54
- entity : rest . entity ,
55
- clientUrl : rest . clientUrl ,
51
+ clientId : data . clientId ,
52
+ entity : data . entity ,
53
+ clientUrl : data . clientUrl ,
56
54
userRecordId : userRecord ?. id ,
57
- metadata : rest . metadata ,
55
+ metadata : data . metadata ,
58
56
...( passthrough
59
57
? { }
60
- : { name, text : content . text , imageUrls : content . imageUrls , externalUrls : content . externalUrls } ) ,
58
+ : { name : data . name , text : content . text , imageUrls : content . imageUrls , externalUrls : content . externalUrls } ) ,
61
59
} ) ;
62
60
63
61
if ( record . protected ) {
@@ -75,7 +73,7 @@ export async function POST(req: NextRequest) {
75
73
recordId : record . id ,
76
74
passthroughContext : passthrough
77
75
? {
78
- name,
76
+ name : data . name ,
79
77
text : content . text ,
80
78
imageUrls : content . imageUrls ?? [ ] ,
81
79
externalUrls : content . externalUrls ?? [ ] ,
0 commit comments