From 12000f491a3aadf43210c1a0124b3d4406866da1 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 29 Aug 2022 14:31:41 +0200 Subject: [PATCH] Revert "auth: Use canonical user IDs" This reverts commit 6c1036e2705d93e1cb71476ac78499ae27f0d326. --- auth/middleware.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/auth/middleware.go b/auth/middleware.go index 5cce22885fa751e7e2f59c2c5221bffa17de805e..6a91df21feafb44c23156a9c7691026ccb4930b7 100644 --- a/auth/middleware.go +++ b/auth/middleware.go @@ -337,7 +337,6 @@ func FetchMetaProfile(ctx context.Context, username string, user *AuthContext) e INSERT INTO "user" ( created, updated, - id, username, email, user_type, @@ -349,7 +348,7 @@ func FetchMetaProfile(ctx context.Context, username string, user *AuthContext) e VALUES ( NOW() at time zone 'utc', NOW() at time zone 'utc', - $1, $2, $3, $4, $5, $6, $7, $8 + $1, $2, $3, $4, $5, $6, $7 ) ON CONFLICT DO NOTHING RETURNING @@ -363,8 +362,8 @@ func FetchMetaProfile(ctx context.Context, username string, user *AuthContext) e location, bio, suspension_notice;`, - profile.ID, profile.Username, profile.Email, ut, profile.URL, - profile.Location, profile.Bio, profile.SuspensionNotice) + &profile.Username, &profile.Email, &ut, &profile.URL, + &profile.Location, &profile.Bio, &profile.SuspensionNotice) // TODO: Register webhooks if err := row.Scan(&user.UserID, &user.Created, &user.Updated,