+
{flexRender(header.column.columnDef.header, header.getContext())}
{header.column.getIsSorted() === "asc" && }
{header.column.getIsSorted() === "desc" && }
@@ -75,7 +75,7 @@ export default function SortableTable({
))}
{table.getRowModel().rows.length === 0 && (
- |
+ |
Keine Daten gefunden
|
@@ -104,6 +104,8 @@ export const RowsPerPage = ({
+
+
);
};
diff --git a/apps/hub/app/api/discord-redirect/route.ts b/apps/hub/app/api/discord-redirect/route.ts
index daff0752..52b12204 100644
--- a/apps/hub/app/api/discord-redirect/route.ts
+++ b/apps/hub/app/api/discord-redirect/route.ts
@@ -3,6 +3,8 @@ import { NextRequest, NextResponse } from "next/server";
import { DiscordAccount, prisma } from "@repo/db";
import { getServerSession } from "../auth/[...nextauth]/auth";
import { setStandardName } from "../../../helper/discord";
+import { getUserPenaltys } from "@repo/shared-components";
+import { markDuplicate } from "(app)/admin/user/action";
export const GET = async (req: NextRequest) => {
const session = await getServerSession();
@@ -77,6 +79,29 @@ export const GET = async (req: NextRequest) => {
userId: user.id,
});
}
+ const formerDiscordAccount = await prisma.formerDiscordAccount.findMany({
+ where: {
+ discordId: discordUser.id,
+ userId: {
+ not: session.user.id,
+ },
+ User: {
+ canonicalUserId: null,
+ },
+ },
+ include: { User: true },
+ });
+
+ // Account is suspicious to multiaccounting
+ if (formerDiscordAccount.length > 0) {
+ formerDiscordAccount.forEach(async (account) => {
+ await markDuplicate({
+ duplicateUserId: session.user.id,
+ canonicalPublicId: account.User!.publicId,
+ reason: "Multiaccounting Verdacht, gleicher Discord Account wie ein anderer Nutzer.",
+ });
+ });
+ }
return NextResponse.redirect(`${process.env.NEXT_PUBLIC_HUB_URL}/settings`);
} catch (error) {
diff --git a/apps/hub/next.config.ts b/apps/hub/next.config.ts
index 462b9e72..b8d111d6 100644
--- a/apps/hub/next.config.ts
+++ b/apps/hub/next.config.ts
@@ -1,6 +1,10 @@
/** @type {import('next').NextConfig} */
/* const removeImports = require("next-remove-imports")(); */
/* const nextConfig = removeImports({}); */
-const nextConfig = {};
+const nextConfig = {
+ images: {
+ domains: ["cdn.discordapp.com"],
+ },
+};
export default nextConfig;
diff --git a/packages/database/package.json b/packages/database/package.json
index 9dbc7139..c197f985 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -8,10 +8,10 @@
"schema": "./prisma/schema/"
},
"scripts": {
- "generate": "npx prisma generate && npx prisma generate zod",
- "migrate": "npx prisma migrate dev",
- "deploy": "npx prisma migrate deploy",
- "dev": "npx prisma studio --browser none"
+ "generate": "npx prisma@6.12.0 generate && npx prisma@6.12.0 generate zod",
+ "migrate": "npx prisma@6.12.0 migrate dev",
+ "deploy": "npx prisma@6.12.0 migrate deploy",
+ "dev": "npx prisma@6.12.0 studio --browser none"
},
"exports": {
".": "./index.ts",
diff --git a/packages/database/prisma/schema/migrations/20260105235037_added_former_discord_account_schema/migration.sql b/packages/database/prisma/schema/migrations/20260105235037_added_former_discord_account_schema/migration.sql
new file mode 100644
index 00000000..e98bc9fe
--- /dev/null
+++ b/packages/database/prisma/schema/migrations/20260105235037_added_former_discord_account_schema/migration.sql
@@ -0,0 +1,33 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `user_id` on the `discord_accounts` table. All the data in the column will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "discord_accounts" DROP CONSTRAINT "discord_accounts_user_id_fkey";
+
+-- AlterTable
+ALTER TABLE "discord_accounts" RENAME COLUMN "user_id" TO "userId";
+
+-- CreateTable
+CREATE TABLE "former_discord_accounts" (
+ "id" SERIAL NOT NULL,
+ "discord_id" TEXT NOT NULL,
+ "user_id" TEXT NOT NULL,
+ "removed_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+ CONSTRAINT "former_discord_accounts_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "former_discord_accounts_discord_id_key" ON "former_discord_accounts"("discord_id");
+
+-- AddForeignKey
+ALTER TABLE "former_discord_accounts" ADD CONSTRAINT "former_discord_accounts_discord_id_fkey" FOREIGN KEY ("discord_id") REFERENCES "discord_accounts"("discord_id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "former_discord_accounts" ADD CONSTRAINT "former_discord_accounts_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "discord_accounts" ADD CONSTRAINT "discord_accounts_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/database/prisma/schema/migrations/20260106000534_id_handling_former_dc_acc/migration.sql b/packages/database/prisma/schema/migrations/20260106000534_id_handling_former_dc_acc/migration.sql
new file mode 100644
index 00000000..e44da0cb
--- /dev/null
+++ b/packages/database/prisma/schema/migrations/20260106000534_id_handling_former_dc_acc/migration.sql
@@ -0,0 +1,35 @@
+/*
+ Warnings:
+
+ - You are about to drop the `former_discord_accounts` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "former_discord_accounts" DROP CONSTRAINT "former_discord_accounts_discord_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "former_discord_accounts" DROP CONSTRAINT "former_discord_accounts_user_id_fkey";
+
+-- AlterTable
+ALTER TABLE "discord_accounts" ALTER COLUMN "userId" DROP NOT NULL;
+
+-- DropTable
+DROP TABLE "former_discord_accounts";
+
+-- CreateTable
+CREATE TABLE "FormerDiscordAccount" (
+ "discord_id" TEXT NOT NULL,
+ "user_id" TEXT NOT NULL,
+ "removed_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+ CONSTRAINT "FormerDiscordAccount_pkey" PRIMARY KEY ("discord_id","user_id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "FormerDiscordAccount_discord_id_key" ON "FormerDiscordAccount"("discord_id");
+
+-- AddForeignKey
+ALTER TABLE "FormerDiscordAccount" ADD CONSTRAINT "FormerDiscordAccount_discord_id_fkey" FOREIGN KEY ("discord_id") REFERENCES "discord_accounts"("discord_id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "FormerDiscordAccount" ADD CONSTRAINT "FormerDiscordAccount_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/database/prisma/schema/migrations/20260106001030_unique_user_per_discord_account/migration.sql b/packages/database/prisma/schema/migrations/20260106001030_unique_user_per_discord_account/migration.sql
new file mode 100644
index 00000000..04197c6d
--- /dev/null
+++ b/packages/database/prisma/schema/migrations/20260106001030_unique_user_per_discord_account/migration.sql
@@ -0,0 +1,8 @@
+/*
+ Warnings:
+
+ - A unique constraint covering the columns `[userId]` on the table `discord_accounts` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "discord_accounts_userId_key" ON "discord_accounts"("userId");
diff --git a/packages/database/prisma/schema/user.prisma b/packages/database/prisma/schema/user.prisma
index 820115e1..80b9bc9f 100644
--- a/packages/database/prisma/schema/user.prisma
+++ b/packages/database/prisma/schema/user.prisma
@@ -68,7 +68,6 @@ model User {
duplicateReason String? @map(name: "duplicate_reason")
// relations:
oauthTokens OAuthToken[]
- discordAccounts DiscordAccount[]
participants Participant[]
EventAppointmentUser EventAppointment[] @relation("EventAppointmentUser")
EventAppointment EventAppointment[]
@@ -86,13 +85,26 @@ model User {
CreatedPenalties Penalty[] @relation("CreatedPenalties")
Bookings Booking[]
+ DiscordAccount DiscordAccount?
+ FormerDiscordAccounts FormerDiscordAccount[]
+
@@map(name: "users")
}
+model FormerDiscordAccount {
+ discordId String @unique @map(name: "discord_id")
+ userId String @map(name: "user_id")
+ removedAt DateTime @default(now()) @map(name: "removed_at")
+
+ DiscordAccount DiscordAccount? @relation(fields: [discordId], references: [discordId], onDelete: SetNull)
+ User User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+ @@id([discordId, userId])
+}
+
model DiscordAccount {
id Int @id @default(autoincrement())
discordId String @unique @map(name: "discord_id")
- userId String @map(name: "user_id")
email String @map(name: "email")
username String @map(name: "username")
avatar String? @map(name: "avatar")
@@ -104,8 +116,10 @@ model DiscordAccount {
createdAt DateTime @default(now()) @map(name: "created_at")
updatedAt DateTime @default(now()) @map(name: "updated_at")
- // relations:
- user User @relation(fields: [userId], references: [id], onDelete: Cascade) // Beziehung zu User
+ // Related User
+ userId String? @unique
+ User User? @relation(fields: [userId], references: [id], onDelete: SetNull)
+ formerDiscordAccount FormerDiscordAccount?
@@map(name: "discord_accounts")
}