@liujitcn/kratos-uni-app-core 0.0.38 → 0.0.39

package/README.md

@@ -1,5 +1,7 @@
 # @liujitcn/kratos-uni-app-core
 
+账号密码、OAuth 票据兑换和微信登录统一返回 `mfa_remember_days`，表示当前登录策略允许的 MFA 设备免验证天数；为 `0` 时不提供记住设备选项。
+
 `@liujitcn/kratos-uni-app-core` 是应用底座包，提供模块协议、启动流程、动态导航、认证与请求、MFA 校验、共享状态、基础页面和构建期页面装配能力。业务模块只能通过本包公开 exports 使用这些能力。
 
 ## 目录结构

package/dist/module.mjs

@@ -61,10 +61,10 @@ var zh_CN_default = {
   "core.home.account_capability_description": "\u4E2A\u4EBA\u8D44\u6599\u3001\u5E94\u7528\u8BBE\u7F6E\u4E0E\u667A\u80FD\u52A9\u624B\u5165\u53E3\u5DF2\u4FDD\u7559",
   "core.home.cross_platform": "\u8DE8\u7AEF\u9875\u9762",
   "core.home.cross_platform_description": "\u540C\u4E00\u5957\u9875\u9762\u4EE3\u7801\u9002\u914D H5 \u548C\u5FAE\u4FE1\u5C0F\u7A0B\u5E8F",
-  "core.home.demo_scope": "\u6F14\u793A\u8303\u56F4",
+  "core.home.demo_scope": "\u529F\u80FD\u6982\u89C8",
   "core.home.framework": "\u5E94\u7528\u6846\u67B6",
   "core.home.language": "\u5F00\u53D1\u8BED\u8A00",
-  "core.home.main_title": "\u5E94\u7528\u6846\u67B6\u793A\u4F8B",
+  "core.home.main_title": "\u5E94\u7528\u9996\u9875",
   "core.home.state_management": "\u72B6\u6001\u7BA1\u7406",
   "core.home.static_home": "\u9759\u6001\u9996\u9875",
   "core.home.static_home_description": "\u5F53\u524D\u9996\u9875\u7528\u4E8E\u5C55\u793A\u6846\u67B6\u4FE1\u606F\uFF0C\u4E0D\u4F9D\u8D56\u4E1A\u52A1\u63A5\u53E3",
@@ -88,6 +88,7 @@ var zh_CN_default = {
   "core.login.login_success": "\u767B\u5F55\u6210\u529F",
   "core.login.mfa_title": "\u591A\u56E0\u7D20\u8BA4\u8BC1",
   "core.login.mfa_code": "\u8BF7\u8F93\u5165\u52A8\u6001\u53E3\u4EE4",
+  "core.login.mfa_remember_device": "{days}\u5929\u5185\u514D\u9A8C\u8BC1\u6B64\u8BBE\u5907",
   "core.login.mfa_recovery_code": "\u6062\u590D\u7801\uFF08\u53EF\u9009\uFF09",
   "core.login.mfa_setup_title": "\u7ED1\u5B9A\u591A\u56E0\u7D20\u8BA4\u8BC1",
   "core.login.mfa_copy_uri": "\u590D\u5236\u7ED1\u5B9A\u5730\u5740",
@@ -204,10 +205,10 @@ var en_US_default = {
   "core.home.account_capability_description": "Profile, app settings, and AI assistant access are included",
   "core.home.cross_platform": "Cross-platform pages",
   "core.home.cross_platform_description": "One codebase for H5 and WeChat Mini Program",
-  "core.home.demo_scope": "Demo scope",
+  "core.home.demo_scope": "Overview",
   "core.home.framework": "App framework",
   "core.home.language": "Language",
-  "core.home.main_title": "Application Framework",
+  "core.home.main_title": "Application Home",
   "core.home.state_management": "State management",
   "core.home.static_home": "Static home",
   "core.home.static_home_description": "This page presents framework details without business APIs",
@@ -229,6 +230,7 @@ var en_US_default = {
   "core.login.captcha_write_failed": "Failed to save verification image",
   "core.login.default_sub_title": "Welcome",
   "core.login.login_success": "Logged in",
+  "core.login.mfa_remember_device": "Skip verification on this device for {days} days",
   "core.login.mfa_title": "Multi-factor authentication",
   "core.login.mfa_code": "Enter the authenticator code",
   "core.login.mfa_recovery_code": "Recovery code (optional)",
@@ -347,10 +349,10 @@ var ja_JP_default = {
   "core.home.account_capability_description": "\u500B\u4EBA\u60C5\u5831\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u8A2D\u5B9A\u3001\u30B9\u30DE\u30FC\u30C8\u30A2\u30B7\u30B9\u30BF\u30F3\u30C8\u5165\u53E3\u304C\u4E88\u7D04\u3055\u308C\u3066\u3044\u307E\u3059",
   "core.home.cross_platform": "\u30AF\u30ED\u30B9\u30A8\u30F3\u30C9 \u30DA\u30FC\u30B8",
   "core.home.cross_platform_description": "\u540C\u3058\u30DA\u30FC\u30B8 \u30B3\u30FC\u30C9 \u30BB\u30C3\u30C8\u304C H5 \u304A\u3088\u3073 WeChat \u30DF\u30CB \u30D7\u30ED\u30B0\u30E9\u30E0\u306B\u9069\u5FDC\u3057\u307E\u3059",
-  "core.home.demo_scope": "\u30C7\u30E2\u306E\u7BC4\u56F2",
+  "core.home.demo_scope": "\u6A5F\u80FD\u6982\u8981",
   "core.home.framework": "\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3 \u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF",
   "core.home.language": "\u958B\u767A\u8A00\u8A9E",
-  "core.home.main_title": "\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u306E\u4F8B",
+  "core.home.main_title": "\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30DB\u30FC\u30E0",
   "core.home.state_management": "\u30B9\u30C6\u30FC\u30BF\u30B9\u7BA1\u7406",
   "core.home.static_home": "\u9759\u7684\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8",
   "core.home.static_home_description": "\u73FE\u5728\u306E\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u60C5\u5831\u3092\u8868\u793A\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u3066\u304A\u308A\u3001\u30D3\u30B8\u30CD\u30B9 \u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9\u306B\u306F\u4F9D\u5B58\u3057\u3066\u3044\u307E\u305B\u3093",
@@ -372,6 +374,7 @@ var ja_JP_default = {
   "core.login.captcha_write_failed": "\u691C\u8A3C\u30B3\u30FC\u30C9\u30A4\u30E1\u30FC\u30B8\u306E\u66F8\u304D\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
   "core.login.default_sub_title": "\u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3078\u3088\u3046\u3053\u305D",
   "core.login.login_success": "\u30ED\u30B0\u30A4\u30F3\u306B\u6210\u529F\u3057\u307E\u3057\u305F",
+  "core.login.mfa_remember_device": "\u3053\u306E\u7AEF\u672B\u3067\u306F{days}\u65E5\u9593\u3001\u8FFD\u52A0\u8A8D\u8A3C\u3092\u7701\u7565\u3059\u308B",
   "core.login.mfa_title": "\u591A\u8981\u7D20\u8A8D\u8A3C",
   "core.login.mfa_code": "\u8A8D\u8A3C\u30B3\u30FC\u30C9\u3092\u5165\u529B",
   "core.login.mfa_recovery_code": "\u30EA\u30AB\u30D0\u30EA\u30FC\u30B3\u30FC\u30C9\uFF08\u4EFB\u610F\uFF09",
@@ -490,10 +493,10 @@ var zh_TW_default = {
   "core.home.account_capability_description": "\u500B\u4EBA\u8CC7\u6599\u3001\u61C9\u7528\u8A2D\u5B9A\u8207\u667A\u6167\u52A9\u624B\u5165\u53E3\u5DF2\u4FDD\u7559",
   "core.home.cross_platform": "\u8DE8\u7AEF\u9801\u9762",
   "core.home.cross_platform_description": "\u540C\u4E00\u5957\u9801\u9762\u7A0B\u5F0F\u78BC\u9069\u914D H5 \u548C\u5FAE\u4FE1\u5C0F\u7A0B\u5F0F",
-  "core.home.demo_scope": "\u6F14\u793A\u7BC4\u570D",
+  "core.home.demo_scope": "\u529F\u80FD\u6982\u89BD",
   "core.home.framework": "\u61C9\u7528\u6846\u67B6",
   "core.home.language": "\u958B\u767C\u8A9E\u8A00",
-  "core.home.main_title": "\u61C9\u7528\u6846\u67B6\u793A\u4F8B",
+  "core.home.main_title": "\u61C9\u7528\u9996\u9801",
   "core.home.state_management": "\u72C0\u614B\u7BA1\u7406",
   "core.home.static_home": "\u975C\u614B\u9996\u9801",
   "core.home.static_home_description": "\u7576\u524D\u9996\u9801\u7528\u65BC\u5C55\u793A\u6846\u67B6\u8CC7\u8A0A\uFF0C\u4E0D\u4F9D\u8CF4\u696D\u52D9\u4ECB\u9762",
@@ -515,6 +518,7 @@ var zh_TW_default = {
   "core.login.captcha_write_failed": "\u9A57\u8B49\u78BC\u5716\u7247\u5BEB\u5165\u5931\u6557",
   "core.login.default_sub_title": "\u6B61\u8FCE\u4F7F\u7528\u672C\u61C9\u7528",
   "core.login.login_success": "\u767B\u5165\u6210\u529F",
+  "core.login.mfa_remember_device": "{days}\u5929\u5167\u514D\u9A57\u8B49\u6B64\u88DD\u7F6E",
   "core.login.mfa_title": "\u591A\u56E0\u7D20\u8A8D\u8B49",
   "core.login.mfa_code": "\u8ACB\u8F38\u5165\u52D5\u614B\u5BC6\u78BC",
   "core.login.mfa_recovery_code": "\u6062\u5FA9\u78BC\uFF08\u53EF\u9078\uFF09",

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.38",
+  "version": "0.0.39",
   "type": "module",
   "files": [
     "dist",

package/src/locales/en-US.json

@@ -35,10 +35,10 @@
   "core.home.account_capability_description": "Profile, app settings, and AI assistant access are included",
   "core.home.cross_platform": "Cross-platform pages",
   "core.home.cross_platform_description": "One codebase for H5 and WeChat Mini Program",
-  "core.home.demo_scope": "Demo scope",
+  "core.home.demo_scope": "Overview",
   "core.home.framework": "App framework",
   "core.home.language": "Language",
-  "core.home.main_title": "Application Framework",
+  "core.home.main_title": "Application Home",
   "core.home.state_management": "State management",
   "core.home.static_home": "Static home",
   "core.home.static_home_description": "This page presents framework details without business APIs",
@@ -60,6 +60,7 @@
   "core.login.captcha_write_failed": "Failed to save verification image",
   "core.login.default_sub_title": "Welcome",
   "core.login.login_success": "Logged in",
+  "core.login.mfa_remember_device": "Skip verification on this device for {days} days",
   "core.login.mfa_title": "Multi-factor authentication",
   "core.login.mfa_code": "Enter the authenticator code",
   "core.login.mfa_recovery_code": "Recovery code (optional)",

package/src/locales/ja-JP.json

@@ -35,10 +35,10 @@
   "core.home.account_capability_description": "個人情報、アプリケーション設定、スマートアシスタント入口が予約されています",
   "core.home.cross_platform": "クロスエンド ページ",
   "core.home.cross_platform_description": "同じページ コード セットが H5 および WeChat ミニ プログラムに適応します",
-  "core.home.demo_scope": "デモの範囲",
+  "core.home.demo_scope": "機能概要",
   "core.home.framework": "アプリケーション フレームワーク",
   "core.home.language": "開発言語",
-  "core.home.main_title": "アプリケーションフレームワークの例",
+  "core.home.main_title": "アプリケーションホーム",
   "core.home.state_management": "ステータス管理",
   "core.home.static_home": "静的ホームページ",
   "core.home.static_home_description": "現在のホームページはフレーム情報を表示するために使用されており、ビジネス インターフェイスには依存していません",
@@ -60,6 +60,7 @@
   "core.login.captcha_write_failed": "検証コードイメージの書き込みに失敗しました",
   "core.login.default_sub_title": "このアプリケーションへようこそ",
   "core.login.login_success": "ログインに成功しました",
+  "core.login.mfa_remember_device": "この端末では{days}日間、追加認証を省略する",
   "core.login.mfa_title": "多要素認証",
   "core.login.mfa_code": "認証コードを入力",
   "core.login.mfa_recovery_code": "リカバリーコード（任意）",

package/src/locales/zh-CN.json

@@ -35,10 +35,10 @@
   "core.home.account_capability_description": "个人资料、应用设置与智能助手入口已保留",
   "core.home.cross_platform": "跨端页面",
   "core.home.cross_platform_description": "同一套页面代码适配 H5 和微信小程序",
-  "core.home.demo_scope": "演示范围",
+  "core.home.demo_scope": "功能概览",
   "core.home.framework": "应用框架",
   "core.home.language": "开发语言",
-  "core.home.main_title": "应用框架示例",
+  "core.home.main_title": "应用首页",
   "core.home.state_management": "状态管理",
   "core.home.static_home": "静态首页",
   "core.home.static_home_description": "当前首页用于展示框架信息，不依赖业务接口",
@@ -62,6 +62,7 @@
   "core.login.login_success": "登录成功",
   "core.login.mfa_title": "多因素认证",
   "core.login.mfa_code": "请输入动态口令",
+  "core.login.mfa_remember_device": "{days}天内免验证此设备",
   "core.login.mfa_recovery_code": "恢复码（可选）",
   "core.login.mfa_setup_title": "绑定多因素认证",
   "core.login.mfa_copy_uri": "复制绑定地址",

package/src/locales/zh-TW.json

@@ -35,10 +35,10 @@
   "core.home.account_capability_description": "個人資料、應用設定與智慧助手入口已保留",
   "core.home.cross_platform": "跨端頁面",
   "core.home.cross_platform_description": "同一套頁面程式碼適配 H5 和微信小程式",
-  "core.home.demo_scope": "演示範圍",
+  "core.home.demo_scope": "功能概覽",
   "core.home.framework": "應用框架",
   "core.home.language": "開發語言",
-  "core.home.main_title": "應用框架示例",
+  "core.home.main_title": "應用首頁",
   "core.home.state_management": "狀態管理",
   "core.home.static_home": "靜態首頁",
   "core.home.static_home_description": "當前首頁用於展示框架資訊，不依賴業務介面",
@@ -60,6 +60,7 @@
   "core.login.captcha_write_failed": "驗證碼圖片寫入失敗",
   "core.login.default_sub_title": "歡迎使用本應用",
   "core.login.login_success": "登入成功",
+  "core.login.mfa_remember_device": "{days}天內免驗證此裝置",
   "core.login.mfa_title": "多因素認證",
   "core.login.mfa_code": "請輸入動態密碼",
   "core.login.mfa_recovery_code": "恢復碼（可選）",

package/src/rpc/base/v1/language.ts

@@ -24,7 +24,7 @@ export interface OptionLanguageResponse {
   languages: LanguageItem[];
 }
 
-/** 语言公共服务。 */
+/** Base语言公共服务。 */
 export interface LanguageService {
   /** 查询当前支持的语言选项。 */
   OptionLanguage(request: OptionLanguageRequest): Promise<OptionLanguageResponse>;

package/src/rpc/base/v1/login.ts

@@ -155,6 +155,8 @@ export interface LoginResponse {
   mfa_method: string;
   /** WebAuthn认证选项JSON */
   mfa_webauthn_options_json: string;
+  /** 当前登录策略允许的MFA设备免验证天数 */
+  mfa_remember_days: number;
 }
 
 /** Base登录公共服务 */

package/src/rpc/base/v1/mfa.ts

@@ -19,6 +19,8 @@ export interface VerifyMfaRequest {
   recovery_code: string;
   /** WebAuthn认证响应JSON */
   webauthn_response_json: string;
+  /** 是否记住当前设备 */
+  remember_device: boolean;
 }
 
 /** 登录强制绑定多因素认证请求。 */

package/src/rpc/base/v1/oauth.ts

@@ -109,6 +109,8 @@ export interface CreateOauthSessionResponse {
   mfa_method: string;
   /** WebAuthn认证选项JSON */
   mfa_webauthn_options_json: string;
+  /** 当前登录策略允许的MFA设备免验证天数 */
+  mfa_remember_days: number;
 }
 
 /** 三方登录回调请求 */
@@ -157,6 +159,8 @@ export interface ExchangeOauthTicketResponse {
   mfa_method: string;
   /** WebAuthn认证选项JSON */
   mfa_webauthn_options_json: string;
+  /** 当前登录策略允许的MFA设备免验证天数 */
+  mfa_remember_days: number;
 }
 
 /** 个人中心三方账号绑定回调请求 */

package/src/utils/http.ts

@@ -73,7 +73,7 @@ type HttpRequestOptions = UniApp.RequestOptions & {
 const httpInterceptor = {
   // 拦截前触发
   invoke(options: UniApp.RequestOptions) {
-    const authMode = (options as HttpRequestOptions).authMode
+    const authMode = resolveAuthMode(options as HttpRequestOptions, options.url)
     // 1. 相对接口地址只拼接一次基础路径，兼容 HMR 等场景下拦截器重复注册。
     if (
       !options.url.startsWith('http') &&
@@ -165,9 +165,10 @@ export const http = <T>(options: HttpRequestOptions) => {
   return new Promise<T>((resolve, reject) => {
     const sendRequest = async (retriedAsAnonymous = false) => {
       try {
-        const requestOptions = { ...options, header: { ...options.header } }
+        const requestOptions: HttpRequestOptions = { ...options, header: { ...options.header } }
         const requestUrl = String(requestOptions.url)
         const authMode = resolveAuthMode(requestOptions, requestUrl)
+        requestOptions.authMode = retriedAsAnonymous && authMode === 'optional' ? 'none' : authMode
         let accessToken = ''
         try {
           accessToken = await getAccessTokenByMode(
@@ -327,6 +328,7 @@ async function refreshAccessToken() {
       method: 'POST',
       data: { refresh_token: refreshToken },
       header: {
+        Authorization: 'no-auth',
         'source-client': sourceClient,
         ...getLocaleRequestHeaders(),
       },
@@ -373,7 +375,15 @@ async function refreshAccessToken() {
   setTokenExpiresIn(expires_in)
 }
 
+/** 业务页提示重新登录；登录页只清理残留登录态，避免后台请求触发循环弹窗。 */
 async function promptRelogin() {
+  const pages = getCurrentPages()
+  if (pages[pages.length - 1]?.route === 'pages/login/login') {
+    if (getToken() || getRefreshToken() || uni.getStorageSync('user')) {
+      silentClearAuthData()
+    }
+    return
+  }
   if (isPromptingRelogin) {
     return
   }

package/src/views/pages/login/login.vue

@@ -54,6 +54,8 @@ const mfaChallengeId = ref('')
 const mfaCode = ref('')
 const mfaRecoveryCode = ref('')
 const mfaMethod = ref('totp')
+const mfaRememberDays = ref(0)
+const rememberMfaDevice = ref(false)
 const mfaWebAuthnOptionsJson = ref('')
 const mfaSetupVisible = ref(false)
 const mfaSetupTicket = ref('')
@@ -290,6 +292,8 @@ const handleLoginResponse = async (response: LoginResponse) => {
     mfaCode.value = ''
     mfaRecoveryCode.value = ''
     mfaMethod.value = response.mfa_method || 'totp'
+    mfaRememberDays.value = response.mfa_remember_days || 0
+    rememberMfaDevice.value = false
     mfaWebAuthnOptionsJson.value = response.mfa_webauthn_options_json || ''
     mfaVisible.value = true
     return false
@@ -322,6 +326,7 @@ const verifyMfaLogin = async () => {
       code: mfaRecoveryCode.value ? '' : mfaCode.value,
       recovery_code: mfaRecoveryCode.value,
       webauthn_response_json: webauthnResponseJson,
+      remember_device: rememberMfaDevice.value,
     })
     mfaVisible.value = false
     if (await handleLoginResponse(response)) await loginSuccess()