viithiisys / School-Management-dashboard

Browse Code »

Commit 1efb20890727582dd73137511098e2d0f7e929a3

Authored by Amber Dev 2020-08-11 06:46:59 -0400

1 parent 58e26b150d

Exists in master and in 2 other branches

changed interceptor

Showing 2 changed files with 21 additions and 1 deletions Show diff stats

src/Services/http.js

Diff comments View file @1efb208

 import axios from 'axios'
 import store from '@/store/store'
 import Vue from 'vue'
 import { vm1 } from "@/main.js"
 const baseDomain = "https://api-dashboard.intrack.in/v1";
 const baseURL = `${baseDomain}`;
 // var token = ""
 // if (store.state.role === "ADMIN") {
 //     token = `${store.state.token}`
 // } else if (store.state.schoolRole === "SUPERADMIN") {
 //     token = `${store.state.schoolToken}`
 // }
 // console.log("role",`${store.state.schoolRole}`);
 // console.log("token",`${store.state.schoolToken}`);
 export default () => {
     // return axios.create({
     //     // baseURL: 'http://192.168.2.221:3002/v1',
     //     baseURL,
     //     headers: {
     //         Authorization: `Bearer ${store.state.token}`
     //     }
     // })
     let instance = axios.create({
         // LIVE
         //baseURL: 'https://annadata.patanjaliayurved.org/api',
         // DEVELOPMENT
         baseURL: baseURL,
         headers: {
             Authorization: `Bearer ${store.state.token}`,
+            // Authorization: `Bearer sdfsdfsfsdf`,
             // 'Access-Control-Allow-Origin': '*'
         }
     })
     instance.interceptors.request.use((config) => {
         // Do something before request is sent
         return config
     }, error => {
         return Promise.reject(error)
     })
     instance.interceptors.response.use((response) => {
             // do something with the response data
             return response;
         }, error => {
             // handle the response error
             console.log("error in interceptor - ", error.response.status)
             var customError
             const errorNo = error.response.status
             switch (errorNo) {
                 case 401:
                     customError = "Session expired"
-                    vm1.$store.dispatch("RESET_STORE", null);
+                    vm1.$store.dispatch("RESET_STORE", {
+                        token: null,
+                        data: null,
+                        isUserLoggedIn: false,
+                        id: null,
+                        role: null,
+                        // schoolId: null,
+                        schoolToken: null,
+                        schoolRole: null,
+                        studentsData: [],
+                    });
                     console.log("store is - ",vm1.$store.state)
                     vm1.$router.push({ name: "Login" });
                     // vm1.$store.dispatch("Id", null);
                     break;
             }
             return Promise.reject(error);
         })
         // response parse
     return instance;
 }

src/store/store.js

Diff comments View file @1efb208

 import Vue from 'vue'
 import Vuex from 'vuex'
 import createPersistedState from 'vuex-persistedstate'
 Vue.use(Vuex)
 export default new Vuex.Store({
     strict: true,
     plugins: [
         createPersistedState()
     ],
     state: {
         token: null,
         data: null,
         isUserLoggedIn: false,
         id: null,
         role: null,
         // schoolId: null,
         schoolToken: null,
         schoolRole: null,
         studentsData: [],
     },
     getters: {
         GET_STUDENTS_DATA: state => {
             return state.studentsData
         },
     },
     // serve as the one and only way to change the state of the data in the state object
     mutations: {
+        RESET_STORE(state, defaultState) {
+            state = defaultState
+            // state.isUserLoggedIn = false
+        },
         setToken(state, token) {
             state.token = token
             //state.isUserLoggedIn = !!(token)
             if (token != null) {
                 state.isUserLoggedIn = true
             } else {
                 state.isUserLoggedIn = false
             }
         },
         setSchoolToken(state, schoolToken) {
             state.schoolToken = schoolToken
             //state.isUserLoggedIn = !!(token)
             if (schoolToken != null) {
                 state.isSchoolLoggedIn = true
             } else {
                 state.isSchoolLoggedIn = false
             }
         },
         setUser(state, data) {
             state.data = data
         },
         Id(state, id) {
             state.id = id
         },
         Role(state, role) {
             state.role = role
         },
         setSchoolRole(state, schoolRole) {
             state.schoolRole = schoolRole
         },
         SET_STUDENTS_DATA(state, data) {
             state.studentsData = data
         },
         // SchoolId(state, schoolId) {
         //     state.schoolId = schoolId
         // }
     },
     //Action methods are referred to as being "dispatched"
     actions: {
+        RESET_STORE({
+            commit
+        }, defaultState) {
+            commit('RESET_STORE', defaultState)
+        },
         setToken({
             commit
         }, token) {
             commit('setToken', token)
         },
         setSchoolToken({
             commit
         }, schoolToken) {
             commit('setSchoolToken', schoolToken)
         },
         setUser({
             commit
         }, data) {
             commit('setUser', data)
         },
         SET_STUDENTS_DATA({
             commit
         }, data) {
             commit('SET_STUDENTS_DATA', data)
         },
         Id({
             commit
         }, id) {
             commit('Id', id)
         },
         Role({
             commit
         }, role) {
             commit('Role', role)
         },
         setSchoolRole({
             commit
         }, schoolRole) {
             commit('setSchoolRole', schoolRole)
         },
         // SchoolId({ commit }, schoolId) {
         //     commit('SchoolId', schoolId)
         // }
     }
 })