old system has been removed, Just need to update the routes now to us…

…e the new system.
withstudiocms · Oct 29, 2024 · 1718b5f · 1718b5f
1 parent f0d60a7
commit 1718b5f
Show file tree

Hide file tree

Showing 33 changed files with 824 additions and 1,154 deletions.
diff --git a/packages/studiocms/package.json b/packages/studiocms/package.json
@@ -49,7 +49,6 @@
     "@matthiesenxyz/astrolace": "catalog:studiocms-shared",
     "@matthiesenxyz/integration-utils": "catalog:studiocms-shared",
     "@matthiesenxyz/unocss-preset-daisyui": "catalog:studiocms-shared",
-    "@noble/hashes": "catalog:studiocms-shared",
     "@shikijs/transformers": "catalog:studiocms-renderer",
     "@studiocms/assets": "workspace:*",
     "@studiocms/auth": "workspace:*",
@@ -62,17 +61,19 @@
     "@studiocms/robotstxt": "workspace:*",
     "@unocss/astro": "catalog:studiocms-shared",
     "@unocss/reset": "catalog:studiocms-shared",
+    "@oslojs/crypto": "catalog:studiocms-shared",
+    "@oslojs/encoding": "catalog:studiocms-shared",
+    "@oslojs/binary": "catalog:studiocms-shared",
+    "@node-rs/argon2": "catalog:studiocms-shared",
     "astro-integration-kit": "catalog:",
     "arctic": "catalog:studiocms-shared",
     "daisyui": "catalog:studiocms-shared",
-    "lucia": "catalog:studiocms-shared",
     "marked": "catalog:studiocms-shared",
     "marked-alert": "catalog:studiocms-renderer",
     "marked-emoji": "catalog:studiocms-renderer",
     "marked-footnote": "catalog:studiocms-renderer",
     "marked-shiki": "catalog:studiocms-renderer",
     "marked-smartypants": "catalog:studiocms-renderer",
-    "micromatch": "catalog:studiocms-shared",
     "mrmime": "catalog:studiocms-shared",
     "package-json": "catalog:studiocms",
     "semver": "catalog:studiocms",
@@ -92,7 +93,6 @@
   "devDependencies": {
     "vite": "catalog:",
     "typescript": "catalog:",
-    "@types/micromatch": "catalog:studiocms-shared",
     "@types/semver": "catalog:studiocms"
   }
 }
diff --git a/packages/studiocms_auth/package.json b/packages/studiocms_auth/package.json
@@ -30,20 +30,20 @@
     "src"
   ],
   "exports": {
-    ".": "./src/index.ts",
-    "./lucia": "./src/auth/index.ts"
+    ".": "./src/index.ts"
   },
   "type": "module",
   "dependencies": {
     "@inox-tools/runtime-logger": "catalog:studiocms-shared",
     "@matthiesenxyz/astrolace": "catalog:studiocms-shared",
     "@matthiesenxyz/astrodtsbuilder": "catalog:studiocms-shared",
     "@matthiesenxyz/integration-utils": "catalog:studiocms-shared",
-    "@noble/hashes": "catalog:studiocms-shared",
     "@studiocms/assets": "workspace:*",
     "@studiocms/core": "workspace:*",
-    "micromatch": "catalog:studiocms-shared",
-    "lucia": "catalog:studiocms-shared",
+    "@oslojs/crypto": "catalog:studiocms-shared",
+    "@oslojs/encoding": "catalog:studiocms-shared",
+    "@oslojs/binary": "catalog:studiocms-shared",
+    "@node-rs/argon2": "catalog:studiocms-shared",
     "arctic": "catalog:studiocms-shared",
     "astro-integration-kit": "catalog:"
   },
@@ -55,7 +55,6 @@
   },
   "devDependencies": {
     "vite": "catalog:",
-    "typescript": "catalog:",
-    "@types/micromatch": "catalog:studiocms-shared"
+    "typescript": "catalog:"
   }
 }
diff --git a/packages/studiocms_auth/src/astroenv/env.ts b/packages/studiocms_auth/src/astroenv/env.ts
@@ -4,6 +4,12 @@ import { envField } from 'astro/config';
 export const astroENV: AstroConfig['experimental']['env'] = {
 	validateSecrets: true,
 	schema: {
+		// Auth Encryption Key
+		CMS_ENCRYPTION_KEY: envField.string({
+			context: 'server',
+			access: 'secret',
+			optional: false,
+		}),
 		// GitHub Auth Provider Environment Variables
 		CMS_GITHUB_CLIENT_ID: envField.string({
 			context: 'server',

diff --git a/packages/studiocms_auth/src/auth/index.ts b/packages/studiocms_auth/src/auth/index.ts
diff --git a/packages/studiocms_auth/src/auth/lucia-astrodb-adapter.ts b/packages/studiocms_auth/src/auth/lucia-astrodb-adapter.ts
diff --git a/packages/studiocms_auth/src/helpers/authHelper.ts b/packages/studiocms_auth/src/helpers/authHelper.ts