update store and env

Author: ricardovanlaarhoven

generator/index.js

@@ -5,7 +5,8 @@ module.exports = (api, options) => {
     api.extendPackage({
         dependencies: {
             'axios': '^0.18.0',
-            'vuex': '^3.1.0',
+            "dayjs": "^1.8.19",
+            'vuex': '^3.1.2',
             'vuex-persistedstate': '^2.5.4',
             'lodash.clonedeep': '^4.5.0',
             'css-vars-ponyfill': '^2.1.2',

generator/templates/Authorisation/src/guards/AuthorisationGuard

@@ -1,7 +1,7 @@
 import Vue from 'vue';
 
 export default function (to, from, next) {
-    if (!Vue.prototype.$store.getters['Authorization/isLoggedIn']) {
+    if (!Vue.prototype.$store.getters['Authorisation/isLoggedIn']) {
         next({name: 'login'});
         return;
     }

generator/templates/Authorisation/src/store/modules/Authorisation.js

@@ -0,0 +1,21 @@
+export default {
+    namespaced: true,
+    state: {
+        token: null,
+    }, mutations: {
+        setAuthorisationToken(currentState, token) {
+            currentState.token = token;
+        },
+    },
+    getters: {
+        isLoggedIn: state => {
+            return state.token !== null;
+        },
+        getAccessToken: state => {
+            if (state.token === null) {
+                return '';
+            }
+            return state.token;
+        },
+    },
+};

generator/templates/Authorisation/src/store/modules/Authorization.js

@@ -1,25 +1,14 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
-import Authorization from './modules/Authorization.js';
+import Authorisation from './modules/Authorisation.js';
 import createPersistedState from 'vuex-persistedstate';
 -
 Vue.use(Vuex);
 export default new Vuex.Store({
     plugins: [
-        (store) => {
-            window.initialState = JSON.parse(JSON.stringify(store.state));
-        },
         createPersistedState(),
     ],
     modules: {
-        Authorization,
+        Authorisation,
     },
-    state: {
-        version: {
-            major: 1,
-            minor: 0,
-            patch: 0,
-        },
-        refresh: false,
-    },
-});
+});

generator/templates/Authorisation/src/store/store.js

@@ -3,9 +3,7 @@
         <v-app class="primary" id="inspire">
             <v-content>
                 <v-container fill-height fluid justify-center class="primary">
-                    <v-flex lg4 md6 xl3 xs12>
-                        <router-view/>
-                    </v-flex>
+                    <router-view/>
                 </v-container>
             </v-content>
         </v-app>
@@ -14,19 +12,19 @@
 
 <script>
 
-    export default {
-        components: {},
-        watch: {},
-        props: [],
-        name: 'template-authorisation',
-        data() {
-            return {};
-        },
-        created() {
+export default {
+    components: {},
+    watch: {},
+    props: [],
+    name: 'template-authorisation',
+    data() {
+        return {};
+    },
+    created() {
 
-        },
-        methods: {},
-    };
+    },
+    methods: {},
+};
 </script>
 
 <style scoped lang="scss">

generator/templates/Authorisation/src/templates/Authorisation.vue

@@ -0,0 +1,27 @@
+<template>
+    <v-overlay :value="true">
+        <VProgressCircular indeterminate size="64"/>
+    </v-overlay>
+</template>
+<script>
+import {mapMutations} from 'vuex';
+
+export default {
+    name: 'AuthorisationCallback',
+    methods: {
+        ...mapMutations({
+            setAuthorisationToken: 'Authorisation/setAuthorisationToken',
+        }),
+    },
+    created() {
+        const redirect_uri = this.$route.query.redirect_uri;
+
+        const regex = new RegExp('[\\#&]token=([^&#]*)');
+        const token = decodeURIComponent(regex.exec(this.$route.hash)[1]);
+
+        this.setAuthorisationToken(token);
+
+        this.$router.push({name: redirect_uri});
+    },
+};
+</script>

generator/templates/Authorisation/src/views/AuthorisationCallback.vue

@@ -71,7 +71,7 @@
             };
         },
         created() {
-            if (this.$store.getters['Authorization/isLoggedIn']) {
+            if (this.$store.getters['Authorisation/isLoggedIn']) {
                 this.$router.push({name: 'home'});
             }
             this.email = this.$route.query.email;

generator/templates/Authorisation/src/views/InvitationAccept.vue

@@ -1,6 +1,6 @@
 NODE_ENV=development
 VUE_APP_ROOT_API=<%= options.rootUrl %>
-VUE_APP_PUBLIC_PATH=
+VUE_APP_PUBLIC_PATH=/
 <%_ if (options.plugins.includes('analytics')) { _%>
 VUE_APP_ANALYTICS=
 <%_ } _%>

generator/templates/Default/_env.development.local

@@ -1,6 +1,6 @@
 NODE_ENV=development
 VUE_APP_ROOT_API=//url.local/api
-VUE_APP_PUBLIC_PATH=
+VUE_APP_PUBLIC_PATH=/
 <%_ if (options.plugins.includes('analytics')) { _%>
 VUE_APP_ANALYTICS=
 <%_ } _%>