From b4343dc241be8eaec663bd3a398fee7e53884944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Mon, 27 Feb 2023 12:21:58 +0100 Subject: [PATCH] [Calendar] Add-time-modal only for logged user --- app/src/plugins/tm@dashboard/_components/z-timeline.vue | 4 +++- app/src/plugins/w/auth/auth.store.ts | 2 +- app/src/plugins/w/auth/refreshExpired.ts | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue index 9014a3a..f220716 100644 --- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue @@ -156,7 +156,9 @@ export default { try { const { subtask } = await this.$axios.put_auth(`v1/subtasks/${editedSubtask.id}`, editedSubtask) this.$events.emit('on-subtask-edited', subtask) - this.$events.emit('show-task-add-time-modal', { subtask }) + + if (subtask.employee_id == this.$store.getters['auth/user'].id) + this.$events.emit('show-task-add-time-modal', { subtask }) } catch (error) { this.$toast.error(error.message || error) } diff --git a/app/src/plugins/w/auth/auth.store.ts b/app/src/plugins/w/auth/auth.store.ts index a144723..7472887 100644 --- a/app/src/plugins/w/auth/auth.store.ts +++ b/app/src/plugins/w/auth/auth.store.ts @@ -1,5 +1,5 @@ import axios from '@/plugins/w/axios/models/axios' -// import './refreshExpired' +import './refreshExpired' export default { namespaced: true, diff --git a/app/src/plugins/w/auth/refreshExpired.ts b/app/src/plugins/w/auth/refreshExpired.ts index 506db67..1e1057f 100644 --- a/app/src/plugins/w/auth/refreshExpired.ts +++ b/app/src/plugins/w/auth/refreshExpired.ts @@ -3,7 +3,10 @@ import axios from 'axios' import store from '@/store' async function _unauthorised(error: any) { - return store.dispatch('auth/logout') + if (error?.response?.data?.message == 'Unauthenticated.') + return store.dispatch('auth/logout') + + return error } axios.interceptors.response.use(