From d05990f4d9d3fc4b90153a4df5b433c8935f5184 Mon Sep 17 00:00:00 2001
From: adelelimi <limi24@huawei.com>
Date: Mon, 1 Sep 2025 15:14:12 +0800
Subject: [PATCH] =?UTF-8?q?API=2020=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E5=8C=96(=E4=B8=8D=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=AD=E9=97=B4=E7=8A=B6=E6=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: adelelimi <limi24@huawei.com>
---
 .../idl/ohos.userIAM.userAuth.userAuth.taihe  | 20 ++++++++++++++++++-
 .../user_auth/inc/user_auth_instance_v10.h    |  1 +
 .../user_auth/src/user_auth_instance_v10.cpp  | 20 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/frameworks/ets/ani/user_auth/idl/ohos.userIAM.userAuth.userAuth.taihe b/frameworks/ets/ani/user_auth/idl/ohos.userIAM.userAuth.userAuth.taihe
index cabb46a4c..4ea35405e 100644
--- a/frameworks/ets/ani/user_auth/idl/ohos.userIAM.userAuth.userAuth.taihe
+++ b/frameworks/ets/ani/user_auth/idl/ohos.userIAM.userAuth.userAuth.taihe
@@ -59,12 +59,29 @@ enum UserAuthResultCode : i32 {
     TYPE_NOT_SUPPORT = 12500005,
     TRUST_LEVEL_NOT_SUPPORT = 12500006,
     BUSY = 12500007,
+    INVALID_PARAMETERS = 12500008,
     LOCKED = 12500009,
     NOT_ENROLLED = 12500010,
     CANCELED_FROM_WIDGET = 12500011,
     PIN_EXPIRED = 12500013,
     AUTH_TOKEN_CHECK_FAILED = 12500015,
-    AUTH_TOKEN_EXPIRED = 12500016
+    AUTH_TOKEN_EXPIRED = 12500016,
+    REUSE_AUTH_RESULT_FAILED = 12500017
+}
+
+enum UserAuthTipCode : i32 {
+    COMPARE_FAILURE = 1,
+    TIMEOUT = 2,
+    TEMPORARILY_LOCKED = 3,
+    PERMANENTLY_LOCKED = 4,
+    WIDGET_LOADED = 5,
+    WIDGET_RELEASED = 6,
+    COMPARE_FAILURE_WITH_FROZEN = 7
+}
+
+struct AuthTipInfo {
+    tipType: UserAuthType;
+    tipCode: UserAuthTipCode;
 }
  
 struct EnrolledState {
@@ -83,6 +100,7 @@ struct AuthParam {
     authTrustLevel: AuthTrustLevel;
     reuseUnlockResult: Optional<ReuseUnlockResult>;
     userId: Optional<i32>;
+    skipLockedBiometricAuth: Optional<bool>;
 }
  
 struct WidgetParam {
diff --git a/frameworks/ets/ani/user_auth/inc/user_auth_instance_v10.h b/frameworks/ets/ani/user_auth/inc/user_auth_instance_v10.h
index 90ce1d2a8..4301b530a 100644
--- a/frameworks/ets/ani/user_auth/inc/user_auth_instance_v10.h
+++ b/frameworks/ets/ani/user_auth/inc/user_auth_instance_v10.h
@@ -54,6 +54,7 @@ private:
     UserAuthResultCode InitAuthTrustLevel(userAuth::AuthParam const &authParam);
     UserAuthResultCode InitReuseUnlockResult(userAuth::AuthParam const &authParam);
     UserAuthResultCode InitUserId(userAuth::AuthParam const &authParam);
+    UserAuthResultCode InitSkipLockedBiometricAuth(userAuth::AuthParam const &authParam);
     UserAuthResultCode InitTitle(userAuth::WidgetParam const &widgetParam);
     UserAuthResultCode InitNavigationButtonText(userAuth::WidgetParam const &widgetParam);
     UserAuthResultCode InitWindowMode(userAuth::WidgetParam const &widgetParam);
diff --git a/frameworks/ets/ani/user_auth/src/user_auth_instance_v10.cpp b/frameworks/ets/ani/user_auth/src/user_auth_instance_v10.cpp
index 638b93e72..b4492dc5f 100644
--- a/frameworks/ets/ani/user_auth/src/user_auth_instance_v10.cpp
+++ b/frameworks/ets/ani/user_auth/src/user_auth_instance_v10.cpp
@@ -46,6 +46,7 @@ const std::string AUTH_PARAM_AUTHTYPE = "authType";
 const std::string AUTH_PARAM_AUTHTRUSTLEVEL = "authTrustLevel";
 const std::string AUTH_PARAM_REUSEUNLOCKRESULT = "reuseUnlockResult";
 const std::string AUTH_PARAM_USER_ID = "userId";
+const std::string AUTH_PARAM_SKIP_LOCKED_BIOMETRIC_AUTH = "skipLockedBiometricAuth";
 const std::string WIDGET_PARAM_TITLE = "title";
 const std::string WIDGET_PARAM_NAVIBTNTEXT = "navigationButtonText";
 const std::string WIDGET_PARAM_WINDOWMODE = "windowMode";
@@ -66,6 +67,7 @@ UserAuthInstanceV10::UserAuthInstanceV10() : callback_(Common::MakeShared<UserAu
     }
     authParam_.authTrustLevel = AuthTrustLevel::ATL1;
     authParam_.userId = INVALID_USER_ID;
+    authParam_.skipLockedBiometricAuth = false;
     widgetParam_.navigationButtonText = "";
     widgetParam_.title = "";
     widgetParam_.windowMode = WindowModeType::UNKNOWN_WINDOW_MODE;
@@ -119,6 +121,12 @@ UserAuthResultCode UserAuthInstanceV10::InitAuthParam(userAuth::AuthParam const
         IAM_LOGE("InitUserId fail:%{public}d", errorCode);
         return errorCode;
     }
+
+    errorCode = InitSkipLockedBiometricAuth(authParam);
+    if (errorCode != UserAuthResultCode::SUCCESS) {
+        IAM_LOGE("InitSkipLockedBiometricAuth fail:%{public}d", errorCode);
+        return errorCode;
+    }
     return UserAuthResultCode::SUCCESS;
 }
 
@@ -188,6 +196,18 @@ UserAuthResultCode UserAuthInstanceV10::InitUserId(userAuth::AuthParam const &au
     return UserAuthResultCode::SUCCESS;
 }
 
+UserAuthResultCode UserAuthInstanceV10::InitSkipLockedBiometricAuth(userAuth::AuthParam const &authParam)
+{
+    IAM_LOGI("InitSkipLockedBiometricAuth start.");
+    if (authParam.skipLockedBiometricAuth.has_value()) {
+        authParam_.skipLockedBiometricAuth = authParam.skipLockedBiometricAuth.value();
+        IAM_LOGI("InitSkipLockedBiometricAuth value: %{public}d", authParam_.skipLockedBiometricAuth);
+    } else {
+        IAM_LOGI("propertyName: %{public}s not exists.", AUTH_PARAM_SKIP_LOCKED_BIOMETRIC_AUTH.c_str());
+    }
+    return UserAuthResultCode::SUCCESS;
+}
+
 UserAuthResultCode UserAuthInstanceV10::InitWidgetParam(userAuth::WidgetParam const &widgetParam)
 {
     IAM_LOGI("InitWidgetParam start.");
-- 
Gitee