@mapomodule/core 1.0.0-alpha.15 → 1.0.0-alpha.18

package/CHANGELOG.md

@@ -3,6 +3,45 @@
 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.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)
+
+
+### Features
+
+* Added mapo integrations module! 🎉 ([76d2c80](https://github.com/lotrekagency/mapo/commit/76d2c805245b4cf49a33696339da52e4c17f4053))
+* added mapo options to mapo helper ([38dcbf2](https://github.com/lotrekagency/mapo/commit/38dcbf28d286eb02c2a6785a883a14edaa0837b1))
+
+
+### BREAKING CHANGES
+
+* This change removes all the camomilla cms references moving the compatibility layer in a detached package [mapo-integrations-camomilla](https://github.com/lotrekagency/mapo-integrations-camomilla). The guidelines to make mapo work with camomilla will be provided in the package readme.
+
+
+
+
+
 # [1.0.0-alpha.15](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.14...v1.0.0-alpha.15) (2022-03-11)
 
 

package/index.js

@@ -1,6 +1,7 @@
 import createRepository from '@mapomodule/core/api/crud'
 import transformRequestInMultipart from '@mapomodule/core/api/multipart'
 import initInterceptors from '@mapomodule/core/interceptor'
+import options from './options'
 
 function getRouteMiddlewares(route) {
     const meta = Array.isArray(route?.meta) ? route.meta[0] : route.meta
@@ -8,6 +9,7 @@ function getRouteMiddlewares(route) {
     return (typeof middleware === "string" ? [middleware] : middleware) || []
 }
 
+const { axios, ...conf } = options;
 
 export default (ctx, inject) => {
 
@@ -19,8 +21,10 @@ export default (ctx, inject) => {
          */
         $api: {
             crud: createRepository(ctx.$axios),
-            multipart: transformRequestInMultipart
+            multipart: transformRequestInMultipart,
+            conf: axios
         },
+        $options: conf,
         /**
          * From here you can reach some utilities that simplify the interaction with the user authentication flow.
          */
@@ -35,7 +39,7 @@ export default (ctx, inject) => {
              * 
              * This simply commits a logout to the vuex store.
              */
-            logout: () => ctx.store.dispatch("mapo/user/login"),
+            logout: () => ctx.store.dispatch("mapo/user/logout"),
             /**
              * This refresh user informations present in vuex store and returns them.
              * @returns {UserData}

package/interceptor/auth.js

@@ -19,9 +19,9 @@ module.exports = ({ $axios, store }) => {
         })
 
         $axios.onError((error) => {
-            const { status } = error.response || {}
-            if (status === 401) {
-                store.dispatch('mapo/user/logout');
+            const { status, request } = error.response || {}
+            if (status === 401 && (request || {}).path !== '/api/auth/logout') {
+                store.dispatch('mapo/user/logout')
             }
             if (status == 403) {
                 store.dispatch("mapo/app/showSnackMessage", { message: "Permission denied..", color: "error" })

package/middleware/auth.js

@@ -1,8 +1,8 @@
 import Middleware from '../../middleware' // little hack to inject middleware in root project :P
 
 Middleware.auth = Middleware.auth || function ({ route, redirect, query, store }) {
-    const hasToken = store.getters['mapo/user/token']
-    if (!hasToken) {
+    const isLoggedIn = store.getters['mapo/user/isLoggedIn']
+    if (!isLoggedIn) {
         query['redirect'] = route.path
         return redirect('/login', query)
     }

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/module.js

@@ -23,6 +23,13 @@ export default async function (moduleOptions) {
         fileName: path.join(namespace, 'mapo.js')
     })
 
+    // INJECT MAPO OPTIONS
+    this.addTemplate({
+        src: path.resolve(__dirname, './options.js'),
+        fileName: path.join(namespace, 'options.js'),
+        options: { axios: (this.options && this.options.axios), ...moduleOptions }
+    })
+
     // INJECT ALL MIDDLEWARES
     const middlewares = (await resolver.resolveRelative(__dirname, 'middleware')).map(({ src }) => src)
 

package/options.js

@@ -0,0 +1 @@
+export default <%= serializeFunction(options) %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapomodule/core",
-  "version": "1.0.0-alpha.15",
+  "version": "1.0.0-alpha.18",
   "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": "cd42b3dd094ef3bf743c67819e6059bf9ccac491"
+  "gitHead": "1b05e625339b6ee6ed0e238739cc31fbd84f3397"
 }