fix: pnpm 9+, patch @auth/typeorm-adapter not passing roles

.github/workflows/actions/setup/action.yml

@@ -9,7 +9,7 @@ runs:
   steps:
     - uses: pnpm/action-setup@v2
       with:
-        version: 8
+        version: 9.5.x
 
     - name: Use Node.js ${{ inputs.node-version }}
       uses: actions/setup-node@v3

apps/app/package.json

@@ -15,10 +15,12 @@
     "db:migrate": "cd ../../packages/graphql-api && pnpm run db:migrate"
   },
   "dependencies": {
-    "@alp/api-client": "*",
-    "@alp/core": "*",
+    "@alp/api-client": "workspace:*",
+    "@alp/core": "workspace:*",
+    "@alp/emails": "workspace:*",
+    "@alp/graphql-api": "workspace:*",
     "@as-integrations/next": "^3.0.0",
-    "@auth/typeorm-adapter": "^1.6.0",
+    "@auth/typeorm-adapter": "1.6.0",
     "@emotion/css": "^11.11.2",
     "@emotion/server": "^11.11.0",
     "@formatjs/intl-localematcher": "^0.4.2",

apps/app/src/config/auth.ts

@@ -4,12 +4,14 @@ import GoogleProvider from 'next-auth/providers/google';
 
 import { WelcomeEmail, sendEmail } from '@alp/emails';
 import { dataSourceOptions } from '@alp/graphql-api/data-source';
-import * as entities from '@alp/graphql-api/entity/auth';
+import { AccountEntity, SessionEntity, UserEntity, VerificationTokenEntity } from '@alp/graphql-api/entity/auth';
 import { UserRole } from '@alp/graphql-api/types';
 
 export const authOptions: NextAuthOptions = {
   // @ts-ignore
-  adapter: TypeORMAdapter(dataSourceOptions, { entities }),
+  adapter: TypeORMAdapter(dataSourceOptions, {
+    entities: { UserEntity, SessionEntity, AccountEntity, VerificationTokenEntity },
+  }),
   providers: [
     GoogleProvider({
       clientId: process.env['OAUTH_GOOGLE_CLIENT_ID'] ?? '',
@@ -28,10 +30,14 @@ export const authOptions: NextAuthOptions = {
   callbacks: {
     jwt({ token, user }) {
       // save role in JWT
-      if (user) token.role = user.role;
+      if (user) {
+        token.id = user.id;
+        token.role = user.role;
+      }
       return token;
     },
     session({ session, token }) {
+      session.user.id = token.id as string;
       session.user.role = token.role as UserRole;
       return session;
     },

apps/app/src/types/next-auth.d.ts

@@ -9,6 +9,7 @@ declare module 'next-auth' {
   interface Session {
     user: {
       role: UserRole;
+      id: string;
     } & DefaultSession['user'];
   }
 

package.json

@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@alp/internal-core": "*",
+    "@alp/internal-core": "workspace:*",
     "@faker-js/faker": "^8.0.2",
     "@nx/devkit": "^16.9.1",
     "@nx/eslint-plugin": "^16.9.1",
@@ -89,6 +89,9 @@
   "pnpm": {
     "overrides": {
       "superjson": "1.13.1"
+    },
+    "patchedDependencies": {
+      "@auth/typeorm-adapter@1.6.0": "patches/@auth__typeorm-adapter@1.6.0.patch"
     }
   }
 }

patches/@auth__typeorm-adapter@1.6.0.patch

@@ -0,0 +1,12 @@
+diff --git a/index.js b/index.js
+index f8d34785aa2c60c874ab0fa64766ba533d52befe..ffe861208b47c4ee5dc33ed37964d859e3b6dcfe 100644
+--- a/index.js
++++ b/index.js
+@@ -243,6 +243,7 @@ export function TypeORMAdapter(dataSource, options) {
+     const c = {
+         dataSource,
+         entities: {
++            ...dataSource.entities,
+             UserEntity: entities?.UserEntity ?? defaultEntities.UserEntity,
+             SessionEntity: entities?.SessionEntity ?? defaultEntities.SessionEntity,
+             AccountEntity: entities?.AccountEntity ?? defaultEntities.AccountEntity,