fix(auth): fix permissions checks for auth package

tenseijs · Nov 26, 2020 · 58ea6ab · 58ea6ab
1 parent 0a56b33
commit 58ea6ab
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/examples/blog/app.js b/examples/blog/app.js
@@ -81,7 +81,7 @@ module.exports = tensei()
     .databaseConfig({
         type: process.env.DATABASE_TYPE || 'mysql',
         dbName: process.env.DATABASE_NAME || 'mikrotensei',
-        debug: process.env.DEBUG || false,
+        debug: process.env.DEBUG || true,
         user: process.env.DATABASE_USER || 'mikrotensei',
         password: process.env.DATABASE_PASSWORD || '',
     })
diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts
@@ -591,7 +591,7 @@ class Auth {
                                 ].includes(path)
                             ) {
                                 return query.authorize(({ user }) =>
-                                    user.permissions!.includes(`insert:${slug}`)
+                                    user?.permissions?.includes(`insert:${slug}`)
                                 )
                             }
 
@@ -602,7 +602,7 @@ class Auth {
                                 ].includes(path)
                             ) {
                                 return query.authorize(({ user }) =>
-                                    user.permissions!.includes(`delete:${slug}`)
+                                    user?.permissions?.includes(`delete:${slug}`)
                                 )
                             }
 
@@ -613,19 +613,19 @@ class Auth {
                                 ].includes(path)
                             ) {
                                 return query.authorize(({ user }) =>
-                                    user.permissions!.includes(`update:${slug}`)
+                                    user?.permissions?.includes(`update:${slug}`)
                                 )
                             }
 
                             if (path === plural) {
                                 return query.authorize(({ user }) =>
-                                    user.permissions!.includes(`fetch:${slug}`)
+                                    user?.permissions?.includes(`fetch:${slug}`)
                                 )
                             }
 
                             if (path === singular) {
                                 return query.authorize(({ user }) =>
-                                    user.permissions!.includes(`show:${slug}`)
+                                    user?.permissions?.includes(`show:${slug}`)
                                 )
                             }
                         }
@@ -702,7 +702,7 @@ class Auth {
                                 internal
                             ) {
                                 return route.authorize(({ user }) =>
-                                    user.permissions!.includes(
+                                    user?.permissions?.includes(
                                         `insert:${slugSingular}`
                                     )
                                 )
@@ -714,7 +714,7 @@ class Auth {
                                 internal
                             ) {
                                 return route.authorize(({ user }) =>
-                                    user.permissions!.includes(
+                                    user?.permissions?.includes(
                                         `fetch:${slugSingular}`
                                     )
                                 )
@@ -726,7 +726,7 @@ class Auth {
                                 internal
                             ) {
                                 return route.authorize(({ user }) =>
-                                    user.permissions!.includes(
+                                    user?.permissions?.includes(
                                         `show:${slugSingular}`
                                     )
                                 )
@@ -741,7 +741,7 @@ class Auth {
                                 internal
                             ) {
                                 return route.authorize(({ user }) =>
-                                    user.permissions!.includes(
+                                    user?.permissions?.includes(
                                         `update:${slugSingular}`
                                     )
                                 )
@@ -756,7 +756,7 @@ class Auth {
                                 internal
                             ) {
                                 return route.authorize(({ user }) =>
-                                    user.permissions!.includes(
+                                    user?.permissions!.includes(
                                         `delete:${slugSingular}`
                                     )
                                 )
@@ -1689,21 +1689,18 @@ class Auth {
                 slug: 'public'
             },
             {
-                populate: [this.resources.permission.data.snakeCaseNamePlural],
+                populate: ['permissions'],
                 refresh: true
             }
         )
 
         if (!user) {
             ctx.user = {
                 public: true,
-                [this.resources.role.data.snakeCaseNamePlural]: [
+                roles: [
                     publicRole as UserRole
                 ],
-                [this.resources.permission.data
-                    .snakeCaseNamePlural]: publicRole[
-                    this.resources.permission.data.snakeCaseNamePlural
-                ]
+                permissions: publicRole.permissions
                     .toJSON()
                     .map((permission: any) => permission.slug)
             } as any
@@ -1761,6 +1758,13 @@ class Auth {
                 }
             )
 
+            if (this.config.rolesAndPermissions) {
+                user.permissions = user.roles.reduce((acc: string[], role: UserRole) => [
+                    ...acc,
+                    ...role.permissions.map(p => p.slug)
+                ], [])
+            }
+
             ctx.user = user
         } catch (error) {}
     }

diff --git a/packages/common/typings/config.d.ts b/packages/common/typings/config.d.ts
@@ -160,6 +160,11 @@ declare module '@tensei/common/config' {
         id: number
         name: string
         slug: string
+        permissions: ({
+            id: number
+            name: string
+            slug: string
+        })[]
     }
     interface User {
         id: number