Merge branch 'master' of kvacek.cz:poletani.cz/app into ssr

src/boot/axios.js

@@ -4,22 +4,21 @@ import {useUserStore} from "stores/User";
 
 
 const api = axios.create({
-  baseURL: process.env.API_URL,
-  withCredentials: true,
-  xsrfHeaderName: "X-CSRF-TOKEN",
-  headers: {
-    Accept: "application/json",
-    "Content-Type": "application/json;charset=UTF-8",
-  },
+    baseURL: process.env.API_URL,
+    withCredentials: true,
+    xsrfHeaderName: "X-CSRF-TOKEN",
+    headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json;charset=UTF-8",
+    },
 })
 
-export default boot(({app, store}) => {
-
-  api.interceptors.request.use((config) => {
-    const token = useUserStore(store).getAccessToken();
-    if (token) {
-      config.headers['Authorization'] = `Bearer ${token}`
-    }
+export default boot(({store}) => {
+    api.interceptors.request.use((config) => {
+        const token = useUserStore(store).getAccessToken();
+        if (token) {
+            config.headers['Authorization'] = `Bearer ${token}`
+        }
 
     if (['/refresh', '/login'].includes(config.url)) {
       delete config.headers['Authorization'];
@@ -28,32 +27,21 @@ export default boot(({app, store}) => {
     return config;
   })
 
-// Response interceptor for API calls
-  api.interceptors.response.use((response) => {
-    return response
-  }, async function (error) {
-    const originalRequest = error.config;
-    if (error.response.status === 401 && !['/refresh', '/login'].includes(originalRequest.url)) {
-      const newToken = await useUserStore(store).refreshAccessToken().catch(err => {
-        console.error(err);
-        return Promise.reject("Logged out");
-      })
-      api.defaults.headers.common['Authorization'] = 'Bearer ' + newToken;
-      return api(originalRequest);
-    }
-    return Promise.reject(error);
-  });
-
-
-  // for use inside Vue files (Options API) through this.$axios and this.$api
-
-  // app.config.globalProperties.$axios = axios
-  // ^ ^ ^ this will allow you to use this.$axios (for Vue Options API form)
-  //       so you won't necessarily have to import axios in each vue file
-
-  app.config.globalProperties.$api = api
-  // ^ ^ ^ this will allow you to use this.$api (for Vue Options API form)
-  //       so you can easily perform requests against your app's API
+    // Response interceptor for API calls
+    api.interceptors.response.use(
+        (response) => response,
+        async function (error) {
+            const originalRequest = error.config;
+            if (error.response.status === 401 && !['/refresh', '/login'].includes(originalRequest.url)) {
+                const newToken = await useUserStore(store).refreshAccessToken().catch(err => {
+                    console.error(err);
+                    return Promise.reject("Logged out");
+                })
+                api.defaults.headers.common['Authorization'] = 'Bearer ' + newToken;
+                return api(originalRequest);
+            }
+            return Promise.reject(error);
+        });
 })
 
 export {axios, api}