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:
Keith Stevens
2023-01-17 21:12:48 +01:00
committed by GitHub
parent 6b82b2cd13
commit 0a36e459d7
4 changed files with 30 additions and 5 deletions
+2 -2
View File
@@ -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,
+16 -3
View File
@@ -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);