Add token type to storage

Author: aLLeXUs

frontend/src/api/Api.js

@@ -5,7 +5,7 @@ import { UNAUTHENTICATED } from '@/api/ErrorCodes';
 import { getSocketId } from '@/services/Pusher';
 
 class Api {
-    constructor(apiUrl, authHeaderName = 'Authorization', authHeaderPrefix = 'Bearer') {
+    constructor(apiUrl, authHeaderName = 'Authorization') {
         this.axios = axios.create({ baseURL: apiUrl });
 
         this.axios
@@ -14,7 +14,7 @@ class Api {
             .use(
                 config => {
                     if (Storage.hasToken()) {
-                        config.headers[authHeaderName] = `${authHeaderPrefix} ${Storage.getToken()}`;
+                        config.headers[authHeaderName] = `${Storage.getTokenType()} ${Storage.getToken()}`;
                     }
 
                     if (getSocketId()) {

frontend/src/services/Pusher.js

@@ -12,20 +12,18 @@ const config = {
 
 if (Storage.hasToken()) {
     config.auth.headers = {
-        Authorization: `Bearer ${Storage.getToken()}`
+        Authorization: `${Storage.getTokenType()} ${Storage.getToken()}`
     };
 }
 
 export const pusher = new Pusher(process.env.VUE_APP_PUSHER_APP_KEY, config);
 
-export const getSocketId = () => {
-    return pusher.connection.socket_id;
-};
+export const getSocketId = () => pusher.connection.socket_id;
 
-export const updateSocketAuthToken = (token) => {
-    pusher.config.auth.headers.Authorization = `Bearer ${token}`;
+export const updateSocketAuthToken = (tokenType, accessToken) => {
+    pusher.config.auth.headers.Authorization = `${tokenType} ${accessToken}`;
 };
 
 export const removeSocketAuthToken = () => {
     pusher.config.auth.headers = {};
-}
+};

frontend/src/services/Storage.js

@@ -1,6 +1,7 @@
 class Storage {
     constructor() {
-        this.keyName = 'auth.token';
+        this.tokenKeyName = 'auth.access_token';
+        this.tokenTypeKeyName = 'auth.token_type';
         this.store = window.localStorage;
     }
 
@@ -13,19 +14,31 @@ class Storage {
     }
 
     getToken() {
-        return this.get(this.keyName);
+        return this.get(this.tokenKeyName);
     }
 
     setToken(token) {
-        return this.set(this.keyName, token);
+        return this.set(this.tokenKeyName, token);
     }
 
     hasToken() {
-        return !!this.get(this.keyName);
+        return !!this.get(this.tokenKeyName);
     }
 
     removeToken() {
-        return this.store.removeItem(this.keyName);
+        return this.store.removeItem(this.tokenKeyName);
+    }
+
+    getTokenType() {
+        return this.get(this.tokenTypeKeyName);
+    }
+
+    setTokenType(type) {
+        return this.set(this.tokenTypeKeyName, type);
+    }
+
+    removeTokenType() {
+        return this.store.removeItem(this.tokenTypeKeyName);
     }
 }
 

frontend/src/store/modules/auth/actions.js

@@ -12,7 +12,10 @@ export default {
                 password,
             });
 
-            commit(USER_LOGIN, data.access_token);
+            commit(USER_LOGIN, {
+                accessToken: data.access_token,
+                tokenType: data.token_type
+            });
             commit(SET_LOADING, false, { root: true });
 
             return Promise.resolve();
@@ -41,7 +44,10 @@ export default {
                 nickname,
             });
 
-            commit(USER_LOGIN, data.access_token);
+            commit(USER_LOGIN, {
+                accessToken: data.access_token,
+                tokenType: data.token_type
+            });
             commit(SET_LOADING, false, { root: true });
 
             return Promise.resolve();

frontend/src/store/modules/auth/mutations.js

@@ -4,16 +4,18 @@ import { emptyUser, userMapper } from '@/services/Normalizer';
 import { updateSocketAuthToken, removeSocketAuthToken } from '@/services/Pusher';
 
 export default {
-    [USER_LOGIN]: (state, accessToken) => {
+    [USER_LOGIN]: (state, { accessToken, tokenType }) => {
         Storage.setToken(accessToken);
-        updateSocketAuthToken(accessToken);
+        Storage.setTokenType(tokenType);
+        updateSocketAuthToken(tokenType, accessToken);
 
         state.token = accessToken;
         state.isLoggedIn = true;
     },
 
     [USER_LOGOUT]: state => {
         Storage.removeToken();
+        Storage.removeTokenType();
         removeSocketAuthToken();
 
         state.token = '';