@opensaas/keystone-nextjs-auth 20.2.0 → 20.5.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @opensaas-keystone/nextjs-auth
 
+## 20.5.0
+
+### Minor Changes
+
+- e2e7122: upgrade keystone to `1.1.0`
+
+## 20.4.0
+
+### Minor Changes
+
+- 80ba444: Add `getToken` to keystone `get session` to enable JWT in Authorization header
+
+## 20.3.0
+
+### Minor Changes
+
+- 34e9932: Fix up stale next session - session is now refreshed on change of data
+
 ## 20.2.0
 
 ### Minor Changes

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

@@ -10,6 +10,7 @@ var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/string
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
 var url = require('url');
 var react = require('next-auth/react');
+var jwt = require('next-auth/jwt');
 var cookie = require('cookie');
 var ejs = require('ejs');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
@@ -213,7 +214,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get"];
+const _excluded = ["get", "start"];
 /**
  * createAuth function
  *
@@ -397,18 +398,39 @@ function createAuth({
 
 
   const withItemData = _sessionStrategy => {
-    const sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
+    const {
+      get,
+      start
+    } = _sessionStrategy,
+          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
+      start,
       get: async ({
         req
       }) => {
+        var _req$headers$authoriz;
+
         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')) {
           return;
         }
 
+        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 request = req;
+          const token = await jwt.getToken({
+            req: request,
+            secret: sessionSecret
+          });
+
+          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
+            return token;
+          }
+        }
+
         const nextSession = await react.getSession({
           req
         });

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

@@ -10,6 +10,7 @@ var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/string
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
 var url = require('url');
 var react = require('next-auth/react');
+var jwt = require('next-auth/jwt');
 var cookie = require('cookie');
 var ejs = require('ejs');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
@@ -213,7 +214,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get"];
+const _excluded = ["get", "start"];
 /**
  * createAuth function
  *
@@ -397,18 +398,39 @@ function createAuth({
 
 
   const withItemData = _sessionStrategy => {
-    const sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
+    const {
+      get,
+      start
+    } = _sessionStrategy,
+          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
+      start,
       get: async ({
         req
       }) => {
+        var _req$headers$authoriz;
+
         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')) {
           return;
         }
 
+        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 request = req;
+          const token = await jwt.getToken({
+            req: request,
+            secret: sessionSecret
+          });
+
+          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
+            return token;
+          }
+        }
+
         const nextSession = await react.getSession({
           req
         });

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

@@ -6,6 +6,7 @@ import _JSON$stringify from '@babel/runtime-corejs3/core-js-stable/json/stringif
 import _URL from '@babel/runtime-corejs3/core-js-stable/url';
 import url from 'url';
 import { getSession } from 'next-auth/react';
+import { getToken } from 'next-auth/jwt';
 import * as cookie from 'cookie';
 import ejs from 'ejs';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
@@ -180,7 +181,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get"];
+const _excluded = ["get", "start"];
 /**
  * createAuth function
  *
@@ -364,18 +365,39 @@ function createAuth({
 
 
   const withItemData = _sessionStrategy => {
-    const sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
+    const {
+      get,
+      start
+    } = _sessionStrategy,
+          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
+      start,
       get: async ({
         req
       }) => {
+        var _req$headers$authoriz;
+
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
         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') {
+          var _token$data;
+
+          const request = req;
+          const token = await getToken({
+            req: request,
+            secret: sessionSecret
+          });
+
+          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
+            return token;
+          }
+        }
+
         const nextSession = await getSession({
           req
         });

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "20.2.0",
+  "version": "20.5.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
   "module": "dist/opensaas-keystone-nextjs-auth.esm.js",
   "dependencies": {
-    "@babel/runtime": "^7.16.7",
-    "@babel/runtime-corejs3": "^7.16.8",
+    "@babel/runtime": "^7.17.8",
+    "@babel/runtime-corejs3": "^7.17.8",
     "@types/ejs": "^3.1.0",
-    "cookie": "^0.4.1",
+    "cookie": "^0.4.2",
     "cross-fetch": "^3.1.5",
     "ejs": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
     "graphql": "^15.8.0",
-    "next-auth": "^4.1.2"
+    "next-auth": "^4.3.1"
   },
   "devDependencies": {
-    "@keystone-6/core": "^1.0.1",
+    "@keystone-6/core": "^1.1.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-6/core": "^1.0.1",
+    "@keystone-6/core": "^1.1.0",
     "react": "^17.0.2"
   },
   "engines": {

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

@@ -167,27 +167,28 @@ function NextAuthPage(props) {
           const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
-            return;
+            return {
+              result: false
+            };
           }
 
-          const data = await query[listKey].findOne({
-            where: {
-              id: result.item.id
-            },
-            query: sessionData || 'id'
-          });
+          token.itemId = result.item.id;
+        }
 
-          const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString()
-          });
+        const data = await query[listKey].findOne({
+          where: {
+            id: token.itemId
+          },
+          query: sessionData || 'id'
+        });
 
-          return returnToken;
-        }
+        const returnToken = _objectSpread(_objectSpread({}, token), {}, {
+          data,
+          subject: token.sub,
+          listKey
+        });
 
-        return token;
+        return returnToken;
       }
 
     }

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

@@ -167,27 +167,28 @@ function NextAuthPage(props) {
           const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
-            return;
+            return {
+              result: false
+            };
           }
 
-          const data = await query[listKey].findOne({
-            where: {
-              id: result.item.id
-            },
-            query: sessionData || 'id'
-          });
+          token.itemId = result.item.id;
+        }
 
-          const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString()
-          });
+        const data = await query[listKey].findOne({
+          where: {
+            id: token.itemId
+          },
+          query: sessionData || 'id'
+        });
 
-          return returnToken;
-        }
+        const returnToken = _objectSpread(_objectSpread({}, token), {}, {
+          data,
+          subject: token.sub,
+          listKey
+        });
 
-        return token;
+        return returnToken;
       }
 
     }

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

@@ -158,27 +158,28 @@ function NextAuthPage(props) {
           const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
-            return;
+            return {
+              result: false
+            };
           }
 
-          const data = await query[listKey].findOne({
-            where: {
-              id: result.item.id
-            },
-            query: sessionData || 'id'
-          });
+          token.itemId = result.item.id;
+        }
 
-          const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString()
-          });
+        const data = await query[listKey].findOne({
+          where: {
+            id: token.itemId
+          },
+          query: sessionData || 'id'
+        });
 
-          return returnToken;
-        }
+        const returnToken = _objectSpread(_objectSpread({}, token), {}, {
+          data,
+          subject: token.sub,
+          listKey
+        });
 
-        return token;
+        return returnToken;
       }
 
     }

package/src/index.ts

@@ -9,7 +9,10 @@ import {
   BaseKeystoneTypeInfo,
 } from '@keystone-6/core/types';
 import { getSession } from 'next-auth/react';
+import { getToken } from 'next-auth/jwt';
 import * as cookie from 'cookie';
+import { Provider } from 'next-auth/providers';
+import { NextApiRequest } from 'next';
 import { nextConfigTemplate } from './templates/next-config';
 // import * as Path from 'path';
 
@@ -136,7 +139,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
     `${customPath}/api/auth/providers`,
     `${customPath}/api/auth/signout`,
   ];
-  function addPages(provider) {
+  function addPages(provider: Provider) {
     const name = provider.id;
     publicPages.push(`${customPath}/api/auth/signin/${name}`);
     publicPages.push(`${customPath}/api/auth/callback/${name}`);
@@ -188,15 +191,25 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
   const withItemData = (
     _sessionStrategy: SessionStrategy<Record<string, any>>
   ): SessionStrategy<NextAuthSession | undefined> => {
-    const { get, ...sessionStrategy } = _sessionStrategy;
+    const { get, start, ...sessionStrategy } = _sessionStrategy;
     return {
       ...sessionStrategy,
+      start,
       get: async ({ req }) => {
         const pathname = url.parse(req?.url!).pathname!;
         if (pathname.includes('/api/auth')) {
           return;
         }
+        if (req.headers.authorization?.split(' ')[0] === 'Bearer') {
+          const request = req as NextApiRequest;
+          const token = await getToken({ req: request, secret: sessionSecret });
+
+          if (token?.data?.id) {
+            return token as NextAuthSession;
+          }
+        }
         const nextSession: unknown = await getSession({ req });
+
         if (nextSession) {
           return nextSession as NextAuthSession;
         }
@@ -215,7 +228,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
             secure: process.env.NODE_ENV === 'production',
             path: '/',
             sameSite: 'lax',
-            domain: url.parse(req.url).hostname,
+            domain: url.parse(req.url as string).hostname as string,
           })
         );
       },

package/src/pages/NextAuthPage.tsx

@@ -125,24 +125,22 @@ export default function NextAuthPage(props: NextAuthPageProps) {
           );
 
           if (!result.success) {
-            return;
+            return { result: false };
           }
-
-          const data = await query[listKey].findOne({
-            where: { id: result.item.id },
-            query: sessionData || 'id',
-          });
-          const returnToken = {
-            ...token,
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString(),
-          };
-
-          return returnToken;
+          token.itemId = result.item.id;
         }
-        return token;
+        const data = await query[listKey].findOne({
+          where: { id: token.itemId },
+          query: sessionData || 'id',
+        });
+        const returnToken = {
+          ...token,
+          data,
+          subject: token.sub,
+          listKey,
+        };
+
+        return returnToken;
       },
     },
   });