feat: simplify Adapter API

.gitignore

@@ -51,6 +51,8 @@ app/next-auth
 app/dist/css
 app/package-lock.json
 app/yarn.lock
+app/prisma/migrations
+app/prisma/dev.db*
 
 # VS
 /.vs/slnx.sqlite-journal

app/.env.local.example

@@ -7,7 +7,7 @@ NEXTAUTH_URL=http://localhost:3000
 # https://generate-secret.vercel.app/32 to generate a secret.
 # Note: Changing a secret may invalidate existing sessions
 # and/or verification tokens.
-SECRET= 
+SECRET=secret
 
 AUTH0_ID=
 AUTH0_SECRET=
@@ -24,15 +24,4 @@ TWITCH_ID=
 TWITCH_SECRET=
 
 TWITTER_ID=
-TWITTER_SECRET=
-
-# Example configuration for a Gmail account (will need SMTP enabled)
-EMAIL_SERVER=smtps://user@gmail.com:password@smtp.gmail.com:465
-EMAIL_FROM=user@gmail.com
-
-# Note: If using with Prisma adapter, you need to use a `.env`
-# file rather than a `.env.local` file to configure env vars.
-# Postgres: DATABASE_URL=postgres://nextauth:password@127.0.0.1:5432/nextauth?synchronize=true
-# MySQL:    DATABASE_URL=mysql://nextauth:password@127.0.0.1:3306/nextauth?synchronize=true
-# MongoDB:  DATABASE_URL=mongodb://nextauth:password@127.0.0.1:27017/nextauth?synchronize=true
-DATABASE_URL=
+TWITTER_SECRET=

app/next-env.d.ts

@@ -1,2 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/types/global" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.

app/package.json

@@ -10,17 +10,21 @@
     "copy:css": "cpx \"../dist/css/**/*\" dist/css --watch",
     "watch:css": "cd .. && npm run watch:css",
     "dev:css": "npm-run-all --parallel watch:css copy:css",
-    "start": "next start"
+    "start": "next start",
+    "start:email": "npx fake-smtp-server"
   },
   "license": "ISC",
   "dependencies": {
-    "next": "^11.0.1",
-    "nodemailer": "^6.6.1",
+    "@prisma/client": "^2.29.1",
+    "fake-smtp-server": "^0.8.0",
+    "next": "^11.1.0",
+    "nodemailer": "^6.6.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "cpx": "^1.5.0",
-    "npm-run-all": "^4.1.5"
+    "npm-run-all": "^4.1.5",
+    "prisma": "^2.29.1"
   }
 }

app/pages/api/auth/[...nextauth].js → app/pages/api/auth/[...nextauth].ts

@@ -16,14 +16,23 @@ import LineProvider from "next-auth/providers/line"
 import LinkedInProvider from "next-auth/providers/linkedin"
 import MailchimpProvider from "next-auth/providers/mailchimp"
 import DiscordProvider from "next-auth/providers/discord"
