diff --git a/apps/auth-proxy/package.json b/apps/auth-proxy/package.json index 82608ffd7..3ecf2abbb 100644 --- a/apps/auth-proxy/package.json +++ b/apps/auth-proxy/package.json @@ -11,7 +11,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@auth/core": "^0.19.0" + "@auth/core": "^0.20.0" }, "devDependencies": { "@acme/eslint-config": "workspace:^0.2.0", diff --git a/package.json b/package.json index b465c6580..42c8f3d9e 100644 --- a/package.json +++ b/package.json @@ -27,5 +27,10 @@ "turbo": "^1.11.3", "typescript": "^5.3.3" }, - "prettier": "@acme/prettier-config" + "prettier": "@acme/prettier-config", + "pnpm": { + "overrides": { + "@auth/core": "0.20.0" + } + } } diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts index d80454c81..8c29e18ad 100644 --- a/packages/auth/src/index.ts +++ b/packages/auth/src/index.ts @@ -24,12 +24,16 @@ export const { adapter: DrizzleAdapter(db, tableCreator), providers: [Discord], callbacks: { - session: ({ session, user }) => ({ - ...session, - user: { - ...session.user, - id: user.id, - }, - }), + session: (opts) => { + if (!("user" in opts)) throw "unreachable with session strategy"; + + return { + ...opts.session, + user: { + ...opts.session.user, + id: opts.user.id, + }, + }; + }, }, }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 724663936..9ec11b32d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + '@auth/core': 0.20.0 + importers: .: @@ -27,8 +30,8 @@ importers: apps/auth-proxy: dependencies: '@auth/core': - specifier: ^0.19.0 - version: 0.19.0 + specifier: 0.20.0 + version: 0.20.0 devDependencies: '@acme/eslint-config': specifier: workspace:^0.2.0 @@ -590,24 +593,8 @@ packages: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.18 - /@auth/core@0.18.4: - resolution: {integrity: sha512-GsNhsP1xE/3FoNS3dVkPjqRljLNJ4iyL2OLv3klQGNvw3bMpROFcK4lqhx7+pPHiamnVaYt2vg1xbB+lsNaevg==} - peerDependencies: - nodemailer: ^6.8.0 - peerDependenciesMeta: - nodemailer: - optional: true - dependencies: - '@panva/hkdf': 1.1.1 - cookie: 0.6.0 - jose: 5.1.3 - oauth4webapi: 2.4.0 - preact: 10.11.3 - preact-render-to-string: 5.2.3(preact@10.11.3) - dev: false - - /@auth/core@0.19.0: - resolution: {integrity: sha512-BkFg2SoNftMN6A2Sn2g1lLFLTO74qMtFKsZmSCEF9d1csqSaEXIv50k6OrfniODWi5tZP8bcfSxGodv75khlOA==} + /@auth/core@0.20.0: + resolution: {integrity: sha512-04lQH58H5d/9xQ63MOTDTOC7sXWYlr/RhJ97wfFLXzll7nYyCKbkrT3ZMdzdLC5O+qt90sQDK85TAtLlcZ2WBg==} peerDependencies: nodemailer: ^6.8.0 peerDependenciesMeta: @@ -626,7 +613,7 @@ packages: /@auth/drizzle-adapter@0.3.12: resolution: {integrity: sha512-6+XCHrDXglKPWKRmHuUA6f27WM40v3+MQyUFf2d+JsA0tuBuwOw6IPp1ycxvOODM6milHyKcjowUfqWW9F9f9Q==} dependencies: - '@auth/core': 0.19.0 + '@auth/core': 0.20.0 transitivePeerDependencies: - nodemailer dev: false @@ -11057,7 +11044,7 @@ packages: nodemailer: optional: true dependencies: - '@auth/core': 0.18.4 + '@auth/core': 0.20.0 next: 14.0.4(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 dev: false