Compare commits

...

2 Commits

Author SHA1 Message Date
kk 925ebe9bb9 post请求用户授权信息
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 42s
2026-07-11 11:59:09 +08:00
kk 258fa4a9f5 更新授权回调传参
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 44s
2026-07-11 11:37:53 +08:00
3 changed files with 70 additions and 26 deletions
+13 -3
View File
@@ -47,9 +47,19 @@
if (code) { if (code) {
// 有 code → 进入授权 Loading 页处理 // 有 code → 进入授权 Loading 页处理
// redirect_uri 已携带 device_id 和 action,回调时直接从 URL 取 // 从 state 中解析 device_id 和 actionOAuth 标准保证 state 原样回传)
const action = urlParams.get('action') || ''; let action = '';
const callbackDeviceId = urlParams.get('device_id') || deviceId || ''; let callbackDeviceId = deviceId || '';
try {
const stateStr = urlParams.get('state');
if (stateStr) {
const stateObj = JSON.parse(decodeURIComponent(stateStr));
action = stateObj.action || action;
callbackDeviceId = stateObj.device_id || callbackDeviceId;
}
} catch (_) {
// state 解析失败,忽略
}
let loadingUrl = '/pages/auth/loading?code=' + encodeURIComponent(code); let loadingUrl = '/pages/auth/loading?code=' + encodeURIComponent(code);
if (action) { if (action) {
loadingUrl += '&action=' + action; loadingUrl += '&action=' + action;
+37 -16
View File
@@ -87,13 +87,10 @@ export default {
try { try {
this.statusText = '正在获取授权...'; this.statusText = '正在获取授权...';
// 回调地址:基础地址 + device_id 参数(回调时保留) // 回调地址:必须与微信公众号后台注册地址一致,不能带自定义参数
let redirectUri = config.authRedirectUri || ( const redirectUri = config.authRedirectUri || (
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
); );
if (this.deviceId) {
redirectUri += (redirectUri.includes('?') ? '&' : '?') + 'device_id=' + encodeURIComponent(this.deviceId);
}
// 使用 snsapi_base 静默授权,不弹窗 // 使用 snsapi_base 静默授权,不弹窗
const res = await gatewayGet('/api/v1/user/auth/url', { const res = await gatewayGet('/api/v1/user/auth/url', {
@@ -104,8 +101,20 @@ export default {
const data = res.data || {}; const data = res.data || {};
if (data.code === 0 && data.data && data.data.auth_url) { if (data.code === 0 && data.data && data.data.auth_url) {
// 通过 state 传递 device_idOAuth 标准保证 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 = data.data.auth_url; window.location.href = authUrl;
} else { } else {
uni.showToast({ title: data.message || '获取授权失败', icon: 'none' }); uni.showToast({ title: data.message || '获取授权失败', icon: 'none' });
setTimeout(() => this.goToScan(), 1500); setTimeout(() => this.goToScan(), 1500);
@@ -212,14 +221,10 @@ export default {
try { try {
this.statusText = '正在获取用户信息...'; this.statusText = '正在获取用户信息...';
// 回调地址:基础地址 + action + device_id 参数(回调时保留) // 回调地址:必须与微信公众号后台注册地址一致,不能带自定义参数
let redirectUri = config.authRedirectUri || ( const redirectUri = config.authRedirectUri || (
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
); );
redirectUri += (redirectUri.includes('?') ? '&' : '?') + 'action=userinfo';
if (this.deviceId) {
redirectUri += '&device_id=' + encodeURIComponent(this.deviceId);
}
const res = await gatewayGet('/api/v1/user/auth/url', { const res = await gatewayGet('/api/v1/user/auth/url', {
app_no: appNo, app_no: appNo,
@@ -229,8 +234,22 @@ export default {
const data = res.data || {}; const data = res.data || {};
if (data.code === 0 && data.data && data.data.auth_url) { if (data.code === 0 && data.data && data.data.auth_url) {
// 通过 state 传递 action 和 device_idOAuth 标准保证 state 原样回传)
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 = data.data.auth_url; window.location.href = authUrl;
} else { } else {
uni.showToast({ title: data.message || '获取授权失败', icon: 'none' }); uni.showToast({ title: data.message || '获取授权失败', icon: 'none' });
setTimeout(() => this.goToHomeWithAction(), 1500); setTimeout(() => this.goToHomeWithAction(), 1500);
@@ -263,14 +282,16 @@ export default {
url.searchParams.delete('action'); url.searchParams.delete('action');
window.history.replaceState({}, '', url.toString()); window.history.replaceState({}, '', url.toString());
// 用 code 调用 /api/v1/user/info 获取用户信息 // 用 code 调用 POST /api/v1/user/info 获取用户信息(必须用 POST,GET 是另一个端点)
const res = await gatewayGet('/api/v1/user/info', { console.log('[loading] 请求 POST user/info, app_no:', appNo, 'code:', code);
const res = await gatewayPost('/api/v1/user/info', {
app_no: appNo, app_no: appNo,
code: code, code: code,
}); });
const data = res.data || {}; const data = res.data || {};
console.log('[loading] user info response:', JSON.stringify(data, null, 2)); console.log('[loading] user/info response:', JSON.stringify(data, null, 2));
console.log('[loading] user/info statusCode:', res.statusCode);
if (data.code === 0 && data.data) { if (data.code === 0 && data.data) {
const userInfo = data.data; const userInfo = data.data;
+20 -7
View File
@@ -325,14 +325,10 @@ export default {
} }
try { try {
// 回调地址:基础地址 + action + device_id 参数(回调时保留) // 回调地址:必须与微信公众号后台注册地址一致,不能带自定义参数
let redirectUri = config.authRedirectUri || ( const redirectUri = config.authRedirectUri || (
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
); );
redirectUri += (redirectUri.includes('?') ? '&' : '?') + 'action=userinfo';
if (this.deviceId) {
redirectUri += '&device_id=' + encodeURIComponent(this.deviceId);
}
// 获取非静默授权链接(会弹窗确认) // 获取非静默授权链接(会弹窗确认)
const res = await gatewayGet('/api/v1/user/auth/url', { const res = await gatewayGet('/api/v1/user/auth/url', {
@@ -343,8 +339,25 @@ export default {
const data = res.data || {}; const data = res.data || {};
if (data.code === 0 && data.data && data.data.auth_url) { if (data.code === 0 && data.data && data.data.auth_url) {
// 通过 state 传递 action 和 device_idOAuth 标准保证 state 原样回传)
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 = data.data.auth_url; window.location.href = authUrl;
} else { } else {
console.warn('[index] 获取授权链接失败:', data.message); console.warn('[index] 获取授权链接失败:', data.message);
} }