@opensaas/keystone-nextjs-auth 27.0.0 → 27.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @opensaas-keystone/nextjs-auth
 
+## 27.1.0
+
+### Minor Changes
+
+- dd2923f: Fixes custom Prisma Path config
+
 ## 27.0.0
 
 ### Major Changes

package/dist/declarations/src/pages/NextAuthPage.d.ts

@@ -8,6 +8,7 @@ export type NextAuthTemplateProps = {
     listKey: string;
     sessionData: string | undefined;
     sessionSecret: string;
+    prismaClientPath: string;
 };
 export type CoreNextAuthPageProps = {
     cookies?: Partial<CookiesOptions>;

package/dist/declarations/src/templates/auth.d.ts

@@ -1,2 +1,2 @@
 import { NextAuthTemplateProps } from '../pages/NextAuthPage';
-export declare const authTemplate: ({ autoCreate, identityField, listKey, sessionData, sessionSecret, }: NextAuthTemplateProps) => string;
+export declare const authTemplate: ({ autoCreate, identityField, listKey, sessionData, sessionSecret, prismaClientPath, }: NextAuthTemplateProps) => string;

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

@@ -9,6 +9,7 @@ var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instan
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var _startsWithInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/starts-with');
 var url = require('url');
+var path = require('path');
 var react = require('next-auth/react');
 var jwt = require('next-auth/jwt');
 var cookie = require('cookie');
@@ -41,6 +42,7 @@ var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstancePro
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var _startsWithInstanceProperty__default = /*#__PURE__*/_interopDefault(_startsWithInstanceProperty);
 var url__default = /*#__PURE__*/_interopDefault(url);
+var path__default = /*#__PURE__*/_interopDefault(path);
 var cookie__namespace = /*#__PURE__*/_interopNamespace(cookie);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
 var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
@@ -118,7 +120,7 @@ const template = `
 import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import keystoneConfig from '../../../../../keystone';
-import * as PrismaModule from '.prisma/client';
+import * as PrismaModule from '<%= prismaClientPath %>';
 
 const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
@@ -142,14 +144,16 @@ const authTemplate = _ref => {
     identityField,
     listKey,
     sessionData,
-    sessionSecret
+    sessionSecret,
+    prismaClientPath
   } = _ref;
   const authOut = ejs__default["default"].render(template, {
     identityField,
     sessionData,
     listKey,
     autoCreate,
-    sessionSecret
+    sessionSecret,
+    prismaClientPath
   });
   return authOut;
 };
@@ -197,8 +201,7 @@ function createAuth(_ref) {
       wasAccessAllowed
     } = _ref2;
     const {
-      req,
-      session
+      req
     } = context;
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
     if (wasAccessAllowed) {
@@ -210,7 +213,7 @@ function createAuth(_ref) {
       }
       return;
     }
-    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
+    if (!wasAccessAllowed && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
         to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
@@ -226,7 +229,8 @@ function createAuth(_ref) {
    *
    * The signin page is always included, and the init page is included when initFirstItem is set
    */
-  const authGetAdditionalFiles = () => {
+  const authGetAdditionalFiles = config => {
+    const prismaClientPath = config.db.prismaClientPath ? path__default["default"].join('../../../../../', config.db.prismaClientPath) : '@prisma/client';
     const filesToWrite = [{
       mode: 'write',
       outputPath: 'pages/api/auth/[...nextauth].js',
@@ -235,7 +239,8 @@ function createAuth(_ref) {
         identityField,
         listKey,
         sessionData,
-        sessionSecret
+        sessionSecret,
+        prismaClientPath
       })
     }, {
       mode: 'write',

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

@@ -9,6 +9,7 @@ var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instan
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var _startsWithInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/starts-with');
 var url = require('url');
+var path = require('path');
 var react = require('next-auth/react');
 var jwt = require('next-auth/jwt');
 var cookie = require('cookie');
@@ -41,6 +42,7 @@ var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstancePro
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var _startsWithInstanceProperty__default = /*#__PURE__*/_interopDefault(_startsWithInstanceProperty);
 var url__default = /*#__PURE__*/_interopDefault(url);
+var path__default = /*#__PURE__*/_interopDefault(path);
 var cookie__namespace = /*#__PURE__*/_interopNamespace(cookie);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
 var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
@@ -118,7 +120,7 @@ const template = `
 import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import keystoneConfig from '../../../../../keystone';
-import * as PrismaModule from '.prisma/client';
+import * as PrismaModule from '<%= prismaClientPath %>';
 
 const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
@@ -142,14 +144,16 @@ const authTemplate = _ref => {
     identityField,
     listKey,
     sessionData,
-    sessionSecret
+    sessionSecret,
+    prismaClientPath
   } = _ref;
   const authOut = ejs__default["default"].render(template, {
     identityField,
     sessionData,
     listKey,
     autoCreate,
-    sessionSecret
+    sessionSecret,
+    prismaClientPath
   });
   return authOut;
 };
@@ -197,8 +201,7 @@ function createAuth(_ref) {
       wasAccessAllowed
     } = _ref2;
     const {
-      req,
-      session
+      req
     } = context;
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
     if (wasAccessAllowed) {
@@ -210,7 +213,7 @@ function createAuth(_ref) {
       }
       return;
     }
