fix(auth): remove unused packages (csrf, csurf)

tenseijs · Dec 4, 2020 · c9a58da · c9a58da
1 parent 109ad62
commit c9a58da
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 164 deletions.
diff --git a/media-library.md b/media-library.md
diff --git a/packages/auth/auth.d.ts b/packages/auth/auth.d.ts
@@ -14,7 +14,6 @@ declare global {
 
 declare module 'express-session' {
     interface SessionData {
-        views: number
         user: {
             id: number
         }

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -40,8 +40,6 @@
         "@purest/providers": "^1.0.1",
         "@tensei/common": "^0.4.1",
         "@types/bcryptjs": "^2.4.2",
-        "@types/csrf": "^1.3.2",
-        "@types/csurf": "^1.11.0",
         "@types/express-session": "^1.17.3",
         "@types/jsonwebtoken": "^8.5.0",
         "@types/qrcode": "^1.3.5",
@@ -51,8 +49,6 @@
         "@types/uniqid": "^5.2.0",
         "bcryptjs": "^2.4.3",
         "change-case": "^4.1.1",
-        "csrf": "^3.1.0",
-        "csurf": "^1.11.0",
         "dayjs": "^1.8.34",
         "express-session": "^1.17.1",
         "grant": "^5.4.4",

diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts
@@ -151,18 +151,6 @@ class Auth {
         return this
     }
 
-    public tokenExpiresIn(tokenExpiresIn: number) {
-        this.config.tokensConfig.accessTokenExpiresIn = tokenExpiresIn
-
-        return this
-    }
-
-    public tokenSecretKey(secret: string) {
-        this.config.tokensConfig.secretKey = secret
-
-        return this
-    }
-
     public apiPath(path: string) {
         this.config.apiPath = path
 
@@ -1961,7 +1949,7 @@ class Auth {
     }
 
     private getRoleUserKey() {
-        return this.resources.role.data.snakeCaseName
+        return this.resources.role.data.snakeCaseNamePlural
     }
 
     private getPermissionUserKey() {

diff --git a/packages/common/src/api/GraphQlQuery.ts b/packages/common/src/api/GraphQlQuery.ts
@@ -11,7 +11,6 @@ export class GraphQlQuery implements GraphQlQueryContract {
         path: '',
         name: '',
         internal: false,
-        csrf: true,
         type: 'QUERY',
         middleware: [],
         snakeCaseName: '',
@@ -85,12 +84,6 @@ export class GraphQlQuery implements GraphQlQueryContract {
         return this
     }
 
-    noCsrf() {
-        this.config.csrf = false
-
-        return this
-    }
-
     internal() {
         this.config.internal = true
 

diff --git a/packages/common/src/api/Route.ts b/packages/common/src/api/Route.ts
@@ -14,7 +14,6 @@ export class Route implements RouteContract {
     } = {
         path: '',
         name: '',
-        csrf: true,
         type: 'GET',
         internal: false,
         middleware: [],
@@ -101,12 +100,6 @@ export class Route implements RouteContract {
         return this
     }
 
-    noCsrf() {
-        this.config.csrf = false
-
-        return this
-    }
-
     extend(extend: RouteExtendContract) {
         this.config.extend = extend
 

diff --git a/packages/common/typings/config.d.ts b/packages/common/typings/config.d.ts
@@ -40,7 +40,6 @@ declare module '@tensei/common/config' {
         put(): this
         patch(): this
         delete(): this
-        noCsrf(): this
         internal(): this
         extend(extend: RouteExtendContract): this
         resource(resource: ResourceContract): this
@@ -76,7 +75,6 @@ declare module '@tensei/common/config' {
         config: GraphQlQueryConfig
         path(path: string): this
         query(): this
-        noCsrf(): this
         mutation(): this
         internal(): this
         subscription(): this
@@ -90,7 +88,6 @@ declare module '@tensei/common/config' {
     interface RouteConfig {
         path: string
         name: string
-        csrf: boolean
         internal: boolean
         type: EndpointTypes
         snakeCaseName: string
@@ -108,7 +105,6 @@ declare module '@tensei/common/config' {
     > {
         path: string
         name: string
-        csrf: boolean
         middleware: GraphQlQueryConfig['handler'][]
         internal: boolean
         snakeCaseName: string

diff --git a/packages/core/Tensei.ts b/packages/core/Tensei.ts
@@ -237,8 +237,9 @@ export class Tensei implements TenseiContract {
 
         this.server.listen(port, () => {
             this.ctx.logger.success(
-                `🚀 Access your server on ${this.ctx.serverUrl ||
-                    `http://127.0.0.1:${port}`}`
+                `🚀 Access your server on ${
+                    this.ctx.serverUrl || `http://127.0.0.1:${port}`
+                }`
             )
         })
     }
@@ -562,9 +563,7 @@ export class Tensei implements TenseiContract {
     }
 
     private mail(driverName: SupportedDrivers, mailConfig = {}) {
-        this.ctx.mailer = mail()
-            .connection(driverName)
-            .config(mailConfig)
+        this.ctx.mailer = mail().connection(driverName).config(mailConfig)
 
         return this
     }

diff --git a/packages/core/database/index.ts b/packages/core/database/index.ts
@@ -128,7 +128,7 @@ class Database {
     }
 
     private generateEntityClass(resource: ResourceContract) {
-        const entityClass = function() {}
+        const entityClass = function () {}
 
         Object.defineProperty(entityClass, 'name', {
             value: resource.data.pascalCaseName,

diff --git a/packages/express-session-mikro-orm/src/index.ts b/packages/express-session-mikro-orm/src/index.ts
@@ -49,10 +49,7 @@ const StoreFactory = (Store: any) => {
                     this.options.tableName,
                     (table: any) => {
                         table.string('session_id').primary()
-                        table
-                            .datetime('expires')
-                            .nullable()
-                            .index()
+                        table.datetime('expires').nullable().index()
                         table.text('data').notNullable()
                     }
                 )

diff --git a/packages/media/src/index.ts b/packages/media/src/index.ts
@@ -59,9 +59,7 @@ class MediaLibrary {
 
                     if (fileFields.length) {
                         MediaResource.fields([
-                            belongsTo(resource.data.name)
-                                .nullable()
-                                .hidden()
+                            belongsTo(resource.data.name).nullable().hidden()
                         ])
                     }
                 })

diff --git a/packages/media/src/resources.ts b/packages/media/src/resources.ts
@@ -16,19 +16,13 @@ export const mediaResource = () =>
             .searchable(),
         integer('Width').nullable(),
         integer('Height').nullable(),
-        text('Original Filename')
-            .nullable()
-            .searchable(),
+        text('Original Filename').nullable().searchable(),
         text('Extension')
             .description('The file extension, for example psd, pdf, png')
             .searchable(),
-        text('Mime Type')
-            .nullable()
-            .searchable(),
+        text('Mime Type').nullable().searchable(),
         text('Hash').searchable(),
-        text('Path')
-            .nullable()
-            .searchable(),
+        text('Path').nullable().searchable(),
         text('Alt Text').nullable(),
         text('Disk').nullable(),
         json('Disk Meta').nullable(),

diff --git a/packages/tests/helpers/resources/Comment.ts b/packages/tests/helpers/resources/Comment.ts
@@ -1,9 +1,7 @@
 import { text, resource, textarea, belongsTo } from '@tensei/common'
 
 export default resource('Comment').fields([
-    text('Title')
-        .rules('required')
-        .searchable(),
+    text('Title').rules('required').searchable(),
     textarea('Body').rules('required'),
     belongsTo('Post')
 ])
diff --git a/packages/tests/helpers/resources/Post.ts b/packages/tests/helpers/resources/Post.ts
@@ -72,9 +72,7 @@ export default resource('Post')
         textarea('Content')
             .rules('required', 'max:2000', 'min:12')
             .hideOnIndex(),
-        integer('Av. CPC')
-            .rules('required')
-            .hideOnDetail(),
+        integer('Av. CPC').rules('required').hideOnDetail(),
         select('Category')
             .options([
                 {

diff --git a/packages/tests/helpers/resources/Tag.ts b/packages/tests/helpers/resources/Tag.ts
@@ -2,13 +2,8 @@ import { text, resource, textarea, belongsToMany, number } from '@tensei/common'
 
 export default resource('Tag')
     .fields([
-        text('Name')
-            .rules('required')
-            .searchable(),
-        number('Priority')
-            .nullable()
-            .default(1)
-            .rules('integer', 'under:5'),
+        text('Name').rules('required').searchable(),
+        number('Priority').nullable().default(1).rules('integer', 'under:5'),
         textarea('Description'),
         belongsToMany('Post')
     ])

diff --git a/packages/tests/helpers/resources/User.ts b/packages/tests/helpers/resources/User.ts
@@ -2,9 +2,7 @@ import { text, resource, hasMany } from '@tensei/common'
 
 export default resource('User')
     .fields([
-        text('Full name')
-            .searchable()
-            .rules('required'),
+        text('Full name').searchable().rules('required'),
         text('Email')
             .unique()
             .searchable()

diff --git a/packages/tests/helpers/resources/UserNoRel.ts b/packages/tests/helpers/resources/UserNoRel.ts
@@ -2,9 +2,7 @@ import { text, hasMany, resource } from '@tensei/common'
 
 export default resource('User')
     .fields([
-        text('Full name')
-            .searchable()
-            .rules('required'),
+        text('Full name').searchable().rules('required'),
         text('Email')
             .unique()
             .searchable()

diff --git a/packages/tests/packages/auth/auth.spec.ts b/packages/tests/packages/auth/auth.spec.ts
@@ -17,11 +17,7 @@ test('Registers auth resources when plugin is registered', async () => {
 test('Can customize the name of the authenticator user', async () => {
     const {
         ctx: { resources }
-    } = await setup([
-        auth()
-            .user('Customer')
-            .plugin()
-    ])
+    } = await setup([auth().user('Customer').plugin()])
 
     expect(
         resources.find(resource => resource.data.name === 'Customer')
@@ -31,11 +27,7 @@ test('Can customize the name of the authenticator user', async () => {
 test('Enabling roles and permissions registers Role and permission resources', async () => {
     const {
         ctx: { resources }
-    } = await setup([
-        auth()
-            .rolesAndPermissions()
-            .plugin()
-    ])
+    } = await setup([auth().rolesAndPermissions().plugin()])
 
     expect(
         resources.filter(resource =>
@@ -213,10 +205,7 @@ test('Can request a password reset and reset password', async () => {
         },
         app
     } = await setup([
-        auth()
-            .verifyEmails()
-            .user('Student')
-            .plugin(),
+        auth().verifyEmails().user('Student').plugin(),
         graphql().plugin(),
         setupFakeMailer(mailerMock)
     ])
@@ -309,10 +298,7 @@ test('Can login and stay authenticated with cookie based applications', async ()
         },
         app
     } = await setup([
-        auth()
-            .verifyEmails()
-            .user('Student')
-            .plugin(),
+        auth().verifyEmails().user('Student').plugin(),
         graphql().plugin()
     ])
 
@@ -635,10 +621,7 @@ test('if a refresh token is used twice (compromised), the user is automatically
         },
         app
     } = await setup([
-        auth()
-            .user('Customer')
-            .noCookies()
-            .plugin(),
+        auth().user('Customer').noCookies().plugin(),
         graphql().plugin()
     ])
 

diff --git a/packages/tests/packages/media/setup/index.ts b/packages/tests/packages/media/setup/index.ts
@@ -27,10 +27,7 @@ export const setup = (maxFileSize = 10000000) =>
             plugin('Add meeting resource').register(({ extendResources }) => {
                 extendResources([meetingResource(), gistResource()])
             }),
-            media()
-                .maxFiles(4)
-                .maxFileSize(maxFileSize)
-                .plugin(),
+            media().maxFiles(4).maxFileSize(maxFileSize).plugin(),
             graphql().plugin()
         ],
         true

diff --git a/packages/trix/src/client/index.js b/packages/trix/src/client/index.js
@@ -5,7 +5,7 @@ import 'trix/dist/trix.css'
 
 const TrixField = 'TrixField'
 
-Tensei.booting(function() {
+Tensei.booting(function () {
     this.field(TrixField, Trix)
 
     this.detailField(TrixField, TrixDetail)