Skip to content

Commit 241b821

Browse files
committed
Fix pusher service
1 parent b251a08 commit 241b821

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

frontend/src/services/Pusher.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,22 @@ const config = {
1010
}
1111
};
1212

13-
export const updateSocketAuthToken = (token) => {
13+
if (Storage.hasToken()) {
1414
config.auth.headers = {
15-
Authorization: `Bearer ${token}`
15+
Authorization: `Bearer ${Storage.getToken()}`
1616
};
17-
};
18-
19-
if (Storage.hasToken()) {
20-
updateSocketAuthToken(Storage.getToken());
2117
}
2218

23-
2419
export const pusher = new Pusher(process.env.VUE_APP_PUSHER_APP_KEY, config);
2520

2621
export const getSocketId = () => {
2722
return pusher.connection.socket_id;
2823
};
24+
25+
export const updateSocketAuthToken = (token) => {
26+
pusher.config.auth.headers.Authorization = `Bearer ${token}`;
27+
};
28+
29+
export const removeSocketAuthToken = () => {
30+
pusher.config.auth.headers = {};
31+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { USER_LOGIN, USER_LOGOUT, SET_AUTHENTICATED_USER } from './mutationTypes';
22
import Storage from '@/services/Storage';
33
import { emptyUser, userMapper } from '@/services/Normalizer';
4-
import { updateSocketAuthToken } from '@/services/Pusher';
4+
import { updateSocketAuthToken, removeSocketAuthToken } from '@/services/Pusher';
55

66
export default {
77
[USER_LOGIN]: (state, accessToken) => {
@@ -14,6 +14,7 @@ export default {
1414

1515
[USER_LOGOUT]: state => {
1616
Storage.removeToken();
17+
removeSocketAuthToken();
1718

1819
state.token = '';
1920
state.isLoggedIn = false;

0 commit comments

Comments
 (0)