feat(auth): access token 缩到 2 小时 + refresh token 机制
后台登录框原来预填了 sundynix/sundynix,等于把凭证写在页面上,去掉。 令牌改为 access(2h) + refresh 两段式: - 新表 sundynix_refresh_tokens,只存 sha256,明文只在签发时返回一次 - 有效期:小程序 30 天、后台 7 天 - 新接口 /api/auth/refresh|logout、/api/admin/refresh|logout 安全约定: - 每次续期都轮换刷新令牌,旧的立即作废 - 作废后 60 秒内再到达算并发重试放行,超过则判定泄露、吊销该账号全部会话 - 主动退出与被连坐吊销的令牌不吃宽限期,否则「吊销全部」形同虚设 - 禁用用户时一并吊销刷新令牌,最多 2 小时彻底失去访问 两端请求层都做了单飞续期:并发请求同时 401 只发一次 refresh, 否则刷新令牌会被并发轮换掉互相打架。小程序续期失败回退 wx.login, 登录/续期请求标 noAuthRetry,避免登录失败(同样返回 40100)触发自我套娃。 顺带修掉 vite 代理仍指向 8080 的遗留(端口早已改 9090)。 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
+18
-7
@@ -1,4 +1,11 @@
|
||||
const { request, uploadFile, setToken } = require('./request.js');
|
||||
const { request, uploadFile, setToken, setRefreshToken } = require('./request.js');
|
||||
|
||||
// 登录成功后统一落盘 access + refresh 两个令牌
|
||||
function saveTokens(data) {
|
||||
setToken(data.token);
|
||||
setRefreshToken(data.refresh_token);
|
||||
return data;
|
||||
}
|
||||
|
||||
// wx.login 取 code
|
||||
function wxLogin() {
|
||||
@@ -14,14 +21,18 @@ function wxLogin() {
|
||||
async function login() {
|
||||
try {
|
||||
const code = await wxLogin();
|
||||
const data = await request({ url: '/api/auth/wechat', method: 'POST', data: { code } });
|
||||
setToken(data.token);
|
||||
return data;
|
||||
// noAuthRetry:登录接口失败时也会返回 40100,不能再触发「续期→重新登录」,否则会自己套自己
|
||||
const data = await request({ url: '/api/auth/wechat', method: 'POST', data: { code }, noAuthRetry: true });
|
||||
return saveTokens(data);
|
||||
} catch (e) {
|
||||
console.warn('[api] 微信登录失败,回退 Mock 登录:', e && e.message);
|
||||
const data = await request({ url: '/api/auth/login', method: 'POST', data: { nickname: '开发用户' } });
|
||||
setToken(data.token);
|
||||
return data;
|
||||
const data = await request({
|
||||
url: '/api/auth/login',
|
||||
method: 'POST',
|
||||
data: { nickname: '开发用户' },
|
||||
noAuthRetry: true,
|
||||
});
|
||||
return saveTokens(data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+70
-11
@@ -1,6 +1,7 @@
|
||||
const { BASE_URL } = require('./config.js');
|
||||
|
||||
const TOKEN_KEY = 'pets_token';
|
||||
const REFRESH_KEY = 'pets_refresh_token';
|
||||
|
||||
function getToken() {
|
||||
return wx.getStorageSync(TOKEN_KEY) || '';
|
||||
@@ -8,8 +9,15 @@ function getToken() {
|
||||
function setToken(t) {
|
||||
wx.setStorageSync(TOKEN_KEY, t);
|
||||
}
|
||||
function getRefreshToken() {
|
||||
return wx.getStorageSync(REFRESH_KEY) || '';
|
||||
}
|
||||
function setRefreshToken(t) {
|
||||
if (t) wx.setStorageSync(REFRESH_KEY, t);
|
||||
}
|
||||
function clearToken() {
|
||||
wx.removeStorageSync(TOKEN_KEY);
|
||||
wx.removeStorageSync(REFRESH_KEY);
|
||||
}
|
||||
|
||||
// token 失效时的重新登录钩子,由 store 注册(放在这里避免 request ← api ← store 循环依赖)
|
||||
@@ -20,10 +28,43 @@ function setReAuthHandler(fn) {
|
||||
|
||||
const TIMEOUT = 15000;
|
||||
|
||||
// access token 只有 2 小时,过期后先拿 refresh token 换新的(用户无感),
|
||||
// 换不到(刷新令牌也过期/被吊销)才退回 wx.login 重新登录。
|
||||
// 单飞:并发请求同时 401 时只发一次刷新,否则刷新令牌会被并发轮换掉。
|
||||
let refreshing = null;
|
||||
|
||||
function refreshAccessToken() {
|
||||
if (!refreshing) {
|
||||
const rt = getRefreshToken();
|
||||
refreshing = (rt
|
||||
? request({ url: '/api/auth/refresh', method: 'POST', data: { refresh_token: rt }, noAuthRetry: true })
|
||||
: Promise.reject(new Error('没有刷新令牌'))
|
||||
).then((data) => {
|
||||
setToken(data.token);
|
||||
setRefreshToken(data.refresh_token);
|
||||
return data.token;
|
||||
});
|
||||
const done = () => {
|
||||
refreshing = null;
|
||||
};
|
||||
refreshing.then(done, done);
|
||||
}
|
||||
return refreshing;
|
||||
}
|
||||
|
||||
// 恢复登录态:先续期,续不了就整套重新登录
|
||||
function recoverAuth() {
|
||||
return refreshAccessToken().catch(() => {
|
||||
clearToken();
|
||||
if (!reAuth) throw new Error('登录已过期');
|
||||
return reAuth();
|
||||
});
|
||||
}
|
||||
|
||||
// 统一请求:注入 token,解析 {code,message,data},成功返回 data,失败 reject(Error)。
|
||||
// token 失效(40100)时自动重新登录并重试一次,避免 JWT 过期后小程序静默白屏。
|
||||
// token 失效(40100)时自动续期/重新登录并重试一次,避免 JWT 过期后小程序静默白屏。
|
||||
function request(options, _retried) {
|
||||
const { url, method = 'GET', data, header = {} } = options;
|
||||
const { url, method = 'GET', data, header = {}, noAuthRetry } = options;
|
||||
return new Promise((resolve, reject) => {
|
||||
const token = getToken();
|
||||
wx.request({
|
||||
@@ -41,13 +82,17 @@ function request(options, _retried) {
|
||||
if (body && typeof body === 'object' && 'code' in body) {
|
||||
if (body.code === 0) return resolve(body.data);
|
||||
if (body.code === 40100) {
|
||||
clearToken();
|
||||
// 只重试一次,防止登录接口本身出问题时无限循环
|
||||
if (!_retried && reAuth) {
|
||||
return reAuth()
|
||||
.then(() => request(options, true).then(resolve, reject))
|
||||
.catch(() => reject(new Error(body.message || '登录已过期,请重进小程序')));
|
||||
// 只重试一次,防止刷新/登录接口本身出问题时无限循环
|
||||
if (_retried || noAuthRetry) {
|
||||
clearToken();
|
||||
return reject(new Error(body.message || '登录已过期,请重进小程序'));
|
||||
}
|
||||
return recoverAuth()
|
||||
.then(() => request(options, true).then(resolve, reject))
|
||||
.catch(() => {
|
||||
clearToken();
|
||||
reject(new Error(body.message || '登录已过期,请重进小程序'));
|
||||
});
|
||||
}
|
||||
return reject(new Error(body.message || '请求失败'));
|
||||
}
|
||||
@@ -61,8 +106,8 @@ function request(options, _retried) {
|
||||
});
|
||||
}
|
||||
|
||||
// 文件上传(multipart)
|
||||
function uploadFile(filePath) {
|
||||
// 文件上传(multipart);token 过期同样先续期再重试一次
|
||||
function uploadFile(filePath, _retried) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const token = getToken();
|
||||
wx.uploadFile({
|
||||
@@ -75,6 +120,11 @@ function uploadFile(filePath) {
|
||||
try {
|
||||
const body = JSON.parse(res.data);
|
||||
if (body.code === 0) return resolve(body.data);
|
||||
if (body.code === 40100 && !_retried) {
|
||||
return recoverAuth()
|
||||
.then(() => uploadFile(filePath, true).then(resolve, reject))
|
||||
.catch(() => reject(new Error('登录已过期,请重进小程序')));
|
||||
}
|
||||
reject(new Error(body.message || '上传失败'));
|
||||
} catch (e) {
|
||||
reject(new Error('上传响应解析失败'));
|
||||
@@ -87,4 +137,13 @@ function uploadFile(filePath) {
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = { request, uploadFile, getToken, setToken, clearToken, setReAuthHandler };
|
||||
module.exports = {
|
||||
request,
|
||||
uploadFile,
|
||||
getToken,
|
||||
setToken,
|
||||
getRefreshToken,
|
||||
setRefreshToken,
|
||||
clearToken,
|
||||
setReAuthHandler,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user