张延森 5 år sedan
förälder
incheckning
3aa04edeee
3 ändrade filer med 7 tillägg och 4 borttagningar
  1. 1
    1
      src/models/login.js
  2. 2
    0
      src/services/apis.js
  3. 4
    3
      src/utils/request.js

+ 1
- 1
src/models/login.js Visa fil

50
     *logout(_, { put, call }) {
50
     *logout(_, { put, call }) {
51
       const { redirect } = getPageQuery(); // redirect
51
       const { redirect } = getPageQuery(); // redirect
52
 
52
 
53
-      yield call(signoff, { logout: true });
53
+      yield call(signoff);
54
 
54
 
55
       if (window.location.pathname !== '/user/login' && !redirect) {
55
       if (window.location.pathname !== '/user/login' && !redirect) {
56
         yield put(
56
         yield put(

+ 2
- 0
src/services/apis.js Visa fil

9
     login: {
9
     login: {
10
       url: `${prefix}/signin`,
10
       url: `${prefix}/signin`,
11
       method: 'POST',
11
       method: 'POST',
12
+      login: true
12
     },
13
     },
13
     logoff: {
14
     logoff: {
14
       url: `${prefix}/signout`,
15
       url: `${prefix}/signout`,
15
       method: 'POST',
16
       method: 'POST',
17
+      logout: true
16
     },
18
     },
17
   },
19
   },
18
   member: {
20
   member: {

+ 4
- 3
src/utils/request.js Visa fil

33
 }
33
 }
34
 
34
 
35
 request.interceptors.request.use((url, options) => {
35
 request.interceptors.request.use((url, options) => {
36
-  const { urlData, headers = {}, logout = false, data, ...opts } = options
36
+  const { urlData, headers = {}, logout = false, login = false, data, ...opts } = options
37
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
37
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
38
   const token = mixStr(window.localStorage.getItem('test-foobar'))
38
   const token = mixStr(window.localStorage.getItem('test-foobar'))
39
-  const authHeader = token ? { Authorization: `Bearer ${token}` } : {}
40
 
39
 
41
-  if (logout) {
40
+  if (login || logout) {
42
     window.localStorage.removeItem('test-foobar')
41
     window.localStorage.removeItem('test-foobar')
43
   }
42
   }
44
 
43
 
44
+  const authHeader = !login ? { Authorization: `Bearer ${token}` } : {}
45
+
45
   return (
46
   return (
46
     {
47
     {
47
       url: apiURL,
48
       url: apiURL,