Fix refresh token

boobo94 · Aug 24, 2022 · 314aae7 · 314aae7
1 parent 8a7f4d6
commit 314aae7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/admin/src/services/axiosService.js b/admin/src/services/axiosService.js
@@ -7,12 +7,12 @@ export default function axiosErrorInterceptor(store, router) {
     if (err.config && !err.config.__isRetryRequest && err.response.status === 401) {
       // when auth token is expired refresh it
       if (err.response.data.error.code === 3) {
-        store.dispatch('authModule/refreshToken')
+        return store.dispatch('authModule/refreshToken')
           .then(async () => {
-          // rewrite the current Authorization header
-            axios.defaults.headers.Authorization = `Bearer ${store.state.auth.token}`;
+            // rewrite the current Authorization header
+            axios.defaults.headers.authorization = `Bearer ${store.state.authModule.token}`;
             // eslint-disable-next-line no-param-reassign
-            err.config.headers.Authorization = axios.defaults.headers.Authorization;
+            err.config.headers.authorization = axios.defaults.headers.authorization;
 
             return axios(err.config)
               .then((response) => resolve(response))

diff --git a/api/src/routers/admin/v1/auth/refresh-token.js b/api/src/routers/admin/v1/auth/refresh-token.js
@@ -16,7 +16,7 @@ export default async (req, res) => {
     }, admin.id);
 
     return res.status(StatusCodes.OK).send({
-      token: GenerateJWT(admin.id),
+      token: GenerateJWT(admin.id, admin.restaurantId),
       refreshToken: newRefreshToken,
       restaurantId: admin.restaurantId,
     });