@opensaas/keystone-nextjs-auth 21.1.0 → 21.1.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @opensaas-keystone/nextjs-auth
 
+## 21.1.1
+
+### Patch Changes
+
+- e48cb6c: Fix signin redirect error
+
 ## 21.1.0
 
 ### Minor Changes

package/dist/declarations/src/index.d.ts

@@ -1,11 +1,11 @@
-import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
-import { AuthConfig, KeystoneOAuthConfig } from './types';
+import { BaseListTypeInfo, KeystoneConfig } from "@keystone-6/core/types";
+import { AuthConfig, KeystoneOAuthConfig } from "./types";
 /**
  * createAuth function
  *
  * Generates config for Keystone to implement standard auth features.
  */
-export type { NextAuthProviders, KeystoneOAuthConfig } from './types';
+export type { NextAuthProviders, KeystoneOAuthConfig } from "./types";
 export declare function createAuth<GeneratedListTypes extends BaseListTypeInfo>({ autoCreate, cookies, identityField, listKey, keystonePath, pages, resolver, providers, sessionData, sessionSecret, }: AuthConfig<GeneratedListTypes>): {
     withAuth: (keystoneConfig: KeystoneConfig) => KeystoneOAuthConfig;
 };

package/dist/opensaas-keystone-nextjs-auth.cjs.dev.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
-var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var _Object$values = require('@babel/runtime-corejs3/core-js-stable/object/values');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
@@ -39,8 +37,6 @@ function _interopNamespace(e) {
 }
 
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
-var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
-var _Object$values__default = /*#__PURE__*/_interopDefault(_Object$values);
 var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var _URL__default = /*#__PURE__*/_interopDefault(_URL);