-import OneLoginProvider from "next-auth/providers/onelogin"
+import { PrismaAdapter } from "@next-auth/prisma-adapter"
+import { PrismaClient } from "@prisma/client"
+const prisma = new PrismaClient()
 
 export default NextAuth({
+  adapter: PrismaAdapter(prisma),
   providers: [
     // E-mail
+    // Start fake e-mail server with `npm run start:email`
     EmailProvider({
-      server: process.env.EMAIL_SERVER,
-      from: process.env.EMAIL_FROM,
+      server: {
+        host: "127.0.0.1",
+        auth: null,
+        secure: false,
+        port: 1025,
+        tls: { rejectUnauthorized: false },
+      },
     }),
     // Credentials
     CredentialsProvider({
@@ -34,7 +43,6 @@ export default NextAuth({
       async authorize(credentials, req) {
         if (credentials.password === "password") {
           return {
-            id: 1,
             name: "Fill Murray",
             email: "bill@fillmurray.com",
             image: "https://www.fillmurray.com/64/64",
@@ -107,12 +115,10 @@ export default NextAuth({
       clientId: process.env.DISCORD_ID,
       clientSecret: process.env.DISCORD_SECRET,
     }),
-    OneLoginProvider({
-      clientId: process.env.ONELOGIN_ID,
-      clientSecret: process.env.ONELOGIN_SECRET,
-      issuer: process.env.ONELOGIN_ISSUER,
-    }),
   ],
+  session: {
+    jwt: true,
+  },
   jwt: {
     encryption: true,
     secret: process.env.SECRET,

app/prisma/schema.prisma

@@ -1,63 +1,57 @@
-generator client {
-  provider = "prisma-client-js"
+datasource db {
+  provider = "sqlite"
+  url      = "file:./dev.db"
 }
 
-datasource db {
-  provider = "postgresql"
-  url      = env("DATABASE_URL")
+generator client {
+  provider = "prisma-client-js"
 }
 
 model Account {
-  id                 Int       @default(autoincrement()) @id
-  compoundId         String    @unique @map(name: "compound_id")
-  userId             Int       @map(name: "user_id")
-  providerType       String    @map(name: "provider_type")
-  providerId         String    @map(name: "provider_id")
-  providerAccountId  String    @map(name: "provider_account_id")
-  refreshToken       String?   @map(name: "refresh_token")
-  accessToken        String?   @map(name: "access_token")
-  accessTokenExpires DateTime? @map(name: "access_token_expires")
-  createdAt          DateTime  @default(now()) @map(name: "created_at")
-  updatedAt          DateTime  @default(now()) @map(name: "updated_at")
-
-  @@index([providerAccountId], name: "providerAccountId")
-  @@index([providerId], name: "providerId")
-  @@index([userId], name: "userId")
-
-  @@map(name: "accounts")
+  id                 String  @id @default(cuid())
+  userId             String
+  type               String
+  provider           String
+  providerAccountId  String
+  refresh_token      String?
+  access_token       String?
+  expires_at         Int?
+  token_type         String?
+  scope              String?
+  id_token           String?
+  session_state      String?
+  oauth_token_secret String?
+  oauth_token        String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  user      User     @relation(fields: [userId], references: [id])
+
+  @@unique([provider, providerAccountId])
 }
 
 model Session {
-  id           Int      @default(autoincrement()) @id
-  userId       Int      @map(name: "user_id")
+  id           String   @id @default(cuid())
+  sessionToken String   @unique
+  userId       String
   expires      DateTime
-  sessionToken String   @unique @map(name: "session_token")
-  accessToken  String   @unique @map(name: "access_token")
-  createdAt    DateTime @default(now()) @map(name: "created_at")
-  updatedAt    DateTime @default(now()) @map(name: "updated_at")
-
-  @@map(name: "sessions")
+  user         User     @relation(fields: [userId], references: [id])
 }
 
 model User {
-  id            Int       @default(autoincrement()) @id
+  id            String    @id @default(cuid())
   name          String?
   email         String?   @unique
-  emailVerified DateTime? @map(name: "email_verified")
+  emailVerified DateTime?
   image         String?
-  createdAt     DateTime  @default(now()) @map(name: "created_at")
-  updatedAt     DateTime  @default(now()) @map(name: "updated_at")
-
-  @@map(name: "users")
+  accounts      Account[]
+  sessions      Session[]
 }
 
-model VerificationRequest {
-  id         Int      @default(autoincrement()) @id
+model VerificationToken {
   identifier String
   token      String   @unique
   expires    DateTime
-  createdAt  DateTime  @default(now()) @map(name: "created_at")
-  updatedAt  DateTime  @default(now()) @map(name: "updated_at")
 
-  @@map(name: "verification_requests")
-}
+  @@unique([identifier, token])
+}

app/tsconfig.json

@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "baseUrl": "."
+  },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}

config/build.js

@@ -6,7 +6,6 @@ const MODULE_ENTRIES = {
   REACT: "react",
   ADAPTERS: "adapters",
   JWT: "jwt",
-  ERRORS: "errors",
 }
 
 // Building submodule entries
@@ -18,8 +17,6 @@ const BUILD_TARGETS = {
     "module.exports = require('./dist/client/react').default\n",
   [`${MODULE_ENTRIES.JWT}.js`]:
     "module.exports = require('./dist/lib/jwt').default\n",
-  [`${MODULE_ENTRIES.ERRORS}.js`]:
-    "module.exports = require('./dist/lib/errors').default\n",
 }
 
 Object.entries(BUILD_TARGETS).forEach(([target, content]) => {
@@ -38,7 +35,6 @@ const TYPES_TARGETS = [
   `${MODULE_ENTRIES.ADAPTERS}.d.ts`,
   "providers",
   `${MODULE_ENTRIES.JWT}.d.ts`,
-  `${MODULE_ENTRIES.ERRORS}.d.ts`,
   "internals",
 ]
 

package.json

@@ -23,8 +23,7 @@
     ".": "./dist/server/index.js",
     "./jwt": "./dist/lib/jwt.js",
     "./react": "./dist/client/react.js",
-    "./providers/*": "./dist/providers/*.js",
-    "./errors": "./dist/lib/errors.js"
+    "./providers/*": "./dist/providers/*.js"
   },
   "scripts": {
     "build": "npm run build:js && npm run build:css",
@@ -49,12 +48,9 @@
     "index.js",
     "index.d.ts",
     "providers",
-    "adapters.js",
     "adapters.d.ts",
     "react.js",
     "react.d.ts",
-    "errors.js",
-    "errors.d.ts",
     "jwt.js",
     "jwt.d.ts",
     "internals"
@@ -148,7 +144,9 @@
       "fetch": "readonly"
     },
     "rules": {
-      "camelcase": "off"
+      "camelcase": "off",
+      "@typescript-eslint/naming-convention": "off",
+      "@typescript-eslint/strict-boolean-expressions": "off"
     },
     "overrides": [
       {

src/lib/errors.js

@@ -40,3 +40,48 @@ export function upperSnake(s) {
 export function capitalize(s) {
   return `${s[0].toUpperCase()}${s.slice(1)}`
 }
+
+/**
+ * Wraps an object of methods and adds error handling.
+ * @param {import("types").EventCallbacks} methods
+ * @param {import("types").LoggerInstance} logger
+ * @return {import("types").EventCallbacks}
+ */
+export function eventsErrorHandler(methods, logger) {
+  return Object.entries(methods).reduce((acc, [name, method]) => {
+    acc[name] = async (...args) => {
+      try {
+        return await method(...args)
+      } catch (e) {
+        logger.error(`${upperSnake(name)}_EVENT_ERROR`, e)
+      }
+    }
+    return acc
+  }, {})
+}
+
+/**
+ * Handles adapter induced errors.
+ * @param {import("types/adapters").Adapter} [adapter]
+ * @param {import("types").LoggerInstance} logger
+ * @return {import("types/adapters").Adapter}
+ */
+export function adapterErrorHandler(adapter, logger) {
+  if (!adapter) return
+
+  return Object.keys(adapter).reduce((acc, method) => {
+    acc[method] = async (...args) => {
+      try {
+        logger.debug(`adapter_${method}`, ...args)
+        const adapterMethod = adapter[method]
+        return await adapterMethod(...args)
+      } catch (error) {
+        logger.error(`adapter_error_${method}`, error)
+        const e = new UnknownError(error)
+        e.name = `${capitalize(method)}Error`
+        throw e
+      }
+    }
+    return acc
+  }, {})
+}

src/lib/jwt.js

@@ -200,9 +200,3 @@ function getDerivedEncryptionKey(secret) {
   })
   return key
 }
-
-export default {
-  encode,
-  decode,
-  getToken,
-}