Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 97d4be5772 | |||
| b2b92ec6b4 | |||
| b336b901d3 |
+70
-34
@@ -16,6 +16,7 @@ export default {
|
||||
statusText: '正在登录...',
|
||||
deviceId: '',
|
||||
action: '',
|
||||
navigating: false, // 防止重复跳转
|
||||
};
|
||||
},
|
||||
onLoad(options) {
|
||||
@@ -91,7 +92,19 @@ export default {
|
||||
* 发起 OAuth 授权(静默授权,只获取 openid)
|
||||
*/
|
||||
async startAuth() {
|
||||
// 清除上次使用的 code 标记
|
||||
// 防止重复调用(实例级 + storage 级双重保护)
|
||||
if (this.navigating) {
|
||||
console.log('[Auth] 已在跳转中,忽略重复 startAuth');
|
||||
return;
|
||||
}
|
||||
// handleCallback 正在处理中或已完成,禁止发起新授权
|
||||
if (uni.getStorageSync('__auth_callback_done')) {
|
||||
console.log('[Auth] 回调处理中/已完成,跳过 startAuth');
|
||||
return;
|
||||
}
|
||||
this.navigating = true;
|
||||
|
||||
// 清除上次使用的 code 标记(仅在发起新授权时清除,不在 handleCallback 流程中)
|
||||
uni.removeStorageSync('__used_auth_code');
|
||||
|
||||
const platform = detectPlatform();
|
||||
@@ -118,28 +131,24 @@ export default {
|
||||
|
||||
// 静默授权:微信用 snsapi_base,支付宝用 auth_base
|
||||
const scopes = platform === 'alipay' ? 'auth_base' : 'snsapi_base';
|
||||
|
||||
// 构建 state(包含 device_id,回调时原样回传)
|
||||
const stateObj = {};
|
||||
if (this.deviceId) {
|
||||
stateObj.device_id = this.deviceId;
|
||||
}
|
||||
|
||||
const res = await gatewayGet('/api/v1/user/auth/url', {
|
||||
app_no: appNo,
|
||||
scopes: scopes,
|
||||
redirect_uri: redirectUri,
|
||||
state: Object.keys(stateObj).length > 0 ? JSON.stringify(stateObj) : '',
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
if (data.code === 0 && data.data && data.data.auth_url) {
|
||||
// 通过 state 传递 device_id(OAuth 标准保证 state 原样回传)
|
||||
let authUrl = data.data.auth_url;
|
||||
if (this.deviceId) {
|
||||
const stateVal = encodeURIComponent(JSON.stringify({ device_id: this.deviceId }));
|
||||
try {
|
||||
const urlObj = new URL(authUrl);
|
||||
urlObj.searchParams.set('state', stateVal);
|
||||
authUrl = urlObj.toString();
|
||||
} catch (_) {
|
||||
authUrl += (authUrl.includes('?') ? '&' : '?') + 'state=' + stateVal;
|
||||
}
|
||||
}
|
||||
// 跳转微信授权页(静默,不弹窗)
|
||||
window.location.href = authUrl;
|
||||
// 后端已将 state 写入授权 URL,直接跳转
|
||||
window.location.href = data.data.auth_url;
|
||||
} else {
|
||||
uni.showToast({ title: data.message || '获取授权失败', icon: 'none' });
|
||||
setTimeout(() => this.goToScan(), 1500);
|
||||
@@ -155,6 +164,15 @@ export default {
|
||||
* 处理授权回调(用 code 换 openid,再用 openid 登录)
|
||||
*/
|
||||
async handleCallback(code) {
|
||||
// 防止重复调用(实例级 + storage 级双重保护)
|
||||
if (this.navigating) {
|
||||
console.log('[Auth] 已在跳转中,忽略重复 handleCallback');
|
||||
return;
|
||||
}
|
||||
this.navigating = true;
|
||||
// storage 级保护:跨页面实例生效,防止支付宝整页重载后重复执行
|
||||
uni.setStorageSync('__auth_callback_done', '1');
|
||||
|
||||
const appNo = uni.getStorageSync('app_no') || getAppNo(detectPlatform());
|
||||
|
||||
if (!appNo) {
|
||||
@@ -167,6 +185,7 @@ export default {
|
||||
const usedCode = uni.getStorageSync('__used_auth_code');
|
||||
if (usedCode === code) {
|
||||
console.warn('[loading] code 已使用过,跳过');
|
||||
this.navigating = false;
|
||||
return;
|
||||
}
|
||||
uni.setStorageSync('__used_auth_code', code);
|
||||
@@ -251,6 +270,17 @@ export default {
|
||||
* 发起非静默授权获取用户信息(snsapi_userinfo,弹窗确认)
|
||||
*/
|
||||
async startUserInfoAuth() {
|
||||
// 防止重复调用(实例级 + storage 级双重保护)
|
||||
if (this.navigating) {
|
||||
console.log('[Auth] 已在跳转中,忽略重复 startUserInfoAuth');
|
||||
return;
|
||||
}
|
||||
if (uni.getStorageSync('__auth_callback_done')) {
|
||||
console.log('[Auth] 回调处理中/已完成,跳过 startUserInfoAuth');
|
||||
return;
|
||||
}
|
||||
this.navigating = true;
|
||||
|
||||
// 清除上次使用的 code 标记
|
||||
uni.removeStorageSync('__used_auth_code');
|
||||
|
||||
@@ -279,30 +309,24 @@ export default {
|
||||
|
||||
// 用户信息授权:微信用 snsapi_userinfo,支付宝用 auth_user
|
||||
const scopes = platform === 'alipay' ? 'auth_user' : 'snsapi_userinfo';
|
||||
const res = await gatewayGet('/api/v1/user/auth/url', {
|
||||
app_no: appNo,
|
||||
scopes: scopes,
|
||||
redirect_uri: redirectUri,
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
if (data.code === 0 && data.data && data.data.auth_url) {
|
||||
// 通过 state 传递 action 和 device_id(OAuth 标准保证 state 原样回传)
|
||||
// 构建 state(包含 action 和 device_id,回调时原样回传)
|
||||
const stateObj = { action: 'userinfo' };
|
||||
if (this.deviceId) {
|
||||
stateObj.device_id = this.deviceId;
|
||||
}
|
||||
const stateVal = encodeURIComponent(JSON.stringify(stateObj));
|
||||
let authUrl = data.data.auth_url;
|
||||
try {
|
||||
const urlObj = new URL(authUrl);
|
||||
urlObj.searchParams.set('state', stateVal);
|
||||
authUrl = urlObj.toString();
|
||||
} catch (_) {
|
||||
authUrl += (authUrl.includes('?') ? '&' : '?') + 'state=' + stateVal;
|
||||
}
|
||||
// 跳转微信授权页(弹窗确认)
|
||||
window.location.href = authUrl;
|
||||
|
||||
const res = await gatewayGet('/api/v1/user/auth/url', {
|
||||
app_no: appNo,
|
||||
scopes: scopes,
|
||||
redirect_uri: redirectUri,
|
||||
state: JSON.stringify(stateObj),
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
if (data.code === 0 && data.data && data.data.auth_url) {
|
||||
// 后端已将 state 写入授权 URL,直接跳转
|
||||
window.location.href = data.data.auth_url;
|
||||
} else {
|
||||
uni.showToast({ title: data.message || '获取授权失败', icon: 'none' });
|
||||
setTimeout(() => this.goToHomeWithAction(), 1500);
|
||||
@@ -318,6 +342,14 @@ export default {
|
||||
* 处理用户信息授权回调(用 code 调 /api/v1/user/info 获取头像昵称)
|
||||
*/
|
||||
async handleUserInfoCallback(code) {
|
||||
// 防止重复调用(实例级 + storage 级双重保护)
|
||||
if (this.navigating) {
|
||||
console.log('[Auth] 已在跳转中,忽略重复 handleUserInfoCallback');
|
||||
return;
|
||||
}
|
||||
this.navigating = true;
|
||||
uni.setStorageSync('__auth_callback_done', '1');
|
||||
|
||||
const appNo = uni.getStorageSync('app_no') || getAppNo(detectPlatform());
|
||||
|
||||
if (!appNo) {
|
||||
@@ -329,6 +361,7 @@ export default {
|
||||
const usedCode = uni.getStorageSync('__used_auth_code');
|
||||
if (usedCode === code) {
|
||||
console.warn('[loading] code 已使用过,跳过');
|
||||
this.navigating = false;
|
||||
return;
|
||||
}
|
||||
uni.setStorageSync('__used_auth_code', code);
|
||||
@@ -389,6 +422,7 @@ export default {
|
||||
: '/pages/index/index?action=mine';
|
||||
localStorage.removeItem('__auth_device_id');
|
||||
localStorage.removeItem('__auth_action');
|
||||
uni.removeStorageSync('__auth_callback_done');
|
||||
uni.redirectTo({ url });
|
||||
},
|
||||
|
||||
@@ -398,6 +432,7 @@ export default {
|
||||
? `/pages/index/index?device_id=${deviceId}`
|
||||
: '/pages/index/index';
|
||||
localStorage.removeItem('__auth_device_id');
|
||||
uni.removeStorageSync('__auth_callback_done');
|
||||
uni.redirectTo({ url });
|
||||
},
|
||||
|
||||
@@ -413,6 +448,7 @@ export default {
|
||||
const url = this.deviceId
|
||||
? `/pages/register/register?device_id=${this.deviceId}`
|
||||
: '/pages/register/register';
|
||||
uni.removeStorageSync('__auth_callback_done');
|
||||
uni.redirectTo({ url });
|
||||
},
|
||||
|
||||
|
||||
+18
-24
@@ -344,34 +344,28 @@ export default {
|
||||
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
|
||||
);
|
||||
|
||||
// 获取非静默授权链接(会弹窗确认)
|
||||
const res = await gatewayGet('/api/v1/user/auth/url', {
|
||||
app_no: appNo,
|
||||
scopes: 'snsapi_userinfo',
|
||||
redirect_uri: redirectUri,
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
if (data.code === 0 && data.data && data.data.auth_url) {
|
||||
// 通过 state 传递 action 和 device_id(OAuth 标准保证 state 原样回传)
|
||||
// 构建 state(包含 action 和 device_id,回调时原样回传)
|
||||
const stateObj = { action: 'userinfo' };
|
||||
if (this.deviceId) {
|
||||
stateObj.device_id = this.deviceId;
|
||||
}
|
||||
const stateVal = encodeURIComponent(JSON.stringify(stateObj));
|
||||
// 解析 auth_url,安全地设置 state 参数(避免重复)
|
||||
let authUrl = data.data.auth_url;
|
||||
try {
|
||||
const urlObj = new URL(authUrl);
|
||||
urlObj.searchParams.set('state', stateVal);
|
||||
authUrl = urlObj.toString();
|
||||
} catch (_) {
|
||||
// URL 解析失败时直接拼接
|
||||
authUrl += (authUrl.includes('?') ? '&' : '?') + 'state=' + stateVal;
|
||||
}
|
||||
console.log('[index] 跳转授权页:', authUrl);
|
||||
// 跳转微信授权页(弹窗确认)
|
||||
window.location.href = authUrl;
|
||||
|
||||
// 用户信息授权:微信用 snsapi_userinfo,支付宝用 auth_user
|
||||
const platform = uni.getStorageSync('platform') || 'wechat';
|
||||
const scopes = platform === 'alipay' ? 'auth_user' : 'snsapi_userinfo';
|
||||
|
||||
const res = await gatewayGet('/api/v1/user/auth/url', {
|
||||
app_no: appNo,
|
||||
scopes: scopes,
|
||||
redirect_uri: redirectUri,
|
||||
state: JSON.stringify(stateObj),
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
if (data.code === 0 && data.data && data.data.auth_url) {
|
||||
console.log('[index] 跳转授权页:', data.data.auth_url);
|
||||
// 后端已将 state 写入授权 URL,直接跳转
|
||||
window.location.href = data.data.auth_url;
|
||||
} else {
|
||||
console.warn('[index] 获取授权链接失败:', data.message);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user