@@ -223,7 +219,7 @@ function createAuth({
   // part of the createAuth API (in which case its use cases need to be documented and tested)
   // or whether always being true is what we want, in which case we can refactor our code
   // to match this. -TL
-  const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
+  const customPath = !keystonePath || keystonePath === "/" ? "" : keystonePath;
   /**
    * pageMiddleware
    *
@@ -239,8 +235,6 @@ function createAuth({
     context,
     isValidSession
   }) => {
-    var _context;
-
     const {
       req,
       session
@@ -250,14 +244,14 @@ function createAuth({
     if (isValidSession) {
       if (pathname === `${customPath}/api/auth/signin`) {
         return {
-          kind: 'redirect',
+          kind: "redirect",
           to: `${customPath}`
         };
       }
 
-      if (customPath !== '' && pathname === '/') {
+      if (customPath !== "" && pathname === "/") {
         return {
-          kind: 'redirect',
+          kind: "redirect",
           to: `${customPath}`
         };
       }
@@ -265,14 +259,14 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/')) {
+    if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/") || _includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth/") || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
-    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`) && !(_indexOfInstanceProperty__default["default"](_context = _Object$values__default["default"](pages)).call(_context, pathname) > -1)) {
+    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
-        kind: 'redirect',
-        to: `${customPath}/api/auth/signin`
+        kind: "redirect",
+        to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
   };
@@ -288,8 +282,8 @@ function createAuth({
 
   const getAdditionalFiles = () => {
     const filesToWrite = [{
-      mode: 'write',
-      outputPath: 'pages/api/auth/[...nextauth].js',
+      mode: "write",
+      outputPath: "pages/api/auth/[...nextauth].js",
       src: authTemplate({
         autoCreate,
         identityField,
@@ -298,8 +292,8 @@ function createAuth({
         sessionSecret
       })
     }, {
-      mode: 'write',
-      outputPath: 'next.config.js',
+      mode: "write",
+      outputPath: "next.config.js",
       src: nextConfigTemplate({
         keystonePath: customPath
       })
@@ -384,7 +378,7 @@ function createAuth({
       start: async ({
         res
       }) => {
-        console.log('start');
+        console.log("start");
         const session = await start({
           res
         });
@@ -397,11 +391,11 @@ function createAuth({
 
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
-        if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth')) {
+        if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth")) {
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(" ")[0]) === "Bearer") {
           var _token$data;
 
           const token = await jwt.getToken({
@@ -426,14 +420,14 @@ function createAuth({
         res,
         req
       }) => {
-        const TOKEN_NAME = process.env.NODE_ENV === 'production' ? '__Secure-next-auth.session-token' : 'next-auth.session-token';
-        res.setHeader('Set-Cookie', cookie__namespace.serialize(TOKEN_NAME, '', {
+        const TOKEN_NAME = process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token";
+        res.setHeader("Set-Cookie", cookie__namespace.serialize(TOKEN_NAME, "", {
           maxAge: 0,
           expires: new Date(),
           httpOnly: true,
-          secure: process.env.NODE_ENV === 'production',
-          path: '/',
-          sameSite: 'lax',
+          secure: process.env.NODE_ENV === "production",
+          path: "/",
+          sameSite: "lax",
           // TODO: Update parse to URL
           domain: url__default["default"].parse(req.url).hostname
         }));
@@ -478,12 +472,12 @@ function createAuth({
           } = context;
           const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname; // Allow nextjs scripts and static files to be accessed without auth
 
-          if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/')) {
+          if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/")) {
             return true;
           } // Allow keystone to access /api/__keystone_api_build for hot reloading
 
 
-          if (process.env.NODE_ENV !== 'production' && ((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url) !== undefined && new _URL__default["default"](context.req.url, 'http://example.com').pathname === `${customPath}/api/__keystone_api_build`) {
+          if (process.env.NODE_ENV !== "production" && ((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url) !== undefined && new _URL__default["default"](context.req.url, "http://example.com").pathname === `${customPath}/api/__keystone_api_build`) {
             return true;
           }
 
@@ -492,7 +486,7 @@ function createAuth({
       });
     }
 
-    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
+    if (!keystoneConfig.session) throw new TypeError("Missing .session configuration");
     const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {

package/dist/opensaas-keystone-nextjs-auth.cjs.prod.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
-var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var _Object$values = require('@babel/runtime-corejs3/core-js-stable/object/values');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 require('@babel/runtime-corejs3/core-js-stable/url');
@@ -39,8 +37,6 @@ function _interopNamespace(e) {
 }
 
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
-var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
-var _Object$values__default = /*#__PURE__*/_interopDefault(_Object$values);
 var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var url__default = /*#__PURE__*/_interopDefault(url);
@@ -222,7 +218,7 @@ function createAuth({
   // part of the createAuth API (in which case its use cases need to be documented and tested)
   // or whether always being true is what we want, in which case we can refactor our code
   // to match this. -TL
-  const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
+  const customPath = !keystonePath || keystonePath === "/" ? "" : keystonePath;
   /**
    * pageMiddleware
    *
@@ -238,8 +234,6 @@ function createAuth({
     context,
     isValidSession
   }) => {
-    var _context;
-
     const {
       req,
       session
@@ -249,14 +243,14 @@ function createAuth({
     if (isValidSession) {
       if (pathname === `${customPath}/api/auth/signin`) {
         return {
-          kind: 'redirect',
+          kind: "redirect",
           to: `${customPath}`
         };
       }
 
-      if (customPath !== '' && pathname === '/') {
+      if (customPath !== "" && pathname === "/") {
         return {
-          kind: 'redirect',
+          kind: "redirect",
           to: `${customPath}`
         };
       }
@@ -264,14 +258,14 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/')) {
+    if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/") || _includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth/") || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
-    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`) && !(_indexOfInstanceProperty__default["default"](_context = _Object$values__default["default"](pages)).call(_context, pathname) > -1)) {
+    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
-        kind: 'redirect',
-        to: `${customPath}/api/auth/signin`
+        kind: "redirect",
+        to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
   };
@@ -287,8 +281,8 @@ function createAuth({
 
   const getAdditionalFiles = () => {
     const filesToWrite = [{
-      mode: 'write',
-      outputPath: 'pages/api/auth/[...nextauth].js',
+      mode: "write",
+      outputPath: "pages/api/auth/[...nextauth].js",
       src: authTemplate({
         autoCreate,
         identityField,
@@ -297,8 +291,8 @@ function createAuth({
         sessionSecret
       })
     }, {
-      mode: 'write',
-      outputPath: 'next.config.js',
+      mode: "write",
+      outputPath: "next.config.js",
       src: nextConfigTemplate({
         keystonePath: customPath
       })
@@ -383,7 +377,7 @@ function createAuth({
       start: async ({
         res
       }) => {
-        console.log('start');
+        console.log("start");
         const session = await start({
           res
         });
@@ -396,11 +390,11 @@ function createAuth({
 
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
-        if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth')) {
+        if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth")) {
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(" ")[0]) === "Bearer") {
           var _token$data;
 
           const token = await jwt.getToken({
@@ -425,14 +419,14 @@ function createAuth({
         res,
         req
       }) => {
-        const TOKEN_NAME = '__Secure-next-auth.session-token' ;
-        res.setHeader('Set-Cookie', cookie__namespace.serialize(TOKEN_NAME, '', {
+        const TOKEN_NAME = "__Secure-next-auth.session-token" ;
+        res.setHeader("Set-Cookie", cookie__namespace.serialize(TOKEN_NAME, "", {
           maxAge: 0,
           expires: new Date(),
           httpOnly: true,
-          secure:         "production" === 'production',
-          path: '/',
-          sameSite: 'lax',
+          secure:         "production" === "production",
+          path: "/",
+          sameSite: "lax",
           // TODO: Update parse to URL
           domain: url__default["default"].parse(req.url).hostname
         }));
@@ -477,7 +471,7 @@ function createAuth({
           } = context;
           const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname; // Allow nextjs scripts and static files to be accessed without auth
 
-          if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/')) {
+          if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/")) {
             return true;
           } // Allow keystone to access /api/__keystone_api_build for hot reloading
 
@@ -486,7 +480,7 @@ function createAuth({
       });
     }
 
-    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
+    if (!keystoneConfig.session) throw new TypeError("Missing .session configuration");
     const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {

package/dist/opensaas-keystone-nextjs-auth.esm.js

@@ -1,8 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutProperties';
 import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
-import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
-import _Object$values from '@babel/runtime-corejs3/core-js-stable/object/values';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import _JSON$stringify from '@babel/runtime-corejs3/core-js-stable/json/stringify';
 import _URL from '@babel/runtime-corejs3/core-js-stable/url';
@@ -188,7 +186,7 @@ function createAuth({
   // part of the createAuth API (in which case its use cases need to be documented and tested)
   // or whether always being true is what we want, in which case we can refactor our code
   // to match this. -TL
-  const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
+  const customPath = !keystonePath || keystonePath === "/" ? "" : keystonePath;
   /**
    * pageMiddleware
    *
@@ -204,8 +202,6 @@ function createAuth({
     context,
     isValidSession
   }) => {
-    var _context;
-
     const {
       req,
       session
@@ -215,14 +211,14 @@ function createAuth({
     if (isValidSession) {
       if (pathname === `${customPath}/api/auth/signin`) {
         return {
-          kind: 'redirect',
+          kind: "redirect",
           to: `${customPath}`
         };
       }
 
-      if (customPath !== '' && pathname === '/') {
+      if (customPath !== "" && pathname === "/") {
         return {
-          kind: 'redirect',
+          kind: "redirect",
           to: `${customPath}`
         };
       }
@@ -230,14 +226,14 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty(pathname).call(pathname, '/_next/') || _includesInstanceProperty(pathname).call(pathname, '/api/auth/')) {
+    if (_includesInstanceProperty(pathname).call(pathname, "/_next/") || _includesInstanceProperty(pathname).call(pathname, "/api/auth/") || _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
-    if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`) && !(_indexOfInstanceProperty(_context = _Object$values(pages)).call(_context, pathname) > -1)) {
+    if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
-        kind: 'redirect',
-        to: `${customPath}/api/auth/signin`
+        kind: "redirect",
+        to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
   };
@@ -253,8 +249,8 @@ function createAuth({
 
   const getAdditionalFiles = () => {
     const filesToWrite = [{
-      mode: 'write',
-      outputPath: 'pages/api/auth/[...nextauth].js',
+      mode: "write",
+      outputPath: "pages/api/auth/[...nextauth].js",
       src: authTemplate({
         autoCreate,
         identityField,
@@ -263,8 +259,8 @@ function createAuth({
         sessionSecret
       })
     }, {
-      mode: 'write',
-      outputPath: 'next.config.js',
+      mode: "write",
+      outputPath: "next.config.js",
       src: nextConfigTemplate({
         keystonePath: customPath
       })
@@ -349,7 +345,7 @@ function createAuth({
       start: async ({
         res
       }) => {
-        console.log('start');
+        console.log("start");
         const session = await start({
           res
         });
@@ -362,11 +358,11 @@ function createAuth({
 
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
-        if (_includesInstanceProperty(pathname).call(pathname, '/api/auth')) {
+        if (_includesInstanceProperty(pathname).call(pathname, "/api/auth")) {
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(" ")[0]) === "Bearer") {
           var _token$data;
 
           const token = await getToken({
@@ -391,14 +387,14 @@ function createAuth({
         res,
         req
       }) => {
-        const TOKEN_NAME = process.env.NODE_ENV === 'production' ? '__Secure-next-auth.session-token' : 'next-auth.session-token';
-        res.setHeader('Set-Cookie', cookie.serialize(TOKEN_NAME, '', {
+        const TOKEN_NAME = process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token";
+        res.setHeader("Set-Cookie", cookie.serialize(TOKEN_NAME, "", {
           maxAge: 0,
           expires: new Date(),
           httpOnly: true,
-          secure: process.env.NODE_ENV === 'production',
-          path: '/',
-          sameSite: 'lax',
+          secure: process.env.NODE_ENV === "production",
+          path: "/",
+          sameSite: "lax",
           // TODO: Update parse to URL
           domain: url.parse(req.url).hostname
         }));
@@ -443,12 +439,12 @@ function createAuth({
           } = context;
           const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname; // Allow nextjs scripts and static files to be accessed without auth
 
-          if (_includesInstanceProperty(pathname).call(pathname, '/_next/')) {
+          if (_includesInstanceProperty(pathname).call(pathname, "/_next/")) {
             return true;
           } // Allow keystone to access /api/__keystone_api_build for hot reloading
 
 
-          if (process.env.NODE_ENV !== 'production' && ((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url) !== undefined && new _URL(context.req.url, 'http://example.com').pathname === `${customPath}/api/__keystone_api_build`) {
+          if (process.env.NODE_ENV !== "production" && ((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url) !== undefined && new _URL(context.req.url, "http://example.com").pathname === `${customPath}/api/__keystone_api_build`) {
             return true;
           }
 
@@ -457,7 +453,7 @@ function createAuth({
       });
     }
 
-    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
+    if (!keystoneConfig.session) throw new TypeError("Missing .session configuration");
     const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "21.1.0",
+  "version": "21.1.1",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",

package/src/index.ts

@@ -1,4 +1,4 @@
-import url from 'url';
+import url from "url";
 import {
   AdminFileToWrite,
   BaseListTypeInfo,
@@ -7,19 +7,19 @@ import {
   AdminUIConfig,
   SessionStrategy,
   BaseKeystoneTypeInfo,
-} from '@keystone-6/core/types';
-import { getSession } from 'next-auth/react';
-import { getToken } from 'next-auth/jwt';
-import { Provider } from 'next-auth/providers';
+} from "@keystone-6/core/types";
+import { getSession } from "next-auth/react";
+import { getToken } from "next-auth/jwt";
+import { Provider } from "next-auth/providers";
 
-import * as cookie from 'cookie';
+import * as cookie from "cookie";
 
-import { nextConfigTemplate } from './templates/next-config';
+import { nextConfigTemplate } from "./templates/next-config";
 // import * as Path from 'path';
 
-import { AuthConfig, KeystoneOAuthConfig, NextAuthSession } from './types';
-import { getSchemaExtension } from './schema';
-import { authTemplate } from './templates/auth';
+import { AuthConfig, KeystoneOAuthConfig, NextAuthSession } from "./types";
+import { getSchemaExtension } from "./schema";
+import { authTemplate } from "./templates/auth";
 
 /**
  * createAuth function
@@ -27,7 +27,7 @@ import { authTemplate } from './templates/auth';
  * Generates config for Keystone to implement standard auth features.
  */
 
-export type { NextAuthProviders, KeystoneOAuthConfig } from './types';
+export type { NextAuthProviders, KeystoneOAuthConfig } from "./types";
 export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
   autoCreate,
   cookies,
@@ -45,7 +45,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
   // or whether always being true is what we want, in which case we can refactor our code
   // to match this. -TL
 
-  const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
+  const customPath = !keystonePath || keystonePath === "/" ? "" : keystonePath;
   /**
    * pageMiddleware
    *
@@ -56,29 +56,34 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
    *  - to the init page when initFirstItem is configured, and there are no user in the database
    *  - to the signin page when no valid session is present
    */
-  const pageMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>['pageMiddleware'] =
+  const pageMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>["pageMiddleware"] =
     async ({ context, isValidSession }) => {
       const { req, session } = context;
       const pathname = url.parse(req?.url!).pathname!;
 
       if (isValidSession) {
         if (pathname === `${customPath}/api/auth/signin`) {
-          return { kind: 'redirect', to: `${customPath}` };
+          return { kind: "redirect", to: `${customPath}` };
         }
-        if (customPath !== '' && pathname === '/') {
-          return { kind: 'redirect', to: `${customPath}` };
+        if (customPath !== "" && pathname === "/") {
+          return { kind: "redirect", to: `${customPath}` };
         }
         return;
       }
-      if (pathname.includes('/_next/') || pathname.includes('/api/auth/')) {
-        return;
-      }
       if (
-        !session &&
-        !pathname.includes(`${customPath}/api/auth/`) &&
-        !(Object.values(pages).indexOf(pathname) > -1)
+        pathname.includes("/_next/") ||
+        pathname.includes("/api/auth/") ||
+        pathname.includes(pages?.signIn) ||
+        pathname.includes(pages?.error) ||
+        pathname.includes(pages?.signOut)
       ) {
-        return { kind: 'redirect', to: `${customPath}/api/auth/signin` };
+        return;
+      }
+      if (!session && !pathname.includes(`${customPath}/api/auth/`)) {
+        return {
+          kind: "redirect",
+          to: pages?.signIn || `${customPath}/api/auth/signin`,
+        };
       }
     };
 
@@ -93,8 +98,8 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
   const getAdditionalFiles = () => {
     const filesToWrite: AdminFileToWrite[] = [
       {
-        mode: 'write',
-        outputPath: 'pages/api/auth/[...nextauth].js',
+        mode: "write",
+        outputPath: "pages/api/auth/[...nextauth].js",
         src: authTemplate({
           autoCreate,
           identityField,
@@ -104,8 +109,8 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
         }),
       },
       {
-        mode: 'write',
-        outputPath: 'next.config.js',
+        mode: "write",
+        outputPath: "next.config.js",
         src: nextConfigTemplate({ keystonePath: customPath }),
       },
     ];
@@ -187,17 +192,17 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
     return {
       ...sessionStrategy,
       start: async ({ res }) => {
-        console.log('start');
+        console.log("start");
 
         const session = await start({ res });
         return session;
       },
       get: async ({ req }) => {
         const pathname = url.parse(req?.url!).pathname!;
-        if (pathname.includes('/api/auth')) {
+        if (pathname.includes("/api/auth")) {
           return;
         }
-        if (req.headers.authorization?.split(' ')[0] === 'Bearer') {
+        if (req.headers.authorization?.split(" ")[0] === "Bearer") {
           const token = (await getToken({
             req,
             secret: sessionSecret,
@@ -215,18 +220,18 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
       },
       end: async ({ res, req }) => {
         const TOKEN_NAME =
-          process.env.NODE_ENV === 'production'
-            ? '__Secure-next-auth.session-token'
-            : 'next-auth.session-token';
+          process.env.NODE_ENV === "production"
+            ? "__Secure-next-auth.session-token"
+            : "next-auth.session-token";
         res.setHeader(
-          'Set-Cookie',
-          cookie.serialize(TOKEN_NAME, '', {
+          "Set-Cookie",
+          cookie.serialize(TOKEN_NAME, "", {
             maxAge: 0,
             expires: new Date(),
             httpOnly: true,
-            secure: process.env.NODE_ENV === 'production',
-            path: '/',
-            sameSite: 'lax',
+            secure: process.env.NODE_ENV === "production",
+            path: "/",
+            sameSite: "lax",
             // TODO: Update parse to URL
             domain: url.parse(req.url as string).hostname as string,
           })
@@ -265,15 +270,15 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
           const pathname = url.parse(req?.url!).pathname!;
 
           // Allow nextjs scripts and static files to be accessed without auth
-          if (pathname.includes('/_next/')) {
+          if (pathname.includes("/_next/")) {
             return true;
           }
 
           // Allow keystone to access /api/__keystone_api_build for hot reloading
           if (
-            process.env.NODE_ENV !== 'production' &&
+            process.env.NODE_ENV !== "production" &&
             context.req?.url !== undefined &&
-            new URL(context.req.url, 'http://example.com').pathname ===
+            new URL(context.req.url, "http://example.com").pathname ===
               `${customPath}/api/__keystone_api_build`
           ) {
             return true;
@@ -287,7 +292,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
     }
 
     if (!keystoneConfig.session)
-      throw new TypeError('Missing .session configuration');
+      throw new TypeError("Missing .session configuration");
     const session = withItemData(keystoneConfig.session);
 
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;