chore: temporarily use beta adminjs

SoftwareBrothers · Mar 21, 2023 · 69b79bf · 69b79bf
1 parent 35a957c
commit 69b79bf
Show file tree

Hide file tree

Showing 4 changed files with 1,792 additions and 1,482 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "@types/koa__router": "^12.0.0",
     "@typescript-eslint/eslint-plugin": "^5.56.0",
     "@typescript-eslint/parser": "^5.56.0",
-    "adminjs": "^6.0.0",
+    "adminjs": "^7.0.0-beta-v7.1",
     "eslint": "^8.36.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.27.5",
@@ -57,5 +57,8 @@
     "koa-mount": "^4.0.0",
     "koa-session": "^6.4.0",
     "koa-static": "^5.0.0"
+  },
+  "resolutions": {
+    "@types/koa": "^2.13.5"
   }
 }
diff --git a/src/index.ts b/src/index.ts
@@ -106,12 +106,8 @@
 import buildAuthenticatedRouter from './buildAuthenticatedRouter.js'
 import buildRouter from './buildRouter.js'
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-import packageJson from '../package.json' assert { type: 'json' }
-
-const { version } = packageJson
-
 const name = 'AdminJSKoa'
+const version = '4'
 
 export type KoaPlugin = {
   name: string;

diff --git a/src/utils.ts b/src/utils.ts
@@ -41,7 +41,7 @@ const addAdminJsRoutes = (admin: AdminJS, router: Router, app: Application): voi
           params,
           query: request.query,
           payload: {
-            ...(request.body || {}),
+            ...((request as any).body || {}),
             ...(request.files || {}),
           },
         }
@@ -105,7 +105,7 @@ const addAdminJsAuthRoutes = (admin: AdminJS, router: Router, auth: KoaAuthOptio
       throw new Error('Invalid state, no session object in context')
     }
 
-    const { email, password } = ctx.request.body
+    const { email, password } = (ctx.request as any).body
     const adminUser = await auth.authenticate(email, password)
     if (adminUser) {
       ctx.session.adminUser = adminUser