mirror of
https://github.com/wassname/Open-Assistant.git
synced 2026-08-05 12:40:38 +08:00
Guarantee all users get a name (#800)
* Guarantee all users get a name and it is used when talking to the backend * Small code cleanup
This commit is contained in:
@@ -113,7 +113,7 @@ export class OasstApiClient {
|
||||
type: taskType,
|
||||
user: {
|
||||
id: userToken.sub,
|
||||
display_name: userToken.name || userToken.email,
|
||||
display_name: userToken.name,
|
||||
auth_method: "local",
|
||||
},
|
||||
});
|
||||
@@ -146,7 +146,7 @@ export class OasstApiClient {
|
||||
type: updateType,
|
||||
user: {
|
||||
id: userToken.sub,
|
||||
display_name: userToken.name || userToken.email,
|
||||
display_name: userToken.name,
|
||||
auth_method: "local",
|
||||
},
|
||||
task_id: taskId,
|
||||
|
||||
@@ -7,6 +7,7 @@ import CredentialsProvider from "next-auth/providers/credentials";
|
||||
import DiscordProvider from "next-auth/providers/discord";
|
||||
import EmailProvider from "next-auth/providers/email";
|
||||
import prisma from "src/lib/prismadb";
|
||||
import { generateUsername } from "unique-username-generator";
|
||||
|
||||
const providers: Provider[] = [];
|
||||
|
||||
@@ -97,10 +98,11 @@ export const authOptions: AuthOptions = {
|
||||
* This let's use forward the role to the session object.
|
||||
*/
|
||||
async jwt({ token }) {
|
||||
const { isNew, role } = await prisma.user.findUnique({
|
||||
const { isNew, name, role } = await prisma.user.findUnique({
|
||||
where: { id: token.sub },
|
||||
select: { role: true, isNew: true },
|
||||
select: { name: true, role: true, isNew: true },
|
||||
});
|
||||
token.name = name;
|
||||
token.role = role;
|
||||
token.isNew = isNew;
|
||||
return token;
|
||||
@@ -110,7 +112,18 @@ export const authOptions: AuthOptions = {
|
||||
/**
|
||||
* Update the user's role after they have successfully signed in
|
||||
*/
|
||||
async signIn({ user, account }) {
|
||||
async signIn({ user, account, isNewUser }) {
|
||||
if (isNewUser && account.provider === "email") {
|
||||
await prisma.user.update({
|
||||
data: {
|
||||
name: generateUsername(),
|
||||
},
|
||||
where: {
|
||||
id: user.id,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// Get the admin list for the user's auth type.
|
||||
const adminForAccountType = adminUserMap.get(account.provider);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user