-    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
+    if (!wasAccessAllowed && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
         to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
@@ -226,7 +229,8 @@ function createAuth(_ref) {
    *
    * The signin page is always included, and the init page is included when initFirstItem is set
    */
-  const authGetAdditionalFiles = () => {
+  const authGetAdditionalFiles = config => {
+    const prismaClientPath = config.db.prismaClientPath ? path__default["default"].join('../../../../../', config.db.prismaClientPath) : '@prisma/client';
     const filesToWrite = [{
       mode: 'write',
       outputPath: 'pages/api/auth/[...nextauth].js',
@@ -235,7 +239,8 @@ function createAuth(_ref) {
         identityField,
         listKey,
         sessionData,
-        sessionSecret
+        sessionSecret,
+        prismaClientPath
       })
     }, {
       mode: 'write',

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

@@ -5,6 +5,7 @@ import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance
 import _JSON$stringify from '@babel/runtime-corejs3/core-js-stable/json/stringify';
 import _startsWithInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/starts-with';
 import url from 'url';
+import path from 'path';
 import { getSession } from 'next-auth/react';
 import { getToken } from 'next-auth/jwt';
 import * as cookie from 'cookie';
@@ -85,7 +86,7 @@ const template = `
 import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import keystoneConfig from '../../../../../keystone';
-import * as PrismaModule from '.prisma/client';
+import * as PrismaModule from '<%= prismaClientPath %>';
 
 const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
@@ -109,14 +110,16 @@ const authTemplate = _ref => {
     identityField,
     listKey,
     sessionData,
-    sessionSecret
+    sessionSecret,
+    prismaClientPath
   } = _ref;
   const authOut = ejs.render(template, {
     identityField,
     sessionData,
     listKey,
     autoCreate,
-    sessionSecret
+    sessionSecret,
+    prismaClientPath
   });
   return authOut;
 };
@@ -164,8 +167,7 @@ function createAuth(_ref) {
       wasAccessAllowed
     } = _ref2;
     const {
-      req,
-      session
+      req
     } = context;
     const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
     if (wasAccessAllowed) {
@@ -177,7 +179,7 @@ function createAuth(_ref) {
       }
       return;
     }
-    if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`)) {
+    if (!wasAccessAllowed && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
         to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
@@ -193,7 +195,8 @@ function createAuth(_ref) {
    *
    * The signin page is always included, and the init page is included when initFirstItem is set
    */
-  const authGetAdditionalFiles = () => {
+  const authGetAdditionalFiles = config => {
+    const prismaClientPath = config.db.prismaClientPath ? path.join('../../../../../', config.db.prismaClientPath) : '@prisma/client';
     const filesToWrite = [{
       mode: 'write',
       outputPath: 'pages/api/auth/[...nextauth].js',
@@ -202,7 +205,8 @@ function createAuth(_ref) {
         identityField,
         listKey,
         sessionData,
-        sessionSecret
+        sessionSecret,
+        prismaClientPath
       })
     }, {
       mode: 'write',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "27.0.0",
+  "version": "27.1.0",
   "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,5 @@
 import url from 'url';
+import path from 'path';
 import {
   AdminFileToWrite,
   BaseListTypeInfo,
@@ -63,7 +64,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
     context,
     wasAccessAllowed,
   }) => {
-    const { req, session } = context;
+    const { req } = context;
     const pathname = url.parse(req?.url!).pathname!;
 
     if (wasAccessAllowed) {
@@ -72,7 +73,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
       }
       return;
     }
-    if (!session && !pathname.includes(`${customPath}/api/auth/`)) {
+    if (!wasAccessAllowed && !pathname.includes(`${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
         to: pages?.signIn || `${customPath}/api/auth/signin`,
@@ -88,7 +89,10 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
    *
    * The signin page is always included, and the init page is included when initFirstItem is set
    */
-  const authGetAdditionalFiles = () => {
+  const authGetAdditionalFiles = (config: KeystoneConfig) => {
+    const prismaClientPath = config.db.prismaClientPath
+      ? path.join('../../../../../', config.db.prismaClientPath)
+      : '@prisma/client';
     const filesToWrite: AdminFileToWrite[] = [
       {
         mode: 'write',
@@ -99,6 +103,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
           listKey,
           sessionData,
           sessionSecret,
+          prismaClientPath,
         }),
       },
       {

package/src/pages/NextAuthPage.tsx

@@ -10,6 +10,7 @@ export type NextAuthTemplateProps = {
   listKey: string;
   sessionData: string | undefined;
   sessionSecret: string;
+  prismaClientPath: string;
 };
 
 export type CoreNextAuthPageProps = {

package/src/templates/auth.ts

@@ -5,7 +5,7 @@ const template = `
 import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import keystoneConfig from '../../../../../keystone';
-import * as PrismaModule from '.prisma/client';
+import * as PrismaModule from '<%= prismaClientPath %>';
 
 const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
@@ -30,6 +30,7 @@ export const authTemplate = ({
   listKey,
   sessionData,
   sessionSecret,
+  prismaClientPath,
 }: NextAuthTemplateProps) => {
   const authOut = ejs.render(template, {
     identityField,
@@ -37,6 +38,7 @@ export const authTemplate = ({
     listKey,
     autoCreate,
     sessionSecret,
+    prismaClientPath,
   });
   return authOut;
 };