move sessionStrategy implementation to keystone-6/auth package

dcousens · dcousens · commit 51ae55c391b2 · 2022-11-17T12:50:58.000+11:00
diff --git a/examples/auth/keystone.ts b/examples/auth/keystone.ts
@@ -1,6 +1,6 @@
 import { config } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
 import { createAuth } from '@keystone-6/auth';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { lists } from './schema';
 
 /**
diff --git a/examples/basic/keystone.ts b/examples/basic/keystone.ts
@@ -1,5 +1,5 @@
 import { config } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 
 import { lists, extendGraphqlSchema } from './schema';
diff --git a/examples/custom-session-validation/keystone.ts b/examples/custom-session-validation/keystone.ts
@@ -1,6 +1,6 @@
 import { KeystoneConfig, SessionStrategy } from '@keystone-6/core/types';
 import { config } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import { lists } from './schema';
 
diff --git a/examples/ecommerce/keystone.ts b/examples/ecommerce/keystone.ts
@@ -1,6 +1,6 @@
 import { createAuth } from '@keystone-6/auth';
 import { config } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { permissionsList } from './schemas/fields';
 import { Role } from './schemas/Role';
 import { OrderItem } from './schemas/OrderItem';
diff --git a/examples/redis-session-store/keystone.ts b/examples/redis-session-store/keystone.ts
@@ -1,5 +1,5 @@
 import { config } from '@keystone-6/core';
-import { storedSessions } from '@keystone-6/core/session';
+import { storedSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import { createClient } from '@redis/client';
 import { lists } from './schema';
diff --git a/examples/roles/keystone.ts b/examples/roles/keystone.ts
@@ -1,5 +1,5 @@
 import { config } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import { lists } from './schema';
 
diff --git a/examples/testing/keystone.ts b/examples/testing/keystone.ts
@@ -1,5 +1,5 @@
 import { config } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import { lists } from './schema';
 import { TypeInfo } from '.keystone/types';
diff --git a/examples/with-auth/keystone.ts b/examples/with-auth/keystone.ts
@@ -1,5 +1,5 @@
 import { config } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import { lists } from './schema';
 
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -9,6 +9,10 @@
       "module": "./dist/keystone-6-auth.esm.js",
       "default": "./dist/keystone-6-auth.cjs.js"
     },
+    "./session": {
+      "module": "./session/dist/keystone-6-auth-session.esm.js",
+      "default": "./session/dist/keystone-6-auth-session.cjs.js"
+    },
     "./pages/InitPage": {
       "module": "./pages/InitPage/dist/keystone-6-auth-pages-InitPage.esm.js",
       "default": "./pages/InitPage/dist/keystone-6-auth-pages-InitPage.cjs.js"
@@ -21,14 +25,17 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
+    "@hapi/iron": "^6.0.0",
     "@keystone-ui/button": "^7.0.2",
     "@keystone-ui/core": "^5.0.2",
     "@keystone-ui/fields": "^7.1.2",
     "@keystone-ui/loading": "^6.0.2",
     "@keystone-ui/notice": "^6.0.2",
+    "cookie": "^0.5.0",
     "cross-fetch": "^3.1.4",
     "fast-deep-equal": "^3.1.3",
-    "graphql": "^16.6.0"
+    "graphql": "^16.6.0",
+    "uid-safe": "^2.1.5"
   },
   "devDependencies": {
     "@keystone-6/core": "^3.1.0",
@@ -41,7 +48,8 @@
   "preconstruct": {
     "entrypoints": [
       "index.ts",
-      "pages/*.tsx"
+      "pages/*.tsx",
+      "session/index.ts"
     ]
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/packages/auth"
diff --git a/packages/auth/session/package.json b/packages/auth/session/package.json
@@ -0,0 +1,4 @@
+{
+  "main": "dist/keystone-6-auth-session.cjs.js",
+  "module": "dist/keystone-6-auth-session.esm.js"
+}
diff --git a/packages/auth/src/session/index.ts b/packages/auth/src/session/index.ts
@@ -2,7 +2,7 @@ import * as cookie from 'cookie';
 import Iron from '@hapi/iron';
 // uid-safe is what express-session uses so let's just use it
 import { sync as uid } from 'uid-safe';
-import { SessionStrategy, JSONValue, SessionStoreFunction } from '../types';
+import { SessionStrategy, JSONValue, SessionStoreFunction } from '@keystone-6/core/types';
 
 function generateSessionId() {
   return uid(24);
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -46,10 +46,6 @@
       "module": "./scripts/dist/keystone-6-core-scripts.esm.js",
       "default": "./scripts/dist/keystone-6-core-scripts.cjs.js"
     },
-    "./session": {
-      "module": "./session/dist/keystone-6-core-session.esm.js",
-      "default": "./session/dist/keystone-6-core-session.cjs.js"
-    },
     "./admin-ui/image": {
       "module": "./admin-ui/image/dist/keystone-6-core-admin-ui-image.esm.js",
       "default": "./admin-ui/image/dist/keystone-6-core-admin-ui-image.cjs.js"
@@ -197,7 +193,6 @@
     "keystone": "bin/cli.js"
   },
   "files": [
-    "session",
     "bin",
     "___internal-do-not-use-will-break-in-patch",
     "next",
@@ -321,7 +316,6 @@
       "___internal-do-not-use-will-break-in-patch/admin-ui/{next-config.ts,id-field-view.tsx}",
       "context.ts",
       "testing.ts",
-      "session/index.ts",
       "scripts/index.ts",
       "scripts/cli.ts",
       "admin-ui/components/index.ts",
diff --git a/tests/api-tests/access-control/schema-utils.ts b/tests/api-tests/access-control/schema-utils.ts
@@ -1,6 +1,6 @@
 import { relationship, text } from '@keystone-6/core/fields';
 import { list, ListSchemaConfig } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { allowAll } from '@keystone-6/core/access';
 import { apiTestConfig } from '../utils';
 
diff --git a/tests/api-tests/access-control/utils.ts b/tests/api-tests/access-control/utils.ts
@@ -1,6 +1,6 @@
 import { text, password } from '@keystone-6/core/fields';
 import { list, ListSchemaConfig } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import { allowAll } from '@keystone-6/core/access';
 import { apiTestConfig } from '../utils';
diff --git a/tests/api-tests/auth-header.test.ts b/tests/api-tests/auth-header.test.ts
@@ -1,6 +1,6 @@
 import { text, timestamp, password } from '@keystone-6/core/fields';
 import { list } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import type { KeystoneContext } from '@keystone-6/core/types';
 import { setupTestRunner, setupTestEnv } from '@keystone-6/api-tests/test-runner';
diff --git a/tests/api-tests/auth.test.ts b/tests/api-tests/auth.test.ts
@@ -1,6 +1,6 @@
 import { text, password } from '@keystone-6/core/fields';
 import { list } from '@keystone-6/core';
-import { statelessSessions } from '@keystone-6/core/session';
+import { statelessSessions } from '@keystone-6/auth/session';
 import { createAuth } from '@keystone-6/auth';
 import { setupTestRunner } from '@keystone-6/api-tests/test-runner';
 import { allowAll } from '@keystone-6/core/access';

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "main": "dist/keystone-6-auth-session.cjs.js",
 +  "module": "dist/keystone-6-auth-session.esm.js"
 +}