admin/shop-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test commit

Browse Source
This commit is contained in:
Kirill
2026-05-20 12:07:22 +05:00
parent af5376d0e1
commit b06ba64365
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/prisma/prisma/dev.db
BIN
View File
Binary file not shown.
server/src/routes/oauth-social.js
+4 -4
View File
@@ -18,13 +18,13 @@ async function issueUserJwt(fastify, userId, email) {
} }
async function findOrCreateUserFromOAuth({ provider, providerUserId, accessToken, suggestedEmail }) { async function findOrCreateUserFromOAuth({ provider, providerUserId, accessToken, suggestedEmail }) {
const existingLink = await prisma.oauthAccount.findUnique({ const existingLink = await prisma.oAuthAccount.findUnique({
where: { provider_providerUserId: { provider, providerUserId } }, where: { provider_providerUserId: { provider, providerUserId } },
include: { user: true }, include: { user: true },
}) })
if (existingLink?.user) { if (existingLink?.user) {
if (accessToken !== undefined) { if (accessToken !== undefined) {
await prisma.oauthAccount.update({ await prisma.oAuthAccount.update({
where: { provider_providerUserId: { provider, providerUserId } }, where: { provider_providerUserId: { provider, providerUserId } },
data: { accessToken }, data: { accessToken },
}) })
@@ -36,7 +36,7 @@ async function findOrCreateUserFromOAuth({ provider, providerUserId, accessToken
const norm = trimmed ? normalizeEmail(trimmed) : null const norm = trimmed ? normalizeEmail(trimmed) : null
let user = norm ? await prisma.user.findUnique({ where: { email: norm } }) : null let user = norm ? await prisma.user.findUnique({ where: { email: norm } }) : null
if (user) { if (user) {
await prisma.oauthAccount.create({ await prisma.oAuthAccount.create({
data: { provider, providerUserId: String(providerUserId), userId: user.id, accessToken }, data: { provider, providerUserId: String(providerUserId), userId: user.id, accessToken },
}) })
return user return user
@@ -49,7 +49,7 @@ async function findOrCreateUserFromOAuth({ provider, providerUserId, accessToken
email = `${provider}_${providerUserId}_${n}@oauth.craftshop.local` email = `${provider}_${providerUserId}_${n}@oauth.craftshop.local`
} }
user = await prisma.user.create({ data: { email } }) user = await prisma.user.create({ data: { email } })
await prisma.oauthAccount.create({ await prisma.oAuthAccount.create({
data: { provider, providerUserId: String(providerUserId), userId: user.id, accessToken }, data: { provider, providerUserId: String(providerUserId), userId: user.id, accessToken },
}) })
return user return user