From 0295113f5064f43bbd3a66794b9f723d41bb0dc0 Mon Sep 17 00:00:00 2001
From: dpschen <dpschen@noreply.kolaente.de>
Date: Fri, 10 Sep 2021 13:04:00 +0000
Subject: [PATCH] feat: use store getters to check auth (#731)

Co-authored-by: Dominik Pschenitschni <mail@celement.de>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/731
Reviewed-by: konrad <k@knt.li>
Co-authored-by: dpschen <dpschen@noreply.kolaente.de>
Co-committed-by: dpschen <dpschen@noreply.kolaente.de>
---
 src/App.vue                           | 10 +++++-----
 src/models/authTypes.json             |  5 -----
 src/store/modules/auth.js             | 20 ++++++++++++++++++++
 src/views/sharing/LinkSharingAuth.vue |  9 ++++-----
 4 files changed, 29 insertions(+), 15 deletions(-)
 delete mode 100644 src/models/authTypes.json

diff --git a/src/App.vue b/src/App.vue
index f11135358..a02b72695 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,11 +23,9 @@
 </template>
 
 <script>
-import {mapState} from 'vuex'
+import {mapState, mapGetters} from 'vuex'
 import isTouchDevice from 'is-touch-device'
 
-import authTypes from './models/authTypes'
-
 import Notification from './components/misc/notification'
 import {KEYBOARD_SHORTCUTS_ACTIVE, ONLINE} from './store/mutation-types'
 import KeyboardShortcuts from './components/misc/keyboard-shortcuts'
@@ -74,11 +72,13 @@ export default {
 			return isTouchDevice()
 		},
 		...mapState({
-			authUser: state => state.auth.authenticated && (state.auth.info && state.auth.info.type === authTypes.USER),
-			authLinkShare: state => state.auth.authenticated && (state.auth.info && state.auth.info.type === authTypes.LINK_SHARE),
 			online: ONLINE,
 			keyboardShortcutsActive: KEYBOARD_SHORTCUTS_ACTIVE,
 		}),
+		...mapGetters('auth', [
+			'authUser',
+			'authLinkShare',
+		]),
 	},
 	methods: {
 		setupOnlineStatus() {
diff --git a/src/models/authTypes.json b/src/models/authTypes.json
deleted file mode 100644
index 8a6fccf53..000000000
--- a/src/models/authTypes.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "UNKNOWN": 0,
-  "USER": 1,
-  "LINK_SHARE": 2
-}
\ No newline at end of file
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index eb2fd6c7c..f9e5b159e 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -3,6 +3,12 @@ import {ERROR_MESSAGE, LOADING} from '../mutation-types'
 import UserModel from '../../models/user'
 import {getToken, refreshToken, removeToken, saveToken} from '@/helpers/auth'
 
+const AUTH_TYPES = {
+	'UNKNOWN': 0,
+	'USER': 1,
+	'LINK_SHARE': 2,
+}
+
 const defaultSettings = settings => {
 	if (typeof settings.weekStart === 'undefined' || settings.weekStart === '') {
 		settings.weekStart = 0
@@ -21,6 +27,20 @@ export default {
 		lastUserInfoRefresh: null,
 		settings: {},
 	}),
+	getters: {
+		authUser(state) {
+			return state.authenticated && (
+				state.info &&
+				state.info.type === AUTH_TYPES.USER
+			)
+		},
+		authLinkShare(state) {
+			return state.authenticated && (
+				state.info &&
+				state.info.type === AUTH_TYPES.LINK_SHARE
+			)
+		},
+	},
 	mutations: {
 		info(state, info) {
 			state.info = info
diff --git a/src/views/sharing/LinkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue
index d48388bb6..c6a64777d 100644
--- a/src/views/sharing/LinkSharingAuth.vue
+++ b/src/views/sharing/LinkSharingAuth.vue
@@ -33,8 +33,7 @@
 </template>
 
 <script>
-import {mapState} from 'vuex'
-import authTypes from '@/models/authTypes.json'
+import {mapGetters} from 'vuex'
 
 export default {
 	name: 'LinkSharingAuth',
@@ -54,9 +53,9 @@ export default {
 	mounted() {
 		this.setTitle(this.$t('sharing.authenticating'))
 	},
-	computed: mapState({
-		authLinkShare: state => state.auth.authenticated && (state.auth.info && state.auth.info.type === authTypes.LINK_SHARE),
-	}),
+	computed: mapGetters('auth', [
+		'authLinkShare',
+	]),
 	methods: {
 		auth() {
 			this.errorMessage = ''