diff --git a/apps/dispatch/next-env.d.ts b/apps/dispatch/next-env.d.ts index c4b7818f..1b3be084 100644 --- a/apps/dispatch/next-env.d.ts +++ b/apps/dispatch/next-env.d.ts @@ -1,6 +1,5 @@ /// /// -import "./.next/dev/types/routes.d.ts"; // NOTE: This file should not be edited // see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx b/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx index 4eae9184..27ccd5a7 100644 --- a/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx +++ b/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx @@ -704,23 +704,15 @@ export const AdminForm = ({
- {openBans.map((ban) => ( -
-

Account gelöscht

-
- ))} - {openTimebans.map((timeban) => ( -
-

- Dieser Account ist als gelöscht markiert, der Nutzer kann sich nicht mehr - anmelden. -

-
- ))} +
+

Account gelöscht

+
+
+

+ Dieser Account ist als gelöscht markiert, der Nutzer kann sich nicht mehr anmelden. +

+
-

- Achtung! Die Strafe(n) sind aktiv, die Rechte des Nutzers müssen nicht angepasst werden! -

)} {(user.CanonicalUser || (user.Duplicates && user.Duplicates.length > 0)) && ( diff --git a/apps/hub/app/api/discord-redirect/route.ts b/apps/hub/app/api/discord-redirect/route.ts index 52b12204..4bbfc924 100644 --- a/apps/hub/app/api/discord-redirect/route.ts +++ b/apps/hub/app/api/discord-redirect/route.ts @@ -1,6 +1,6 @@ import axios from "axios"; import { NextRequest, NextResponse } from "next/server"; -import { DiscordAccount, prisma } from "@repo/db"; +import { prisma } from "@repo/db"; import { getServerSession } from "../auth/[...nextauth]/auth"; import { setStandardName } from "../../../helper/discord"; import { getUserPenaltys } from "@repo/shared-components"; @@ -52,8 +52,7 @@ export const GET = async (req: NextRequest) => { }, }); - const discordObject = { - userId: session.user.id, + const discordData = { accessToken: authData.access_token, refreshToken: authData.refresh_token, discordId: discordUser.id, @@ -63,12 +62,19 @@ export const GET = async (req: NextRequest) => { globalName: discordUser.global_name || discordUser.username, verified: discordUser.verified, tokenType: authData.token_type, - } as DiscordAccount; + }; await prisma.discordAccount.upsert({ where: { discordId: discordUser.id }, - update: discordObject, // Updates if found - create: discordObject, // Creates if not found + update: discordData, // Updates if found + create: { + ...discordData, + User: { + connect: { + id: session.user.id, + }, + }, + }, // Creates if not found }); const user = await prisma.user.findUnique({ where: { id: session.user.id },