Merge remote-tracking branch 'upstream/dev' into feature-i18n

This commit is contained in:
Marvin
2025-06-05 04:41:28 +00:00
228 changed files with 1963 additions and 847 deletions

View File

@@ -1,7 +1,7 @@
import { cookies } from "next/headers";
import ValidateOidcToken from "./ValidateOidcToken";
import { idp } from "@server/db/schemas";
import db from "@server/db";
import { idp } from "@server/db";
import { db } from "@server/db";
import { eq } from "drizzle-orm";
import { getTranslations } from "next-intl/server";

View File

@@ -6,8 +6,8 @@ import DashboardLoginForm from "./DashboardLoginForm";
import { Mail } from "lucide-react";
import { pullEnv } from "@app/lib/pullEnv";
import { cleanRedirect } from "@app/lib/cleanRedirect";
import db from "@server/db";
import { idp } from "@server/db/schemas";
import { db } from "@server/db";
import { idp } from "@server/db";
import { LoginFormIDP } from "@app/components/LoginForm";
import { getTranslations } from "next-intl/server";

View File

@@ -14,8 +14,8 @@ import ResourceAccessDenied from "./ResourceAccessDenied";
import AccessToken from "./AccessToken";
import { pullEnv } from "@app/lib/pullEnv";
import { LoginFormIDP } from "@app/components/LoginForm";
import db from "@server/db";
import { idp } from "@server/db/schemas";
import { db } from "@server/db";
import { idp } from "@server/db";
export default async function ResourceAuthPage(props: {
params: Promise<{ resourceId: number }>;