From 6e540f77db8ca10ed0939cfa6d022f87f8fb1771 Mon Sep 17 00:00:00 2001 From: "homarr-renovate[bot]" <158783068+homarr-renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 05:34:25 +0000 Subject: [PATCH 1/3] fix(deps): update dependency @auth/core to ^0.32.0 --- packages/auth/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 2b52639c6..b8b4794a3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@homarr/db": "workspace:^0.1.0", - "@auth/core": "^0.31.0", + "@auth/core": "^0.32.0", "@auth/drizzle-adapter": "^1.2.0", "@t3-oss/env-nextjs": "^0.10.1", "bcrypt": "^5.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 95255d33f..6b827d567 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -477,8 +477,8 @@ importers: packages/auth: dependencies: '@auth/core': - specifier: ^0.31.0 - version: 0.31.0 + specifier: ^0.32.0 + version: 0.32.0 '@auth/drizzle-adapter': specifier: ^1.2.0 version: 1.2.0 From 29062a440ea5f539899ffbabee8b7164eb2cfa23 Mon Sep 17 00:00:00 2001 From: "homarr-renovate[bot]" <158783068+homarr-renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:49:02 +0000 Subject: [PATCH 2/3] fix(deps): update dependency @auth/core to ^0.32.0 --- packages/auth/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 2b52639c6..b8b4794a3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@homarr/db": "workspace:^0.1.0", - "@auth/core": "^0.31.0", + "@auth/core": "^0.32.0", "@auth/drizzle-adapter": "^1.2.0", "@t3-oss/env-nextjs": "^0.10.1", "bcrypt": "^5.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 17c714388..7466bc6b2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -477,8 +477,8 @@ importers: packages/auth: dependencies: '@auth/core': - specifier: ^0.31.0 - version: 0.31.0 + specifier: ^0.32.0 + version: 0.32.0 '@auth/drizzle-adapter': specifier: ^1.2.0 version: 1.2.0 From 004c628ecb6011b8bae7dc3e195427a9497b7b2f Mon Sep 17 00:00:00 2001 From: Meier Lukas Date: Sun, 2 Jun 2024 10:58:26 +0200 Subject: [PATCH 3/3] fix: type issues with next-auth types --- apps/nextjs/src/components/user-avatar-menu.tsx | 2 +- packages/auth/index.ts | 6 +++--- packages/auth/permissions/board-permissions.ts | 2 +- packages/auth/permissions/test/board-permissions.spec.ts | 2 +- packages/auth/session.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/nextjs/src/components/user-avatar-menu.tsx b/apps/nextjs/src/components/user-avatar-menu.tsx index 0cd5e0726..a9f47d9ab 100644 --- a/apps/nextjs/src/components/user-avatar-menu.tsx +++ b/apps/nextjs/src/components/user-avatar-menu.tsx @@ -72,7 +72,7 @@ export const UserAvatarMenu = ({ children }: UserAvatarMenuProps) => { <> } > {t("preferences")} diff --git a/packages/auth/index.ts b/packages/auth/index.ts index eed6a80b9..b8cbc55a1 100644 --- a/packages/auth/index.ts +++ b/packages/auth/index.ts @@ -1,12 +1,12 @@ -import type { DefaultSession } from "@auth/core/types"; +import type { DefaultSession } from "next-auth"; import type { GroupPermissionKey } from "@homarr/definitions"; import { createConfiguration } from "./configuration"; -export type { Session } from "@auth/core/types"; +export type { Session } from "next-auth"; -declare module "@auth/core/types" { +declare module "next-auth" { interface Session { user: { id: string; diff --git a/packages/auth/permissions/board-permissions.ts b/packages/auth/permissions/board-permissions.ts index a3adbe8f6..35bac53ab 100644 --- a/packages/auth/permissions/board-permissions.ts +++ b/packages/auth/permissions/board-permissions.ts @@ -1,4 +1,4 @@ -import type { Session } from "@auth/core/types"; +import type { Session } from "next-auth"; export type BoardPermissionsProps = ( | { diff --git a/packages/auth/permissions/test/board-permissions.spec.ts b/packages/auth/permissions/test/board-permissions.spec.ts index 24b180836..05b98a039 100644 --- a/packages/auth/permissions/test/board-permissions.spec.ts +++ b/packages/auth/permissions/test/board-permissions.spec.ts @@ -1,4 +1,4 @@ -import type { Session } from "@auth/core/types"; +import type { Session } from "next-auth"; import { describe, expect, test } from "vitest"; import { getPermissionsWithChildren } from "@homarr/definitions"; diff --git a/packages/auth/session.ts b/packages/auth/session.ts index 3e893db04..02ef573df 100644 --- a/packages/auth/session.ts +++ b/packages/auth/session.ts @@ -1,5 +1,5 @@ import { randomUUID } from "crypto"; -import type { Session } from "@auth/core/types"; +import type { Session } from "next-auth"; import type { Database } from "@homarr/db";