feat: enhance NextAuth types and update configuration for improved role management

correct types error eliminate duplicate next-auth.d.ts files

Author: jonphipps

…dmin-portal/src/app/types/next-auth.d.ts apps/admin-portal/next-auth-types.d.tsapps/admin-portal/src/app/types/next-auth.d.ts renamed to apps/admin-portal/next-auth-types.d.ts apps/admin-portal/src/app/types/next-auth.d.ts renamed to apps/admin-portal/next-auth-types.d.ts

@@ -1,20 +1,21 @@
-declare module 'next-auth' {
+// types/next-auth.d.ts
+import { DefaultSession } from "next-auth";
+
+declare module "next-auth" {
   interface Session {
     user: {
       roles?: string[];
       id: string;
       name?: string | null;
       email?: string | null;
       image?: string | null;
-    };
+    } & DefaultSession["user"];
   }
-  
   interface User {
-    login?: string;
+    roles?: string[];
   }
 }
-
-declare module '@auth/core/jwt' {
+declare module "next-auth/jwt" {
   interface JWT {
     roles?: string[];
     accessToken?: string;

apps/admin-portal/next-auth.d.ts

@@ -179,9 +179,9 @@ export function DocusaurusNavbar({ siteKey }: DocusaurusNavbarProps): React.JSX.
                         <div className="docusaurus-navbar__user-email">
                           {session.user.email}
                         </div>
-                        {session.user.roles && session.user.roles.length > 0 && (
+                                                {session.user.roles && session.user.roles.length > 0 && (
                           <div className="docusaurus-navbar__user-roles">
-                            {session.user.roles.join(', ')}
+                                                        {session.user.roles.join(', ')}
                           </div>
                         )}
                       </div>

apps/admin-portal/src/app/components/docusaurus-navbar.tsx

@@ -1,5 +1,5 @@
-import NextAuth from "next-auth"
-import GitHub from "next-auth/providers/github"
+import NextAuth from "next-auth";
+import GitHub from "next-auth/providers/github";
 
 export const { handlers, auth, signIn, signOut } = NextAuth({
   debug: process.env.NODE_ENV === "development",
@@ -105,7 +105,8 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
       return token;
     },
     async session({ session, token }: any) {
-      if (token.roles && session.user) {
+      if (session.user) {
+        session.user.id = token.sub;
         session.user.roles = token.roles as string[];
       }
       return session;

apps/admin-portal/src/app/lib/auth.ts

@@ -35,6 +35,7 @@
     "../../apps/admin-portal/.next/types/**/*.ts",
     "../../dist/apps/admin-portal/.next/types/**/*.ts",
     "next-env.d.ts",
+    "next-auth-types.d.ts",
     ".next/types/**/*.ts"
   ],
   "exclude": [

apps/admin-portal/tsconfig.json

@@ -361,7 +361,7 @@
     "jsonc-eslint-parser": "^2.1.0",
     "lint-staged": "^16.1.2",
     "npm-run-all": "^4.1.5",
-    "nx": "21.2.1",
+    "nx": "21.2.2",
     "nx-cloud": "^19.1.0",
     "playwright": "^1.52.0",
     "postcss": "^8.5.5",

package.json

@@ -52,7 +52,9 @@
     "**/*.ts",
     "**/*.tsx",
     "*.d.ts",
-    "plugins"
+    "plugins",
+    "types/**/*.d.ts",
+    "src/**/*"
   ],
   "exclude": [
     "node_modules",