From 95ddd03763532658c620c50c698c14ed7cd01894 Mon Sep 17 00:00:00 2001 From: "homarr-renovate[bot]" <158783068+homarr-renovate[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 22:44:00 +0200 Subject: [PATCH] fix(deps): update dependency @auth/core to ^0.31.0 (#473) * fix(deps): update dependency @auth/core to ^0.31.0 * fix: typecheck issue * fix: more issues with types * fix: add newest next-auth beta version as types were changed and depend on each other * fix: format issues --------- Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com> Co-authored-by: Meier Lukas --- packages/auth/index.ts | 4 ++-- packages/auth/package.json | 4 ++-- packages/auth/session.ts | 2 +- pnpm-lock.yaml | 40 ++++++++++++++++++++++++++++++-------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/packages/auth/index.ts b/packages/auth/index.ts index a395302c3..0e6b90fd9 100644 --- a/packages/auth/index.ts +++ b/packages/auth/index.ts @@ -4,9 +4,9 @@ import type { GroupPermissionKey } from "@homarr/definitions"; import { createConfiguration } from "./configuration"; -export type { Session } from "next-auth"; +export type { Session } from "@auth/core/types"; -declare module "next-auth" { +declare module "@auth/core/types" { interface Session { user: { id: string; diff --git a/packages/auth/package.json b/packages/auth/package.json index 53f3c0acc..c83530437 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -22,13 +22,13 @@ }, "dependencies": { "@homarr/db": "workspace:^0.1.0", - "@auth/core": "^0.30.0", + "@auth/core": "^0.31.0", "@auth/drizzle-adapter": "^1.0.1", "@t3-oss/env-nextjs": "^0.10.1", "bcrypt": "^5.1.1", "cookies": "^0.9.1", "next": "^14.2.3", - "next-auth": "5.0.0-beta.17", + "next-auth": "5.0.0-beta.18", "react": "18.3.1", "react-dom": "18.3.1" }, diff --git a/packages/auth/session.ts b/packages/auth/session.ts index d7ab5b238..45b026859 100644 --- a/packages/auth/session.ts +++ b/packages/auth/session.ts @@ -1,5 +1,5 @@ import { randomUUID } from "crypto"; -import type { Session } from "next-auth"; +import type { Session } from "@auth/core/types"; import type { Database } from "@homarr/db"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c422fefb6..f7c8f2170 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -398,8 +398,8 @@ importers: packages/auth: dependencies: '@auth/core': - specifier: ^0.30.0 - version: 0.30.0 + specifier: ^0.31.0 + version: 0.31.0 '@auth/drizzle-adapter': specifier: ^1.0.1 version: 1.0.1 @@ -419,8 +419,8 @@ importers: specifier: ^14.2.3 version: 14.2.3(@babel/core@7.23.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.1) next-auth: - specifier: 5.0.0-beta.17 - version: 5.0.0-beta.17(next@14.2.3(@babel/core@7.23.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.1))(react@18.3.1) + specifier: 5.0.0-beta.18 + version: 5.0.0-beta.18(next@14.2.3(@babel/core@7.23.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.1))(react@18.3.1) react: specifier: 18.3.1 version: 18.3.1 @@ -999,6 +999,20 @@ packages: nodemailer: optional: true + '@auth/core@0.31.0': + resolution: {integrity: sha512-UKk3psvA1cRbk4/c9CkpWB8mdWrkKvzw0DmEYRsWolUQytQ2cRqx+hYuV6ZCsngw/xbj9hpmkZmAZEyq2g4fMg==} + peerDependencies: + '@simplewebauthn/browser': ^9.0.1 + '@simplewebauthn/server': ^9.0.2 + nodemailer: ^6.8.0 + peerDependenciesMeta: + '@simplewebauthn/browser': + optional: true + '@simplewebauthn/server': + optional: true + nodemailer: + optional: true + '@auth/drizzle-adapter@1.0.1': resolution: {integrity: sha512-E4np2F48p930q+YeQ5ipZPv/L+9gmQcB7g6NQQyux2wtanRNOXNW4TG8wMjSRfTzccNq161YZ8Fm5le/5snkGQ==} @@ -4278,8 +4292,8 @@ packages: resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==} engines: {node: '>= 0.4.0'} - next-auth@5.0.0-beta.17: - resolution: {integrity: sha512-XA/7JtAjOgDfAeotJPFUsFZGGItZwzZrxLt9Gc9fE7EchLk6zydZfuZ22Vvwixs3IilkN644D5IoD5tEOAFGCQ==} + next-auth@5.0.0-beta.18: + resolution: {integrity: sha512-x55L8wZb8PcPGCYA3e/l9tdpd7YL3FDuhas4W8pxq3PjrWJ9OoDxNN0otK9axJamJBbBgjfzTJjVQB6hXoe0ZQ==} peerDependencies: '@simplewebauthn/browser': ^9.0.1 '@simplewebauthn/server': ^9.0.2 @@ -5707,6 +5721,16 @@ snapshots: preact: 10.11.3 preact-render-to-string: 5.2.3(preact@10.11.3) + '@auth/core@0.31.0': + dependencies: + '@panva/hkdf': 1.1.1 + '@types/cookie': 0.6.0 + cookie: 0.6.0 + jose: 5.2.2 + oauth4webapi: 2.10.3 + preact: 10.11.3 + preact-render-to-string: 5.2.3(preact@10.11.3) + '@auth/drizzle-adapter@1.0.1': dependencies: '@auth/core': 0.30.0 @@ -9209,9 +9233,9 @@ snapshots: netmask@2.0.2: {} - next-auth@5.0.0-beta.17(next@14.2.3(@babel/core@7.23.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.1))(react@18.3.1): + next-auth@5.0.0-beta.18(next@14.2.3(@babel/core@7.23.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.1))(react@18.3.1): dependencies: - '@auth/core': 0.30.0 + '@auth/core': 0.31.0 next: 14.2.3(@babel/core@7.23.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.1) react: 18.3.1