@mapomodule/core 1.0.0-alpha.6 → 1.0.0-alpha.8

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-alpha.8](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.7...v1.0.0-alpha.8) (2022-01-23)
+
+
+### Bug Fixes
+
+* **auth:** logout user only on 401 ([818f3d5](https://github.com/lotrekagency/mapo/commit/818f3d5ff315635438ac9bc9566a1b2fd2c5cf03))
+* **permission:** fix bad store initialization on ssr ([f075824](https://github.com/lotrekagency/mapo/commit/f075824561d6a71ce07ecbba70e994102abd623b))
+* **permissions:** add route permissions with routename instead on path ([16ff6ee](https://github.com/lotrekagency/mapo/commit/16ff6eee5e3a8ddbf9e7aea1ba05e8a88fb43932))
+
+
+
+
+
 # [1.0.0-alpha.6](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2021-12-26)
 
 

package/index.js

@@ -2,6 +2,13 @@ import createRepository from '@mapomodule/core/api/crud'
 import transformRequestInMultipart from '@mapomodule/core/api/multipart'
 import initInterceptors from '@mapomodule/core/interceptor'
 
+function getRouteMiddlewares(route) {
+    const meta = Array.isArray(route?.meta) ? route.meta[0] : route.meta
+    const { middleware } = meta
+    return (typeof middleware === "string" ? [middleware] : middleware) || []
+}
+
+
 export default (ctx, inject) => {
 
     initInterceptors(ctx)
@@ -39,9 +46,23 @@ export default (ctx, inject) => {
                 get token() { return ctx.store.getters['mapo/user/token'] },
                 get info() { return ctx.store.getters['mapo/user/info'] },
                 get username() { return ctx.store.getters['mapo/user/username'] },
-                get permissions() { return ctx.store.getters['mapo/user/pagePermission'](ctx.app.context.route.path) },
+                get permissions() { return ctx.store.getters['mapo/user/pagePermission'](ctx.app.context.route.name) },
                 get role() { return ctx.store.getters['mapo/user/role'] }
-            }
+            },
+            /**
+             * 
+             * This returns the current route middlewares if routemeta is enabled.
+             */
+            get routeMiddlewares() {
+                return getRouteMiddlewares(ctx.app.context.route)
+            },
+            /**
+             * 
+             * This returns the middlewares of a given route if routemeta is enabled.
+             * @param { Object } route { meta } the route object with meta info.
+             * @returns { Array } 
+             */
+            getRouteMiddlewares: getRouteMiddlewares
         },
         /**
          * From here you can manage the default popup messaging system of mapo.

package/interceptor/auth.js

@@ -9,17 +9,15 @@ module.exports = ({ $axios, store }) => {
         })
     
         $axios.onResponse((response) => {
-            if (response.status !== 200) {
-                if (response.status === 401 || response.status === 402 || response.status === 403) {
-                    store.dispatch('mapo/user/logout');
-                }
+            if (response.status === 401) {
+                store.dispatch('mapo/user/logout');
             }
             return response
         })
     
         $axios.onError((error) => {
             const { status } = error.response || {}
-            if (status === 401 || status === 402 || status === 403) {
+            if (status === 401) {
                 store.dispatch('mapo/user/logout');
             }
             return Promise.reject(error)

package/middleware/permissions.js

@@ -5,7 +5,7 @@ Middleware.permissions = Middleware.permissions || async function ({ route, erro
     if (!route.meta.permissions) return
     const userInfo = store.getters['mapo/user/info']
     if (userInfo.is_superuser) {
-        await store.dispatch('mapo/user/addPagePermission', {key: route.path, value: ["add", "change", "delete", "view"]})
+        await store.dispatch('mapo/user/addPagePermission', {key: route.name, value: ["add", "change", "delete", "view"]})
         return
     }
     const { model } = route.meta.permissions
@@ -13,7 +13,7 @@ Middleware.permissions = Middleware.permissions || async function ({ route, erro
     if (!userPermission.includes('view')) {
         return error({ statusCode: 404, message: 'This page could not be found' })
     } else {
-        await store.dispatch('mapo/user/addPagePermission', {key: route.path, value: userPermission})
+        await store.dispatch('mapo/user/addPagePermission', {key: route.name, value: userPermission})
         return
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapomodule/core",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.8",
   "description": "This is part of Mapo nuxt module. Injects the core mapo plugin helpers.",
   "author": "bnznamco <gabriele.baldi.01@gmail.com>",
   "keywords": [
@@ -13,10 +13,10 @@
   "repository": "https://github.com/lotrekagency/mapo",
   "main": "./module.js",
   "dependencies": {
-    "@mapomodule/utils": "^1.0.0-alpha.1"
+    "@mapomodule/utils": "^1.0.0-alpha.8"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c30717d018606a1393f3a1f680276b1817d1d7a8"
+  "gitHead": "4448ce925e9f3af25f78f86c3e28a88145201520"
 }