refactor(auth): 将家庭检查逻辑从静默授权移到数据刷新
静默授权函数不再处理家庭检查逻辑,统一在刷新数据时处理
Showing
2 changed files
with
16 additions
and
43 deletions
| ... | @@ -340,6 +340,17 @@ const refreshDashboardData = async () => { | ... | @@ -340,6 +340,17 @@ const refreshDashboardData = async () => { |
| 340 | }); | 340 | }); |
| 341 | } else { | 341 | } else { |
| 342 | console.error('获取Dashboard数据失败:', data); | 342 | console.error('获取Dashboard数据失败:', data); |
| 343 | + // 检查用户是否已加入家庭 | ||
| 344 | + const hasFamily = await checkUserHasFamily() | ||
| 345 | + | ||
| 346 | + // 如果用户没有加入家庭,跳转到欢迎页面 | ||
| 347 | + if (!hasFamily) { | ||
| 348 | + console.warn('用户未加入家庭,跳转到欢迎页面'); | ||
| 349 | + await Taro.navigateTo({ | ||
| 350 | + url: '/pages/Welcome/index' | ||
| 351 | + }) | ||
| 352 | + return | ||
| 353 | + } | ||
| 343 | } | 354 | } |
| 344 | } catch (error) { | 355 | } catch (error) { |
| 345 | console.error('刷新Dashboard数据异常:', error); | 356 | console.error('刷新Dashboard数据异常:', error); |
| ... | @@ -360,17 +371,6 @@ useLoad(async () => { | ... | @@ -360,17 +371,6 @@ useLoad(async () => { |
| 360 | // 静默授权成功后立即刷新页面数据 | 371 | // 静默授权成功后立即刷新页面数据 |
| 361 | await refreshDashboardData(); | 372 | await refreshDashboardData(); |
| 362 | 373 | ||
| 363 | - // 检查用户是否已加入家庭 | ||
| 364 | - const hasFamily = await checkUserHasFamily() | ||
| 365 | - | ||
| 366 | - // 如果用户没有加入家庭,跳转到欢迎页面 | ||
| 367 | - if (!hasFamily) { | ||
| 368 | - console.warn('用户未加入家庭,跳转到欢迎页面'); | ||
| 369 | - await Taro.navigateTo({ | ||
| 370 | - url: '/pages/Welcome/index' | ||
| 371 | - }) | ||
| 372 | - return | ||
| 373 | - } | ||
| 374 | }, | 374 | }, |
| 375 | (error) => { | 375 | (error) => { |
| 376 | console.error('Dashboard onLoad - 静默授权失败:', error); | 376 | console.error('Dashboard onLoad - 静默授权失败:', error); | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Date: 2025-01-25 10:00:00 | 2 | * @Date: 2025-01-25 10:00:00 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2025-09-12 23:02:36 | 4 | + * @LastEditTime: 2025-09-12 23:12:50 |
| 5 | * @FilePath: /lls_program/src/utils/authRedirect.js | 5 | * @FilePath: /lls_program/src/utils/authRedirect.js |
| 6 | * @Description: 授权重定向处理工具函数 | 6 | * @Description: 授权重定向处理工具函数 |
| 7 | */ | 7 | */ |
| ... | @@ -303,38 +303,11 @@ export const silentAuth = async (onSuccess, onError) => { | ... | @@ -303,38 +303,11 @@ export const silentAuth = async (onSuccess, onError) => { |
| 303 | // 更新request默认headers | 303 | // 更新request默认headers |
| 304 | request.defaults.headers.cookie = cookie | 304 | request.defaults.headers.cookie = cookie |
| 305 | 305 | ||
| 306 | - // 静默授权成功,检查用户是否已加入家庭 | 306 | + // 静默授权成功,直接执行成功回调 |
| 307 | - try { | 307 | + if (onSuccess) { |
| 308 | - const hasFamily = await checkUserHasFamily() | 308 | + onSuccess(response.data) |
| 309 | - | ||
| 310 | - // 如果用户没有加入家庭,跳转到欢迎页面 | ||
| 311 | - if (!hasFamily) { | ||
| 312 | - await Taro.redirectTo({ | ||
| 313 | - url: '/pages/Welcome/index' | ||
| 314 | - }) | ||
| 315 | - | ||
| 316 | - const result = { ...response.data, redirected: true } | ||
| 317 | - if (onSuccess) { | ||
| 318 | - onSuccess(result) | ||
| 319 | - } | ||
| 320 | - return result | ||
| 321 | - } | ||
| 322 | - | ||
| 323 | - // 用户已有家庭,执行成功回调 | ||
| 324 | - if (onSuccess) { | ||
| 325 | - onSuccess(response.data) | ||
| 326 | - } | ||
| 327 | - return response.data | ||
| 328 | - | ||
| 329 | - } catch (familyCheckError) { | ||
| 330 | - console.error('检查家庭状态失败:', familyCheckError) | ||
| 331 | - | ||
| 332 | - // 家庭检查失败,仍然执行成功回调,让页面正常显示 | ||
| 333 | - if (onSuccess) { | ||
| 334 | - onSuccess(response.data) | ||
| 335 | - } | ||
| 336 | - return response.data | ||
| 337 | } | 309 | } |
| 310 | + return response.data | ||
| 338 | 311 | ||
| 339 | } catch (error) { | 312 | } catch (error) { |
| 340 | console.error('静默授权过程失败:', error) | 313 | console.error('静默授权过程失败:', error) | ... | ... |
-
Please register or login to post a comment