fix: complete auth token lifecycle

utils/ApiClient.js

@@ -55,6 +55,13 @@
     return data.token || data.accessToken || data.tokenValue || '';
   }
 
+  function requireLoginToken(data) {
+    var token = getTokenFromResponse(data);
+
+    if (!token) throw new ApiError('登录响应缺少 token');
+    return token;
+  }
+
   function ApiError(message, options) {
     this.name = 'ApiError';
     this.message = message || '接口请求失败';
@@ -169,7 +176,7 @@
         auth: false,
         body: Object.assign({ grantType: 'password' }, withTenant(body))
       });
-      setToken(getTokenFromResponse(data));
+      setToken(requireLoginToken(data));
       return data;
     }
 
@@ -187,7 +194,7 @@
         auth: false,
         body: Object.assign({ grantType: 'sms' }, withTenant(body))
       });
-      setToken(getTokenFromResponse(data));
+      setToken(requireLoginToken(data));
       return data;
     }
 
@@ -267,9 +274,11 @@
         return data;
       },
       logout: async function () {
-        var data = await request('DELETE', '/genealogy/pc/auth/logout');
-        clearToken();
-        return data;
+        try {
+          return await request('DELETE', '/genealogy/pc/auth/logout');
+        } finally {
+          clearToken();
+        }
       },
       uploadFile: function (fileOrFormData) {
         return request('POST', '/genealogy/pc/files/upload', { body: createFormData(fileOrFormData) });