chore(dev): Improve edge compatibility and some other small changes

CrawlerCode · CrawlerCode · commit d5e5d9e959aa · 2025-03-26T22:02:21.000+01:00
- Split configs for edge and node specific configs
- Send nodemailer emails using payload email adapter
- Add payload email adapter
- Add discord provider
- Reject users with expired session in authorized callback
- Remove access_token from account
- Add session createdAtField depending on authjs session strategy
diff --git a/packages/dev/.env.example b/packages/dev/.env.example
@@ -13,5 +13,5 @@ AUTH_KEYCLOAK_ISSUER=http://localhost:8080/realms/myrealm
 AUTH_KEYCLOAK_ID=client-id
 AUTH_KEYCLOAK_SECRET=
 
-EMAIL_SERVER=
-EMAIL_FROM=
+AUTH_DISCORD_ID=
+AUTH_DISCORD_SECRET=
diff --git a/packages/dev/package.json b/packages/dev/package.json
@@ -5,6 +5,7 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "dev": "next dev -p 5000",
     "dev:turbo": "next dev -p 5000 --turbopack",
     "payload": "payload",
     "generate:types": "payload generate:types",
diff --git a/packages/dev/project.json b/packages/dev/project.json
@@ -3,11 +3,6 @@
   "sourceRoot": "packages/dev/src",
   "projectType": "application",
   "targets": {
-    "dev": {
-      "options": {
-        "port": 5000
-      }
-    },
     "start": {
       "options": {
         "port": 5000
diff --git a/packages/dev/src/auth/base.config.ts b/packages/dev/src/auth/base.config.ts
@@ -2,11 +2,8 @@ import jwt from "jsonwebtoken";
 import type { NextAuthConfig } from "next-auth";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import type { JWT } from "next-auth/jwt";
-import github from "next-auth/providers/github";
-import keycloak from "next-auth/providers/keycloak";
-import nodemailer from "next-auth/providers/nodemailer";
 import type { PayloadAuthjsUser } from "payload-authjs";
-import type { User as PayloadUser } from "./payload-types";
+import type { User as PayloadUser } from "../payload-types";
 
 declare module "next-auth" {
   // eslint-disable-next-line @typescript-eslint/no-empty-object-type
@@ -27,68 +24,16 @@ declare module "next-auth/jwt" {
     > {}
 }
 
+export const SESSION_STRATEGY: NonNullable<NonNullable<NextAuthConfig["session"]>["strategy"]> =
+  "jwt";
+
 export const authConfig: NextAuthConfig = {
   theme: { logo: "https://authjs.dev/img/logo-sm.png" },
-  providers: [
-    github({
-      allowDangerousEmailAccountLinking: true,
-      /**
-       * Add additional fields to the user on first sign in
-       */
-      profile(profile) {
-        return {
-          // Default fields (@see https://github.com/nextauthjs/next-auth/blob/main/packages/core/src/providers/github.ts#L176)
-          id: profile.id.toString(),
-          name: profile.name ?? profile.login,
-          email: profile.email,
-          image: profile.avatar_url,
-          // Custom fields
-          additionalUserDatabaseField: `Create by github provider profile callback at ${new Date().toISOString()}`,
-        };
-      },
-      account(tokens) {
-        return {
-          ...tokens,
-          additionalAccountDatabaseField: `Create by github provider profile callback at ${new Date().toISOString()}`,
-        };
-      },
-    }),
-    keycloak({
-      allowDangerousEmailAccountLinking: true,
-      /**
-       * Add additional fields to the user on first sign in
-       */
-      profile(profile) {
-        return {
-          // Default fields
-          id: profile.sub,
-          name: profile.name,
-          email: profile.email,
-          image: profile.picture,
-          // Custom fields
-          locale: profile.locale,
-          additionalUserDatabaseField: `Create by keycloak provider profile callback at ${new Date().toISOString()}`,
-        };
-      },
-      account(tokens) {
-        return {
-          ...tokens,
-          additionalAccountDatabaseField: `Create by keycloak provider profile callback at ${new Date().toISOString()}`,
-        };
-      },
-    }),
-    nodemailer({
-      server: process.env.EMAIL_SERVER,
-      from: process.env.EMAIL_FROM,
-      sendVerificationRequest: ({ url }) => {
-        console.log("nodemailer:", url);
-      },
-    }),
-  ],
+  providers: [],
   session: {
-    strategy: "jwt",
-    //maxAge: 60 * 2 + 30, // 2.5 minutes
-    //updateAge: 60, // 1 minute
+    strategy: SESSION_STRATEGY,
+    maxAge: 60 * 15, // 15 minutes
+    updateAge: 60, // 1 minute
   },
   callbacks: {
     jwt: ({ token, user, account, trigger }) => {
@@ -164,8 +109,17 @@ export const authConfig: NextAuthConfig = {
       return session;
     },
     authorized: ({ auth }) => {
-      // Logged in users are authenticated, otherwise redirect to login page
-      return !!auth;
+      // User is authenticated
+      if (!auth?.user) {
+        return false;
+      }
+
+      // Session in not expired
+      if (new Date() >= new Date(auth.expires)) {
+        return false;
+      }
+
+      return true;
     },
   },
 };
diff --git a/packages/dev/src/auth/edge.config.ts b/packages/dev/src/auth/edge.config.ts
@@ -0,0 +1,15 @@
+import type { NextAuthConfig } from "next-auth";
+import { authConfig } from "./base.config";
+import { githubProvider } from "./providers/github";
+import { keycloakProvider } from "./providers/keycloak";
+import { discordProvider } from "./providers/discord";
+
+/**
+ * Edge compatible auth config
+ *
+ * @see https://authjs.dev/guides/edge-compatibility
+ */
+export const edgeAuthConfig: NextAuthConfig = {
+  ...authConfig,
+  providers: [githubProvider, keycloakProvider, discordProvider],
+};
diff --git a/packages/dev/src/auth/index.ts b/packages/dev/src/auth/index.ts
@@ -1,11 +1,12 @@
 import payloadConfig from "@payload-config";
 import NextAuth from "next-auth";
+import { getPayload } from "payload";
 import { withPayload } from "payload-authjs";
-import { authConfig } from "./auth.config";
+import { nodeAuthConfig } from "./node.config";
 
 export const { handlers, signIn, signOut, auth } = NextAuth(
-  withPayload(authConfig, {
-    payloadConfig,
+  withPayload(nodeAuthConfig, {
+    payload: getPayload({ config: payloadConfig }),
     events: {
       /**
        * Update user on every sign in
diff --git a/packages/dev/src/auth/node.config.ts b/packages/dev/src/auth/node.config.ts
@@ -0,0 +1,11 @@
+import type { NextAuthConfig } from "next-auth";
+import { authConfig } from "./base.config";
+import { discordProvider } from "./providers/discord";
+import { githubProvider } from "./providers/github";
+import { keycloakProvider } from "./providers/keycloak";
+import { nodemailerProvider } from "./providers/nodemailer";
+
+export const nodeAuthConfig: NextAuthConfig = {
+  ...authConfig,
+  providers: [githubProvider, keycloakProvider, discordProvider, nodemailerProvider],
+};
diff --git a/packages/dev/src/auth/providers/discord.ts b/packages/dev/src/auth/providers/discord.ts
@@ -0,0 +1,22 @@
+import discord from "next-auth/providers/discord";
+
+export const discordProvider = discord({
+  allowDangerousEmailAccountLinking: true,
+  /**
+   * Add additional fields to the user on first sign in
+   */
+  async profile(profile, tokens) {
+    return {
+      // Default fields from discord provider
+      ...(await discord({}).profile!(profile, tokens)),
+      // Custom fields
+      additionalUserDatabaseField: `Create by discord provider profile callback at ${new Date().toISOString()}`,
+    };
+  },
+  account(tokens) {
+    return {
+      ...tokens,
+      additionalAccountDatabaseField: `Create by discord provider profile callback at ${new Date().toISOString()}`,
+    };
+  },
+});
diff --git a/packages/dev/src/auth/providers/github.ts b/packages/dev/src/auth/providers/github.ts
@@ -0,0 +1,25 @@
+import github from "next-auth/providers/github";
+
+export const githubProvider = github({
+  allowDangerousEmailAccountLinking: true,
+  /**
+   * Add additional fields to the user on first sign in
+   */
+  profile(profile) {
+    return {
+      // Default fields (@see https://github.com/nextauthjs/next-auth/blob/main/packages/core/src/providers/github.ts#L176)
+      id: profile.id.toString(),
+      name: profile.name ?? profile.login,
+      email: profile.email,
+      image: profile.avatar_url,
+      // Custom fields
+      additionalUserDatabaseField: `Create by github provider profile callback at ${new Date().toISOString()}`,
+    };
+  },
+  account(tokens) {
+    return {
+      ...tokens,
+      additionalAccountDatabaseField: `Create by github provider profile callback at ${new Date().toISOString()}`,
+    };
+  },
+});
diff --git a/packages/dev/src/auth/providers/keycloak.ts b/packages/dev/src/auth/providers/keycloak.ts
@@ -0,0 +1,26 @@
+import keycloak from "next-auth/providers/keycloak";
+
+export const keycloakProvider = keycloak({
+  allowDangerousEmailAccountLinking: true,
+  /**
+   * Add additional fields to the user on first sign in
+   */
+  profile(profile) {
+    return {
+      // Default fields
+      id: profile.sub,
+      name: profile.name,
+      email: profile.email,
+      image: profile.picture,
+      // Custom fields
+      locale: profile.locale,
+      additionalUserDatabaseField: `Create by keycloak provider profile callback at ${new Date().toISOString()}`,
+    };
+  },
+  account(tokens) {
+    return {
+      ...tokens,
+      additionalAccountDatabaseField: `Create by keycloak provider profile callback at ${new Date().toISOString()}`,
+    };
+  },
+});
diff --git a/packages/dev/src/auth/providers/nodemailer.ts b/packages/dev/src/auth/providers/nodemailer.ts
@@ -0,0 +1,20 @@
+import payloadConfig from "@payload-config";
+import nodemailer from "next-auth/providers/nodemailer";
+import { getPayload } from "payload";
+
+export const nodemailerProvider = nodemailer({
+  server: "smtp://dummy:587",
+  from: "payload-authjs@example.com",
+  sendVerificationRequest: async ({ identifier, url }) => {
+    const payload = await getPayload({
+      config: payloadConfig,
+    });
+
+    // Send the email using payload
+    await payload.sendEmail({
+      to: identifier,
+      subject: "Sign in to your account",
+      text: `To sign in to your account, click the link below: ${url}`,
+    });
+  },
+});
diff --git a/packages/dev/src/middleware.example.ts b/packages/dev/src/middleware.example.ts
@@ -0,0 +1,8 @@
+import NextAuth from "next-auth";
+import { edgeAuthConfig } from "./auth/edge.config";
+
+export const { auth: middleware } = NextAuth(edgeAuthConfig);
+
+export const config = {
+  matcher: ["/((?!api|_next/static|_next/image|favicon.ico).*)"],
+};
diff --git a/packages/dev/src/payload-types.ts b/packages/dev/src/payload-types.ts
@@ -133,7 +133,6 @@ export interface User {
         provider: string;
         providerAccountId: string;
         type: string;
-        access_token?: string | null;
         additionalAccountDatabaseField: string;
         createdAt: string;
       }[]
@@ -254,7 +253,6 @@ export interface UsersSelect<T extends boolean = true> {
         provider?: T;
         providerAccountId?: T;
         type?: T;
-        access_token?: T;
         additionalAccountDatabaseField?: T;
         createdAt?: T;
       };
diff --git a/packages/dev/src/payload.config.ts b/packages/dev/src/payload.config.ts
@@ -5,7 +5,7 @@ import { authjsPlugin } from "payload-authjs";
 import { build as buildLogger } from "pino-pretty";
 import sharp from "sharp";
 import { fileURLToPath } from "url";
-import { authConfig } from "./auth.config";
+import { nodeAuthConfig } from "./auth/node.config";
 import Examples from "./payload/collections/examples";
 import Users from "./payload/collections/users";
 
@@ -42,6 +42,15 @@ export default buildConfig({
       connectionString: process.env.DATABASE_URI || "",
     },
   }),
+  email: ({ payload }) => ({
+    name: "logger",
+    defaultFromName: "Payload Auth.js",
+    defaultFromAddress: "payload-authjs@example.com",
+    sendEmail: args => {
+      payload.logger.info(args, "Sending email");
+      return Promise.resolve();
+    },
+  }),
   sharp,
-  plugins: [authjsPlugin({ authjsConfig: authConfig })],
+  plugins: [authjsPlugin({ authjsConfig: nodeAuthConfig })],
 });
diff --git a/packages/dev/src/payload/collections/users.ts b/packages/dev/src/payload/collections/users.ts
@@ -1,4 +1,5 @@
-import type { CollectionConfig } from "payload";
+import { SESSION_STRATEGY } from "@/auth/base.config";
+import type { CollectionConfig, Field } from "payload";
 import { createdAtField } from "../fields/createdAt";
 
 const Users: CollectionConfig = {
@@ -98,11 +99,6 @@ const Users: CollectionConfig = {
           type: "text",
           label: "Account Provider", // Add label to provider field
         },
-        // Add access_token field
-        {
-          name: "access_token",
-          type: "text",
-        },
         // Add custom field
         {
           name: "additionalAccountDatabaseField",
@@ -112,11 +108,15 @@ const Users: CollectionConfig = {
         createdAtField,
       ],
     },
-    /* {
-      name: "sessions",
-      type: "array",
-      fields: [createdAtField],
-    }, */
+    ...(SESSION_STRATEGY === "database"
+      ? [
+          {
+            name: "sessions",
+            type: "array",
+            fields: [createdAtField],
+          } satisfies Field,
+        ]
+      : []),
     {
       name: "verificationTokens",
       type: "array",
