@mapomodule/core 1.0.0-alpha.16 → 1.0.0-alpha.19

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 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.19](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.18...v1.0.0-alpha.19) (2022-04-06)
+
+
+### Bug Fixes
+
+* fix logout loop ([3177cca](https://github.com/lotrekagency/mapo/commit/3177ccaf4be6151feec379c4241f8784b79d4361))
+
+
+
+
+
+# [1.0.0-alpha.18](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.17...v1.0.0-alpha.18) (2022-04-04)
+
+
+### Bug Fixes
+
+* fix core interceptor syntax ([c546a48](https://github.com/lotrekagency/mapo/commit/c546a48f22bf689d4b679aaab82b2b9ed62f26cc))
+
+
+
+
+
+# [1.0.0-alpha.17](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.16...v1.0.0-alpha.17) (2022-04-03)
+
+
+### Bug Fixes
+
+* various fixes to auth loops ([58cdb58](https://github.com/lotrekagency/mapo/commit/58cdb586e88df8e595876ba4dd4d4cc11865f7e3))
+
+
+
+
+
 # [1.0.0-alpha.16](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.15...v1.0.0-alpha.16) (2022-04-03)
 
 

package/interceptor/auth.js

@@ -1,5 +1,5 @@
 module.exports = ({ $axios, store }) => {
-    if ($axios && store){
+    if ($axios && store) {
         $axios.onRequest((config) => {
             const token = store.getters['mapo/user/token']
             if (token && token !== 'undefined') {
@@ -7,7 +7,7 @@ module.exports = ({ $axios, store }) => {
             }
             return config
         })
-    
+
         $axios.onResponse((response) => {
             if (response.status === 401) {
                 store.dispatch('mapo/user/logout');
@@ -19,9 +19,11 @@ module.exports = ({ $axios, store }) => {
         })
 
         $axios.onError((error) => {
-            const { status } = error.response || {}
-            if (status === 401) {
-                store.dispatch('mapo/user/logout');
+            const { status, request } = error.response || {}
+            const baseURL = ($axios.defaults.baseURL || "").replace(/https?:\/\/[^\/]+/i, "")
+            const logoutPath = `${baseURL.endsWith("/") ? baseURL : baseURL + "/"}${process.env.AUTH_LOGIN_URL || "api/auth/logout"}`
+            if (status === 401 && (request || {}).path !== logoutPath) {
+                store.dispatch('mapo/user/logout')
             }
             if (status == 403) {
                 store.dispatch("mapo/app/showSnackMessage", { message: "Permission denied..", color: "error" })

package/middleware/permissions.js

@@ -9,7 +9,7 @@ Middleware.permissions = Middleware.permissions || async function ({ route, erro
         return
     }
     const { model } = route.meta.permissions
-    const userPermission = userInfo.user_permissions.filter(perm => perm.codename.endsWith(model)).map(({ codename }) => codename.replace(`_${model}`, ''))
+    const userPermission = (userInfo.user_permissions || []).filter(perm => perm.codename.endsWith(model)).map(({ codename }) => codename.replace(`_${model}`, ''))
     if (!userPermission.includes('view')) {
         return error({ statusCode: 404, message: 'This page could not be found' })
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapomodule/core",
-  "version": "1.0.0-alpha.16",
+  "version": "1.0.0-alpha.19",
   "description": "This is part of Mapo nuxt module. Injects the core mapo plugin helpers.",
   "author": "bnznamco <gabriele.baldi.01@gmail.com>",
   "keywords": [
@@ -18,5 +18,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2ef4275464cd8eb28cbbc61c980355b1379186b5"
+  "gitHead": "3bc598b7ecb64c67a164b438847eb237f78efc75"
 }