diff --git a/frameworks/common/inc/auth_common.h b/frameworks/common/inc/auth_common.h index ec47c36c5cb86b0a80025eb3535a1bfc17f221b9..db8226dea2d1a855fbebe9a674ff5a04b50d89ab 100644 --- a/frameworks/common/inc/auth_common.h +++ b/frameworks/common/inc/auth_common.h @@ -131,6 +131,7 @@ enum UserAuthTipCode { TIP_CODE_PERMANENTLY_LOCKED = 4, TIP_CODE_WIDGET_LOADED = 5, TIP_CODE_WIDGET_RELEASED = 6, + TIP_CODE_COMPARE_FAIL_WITH_FROZEN = 7, }; const std::map g_resultV92Str = { diff --git a/frameworks/js/napi/user_auth/src/user_auth_entry.cpp b/frameworks/js/napi/user_auth/src/user_auth_entry.cpp index 665b10890267478d9d87745e378977dbfffa3517..66dc387e83e43ed21140866366dddd6fc556822f 100644 --- a/frameworks/js/napi/user_auth/src/user_auth_entry.cpp +++ b/frameworks/js/napi/user_auth/src/user_auth_entry.cpp @@ -979,6 +979,7 @@ napi_value UserAuthTipCodeConstructor(napi_env env) napi_value permanentLocked = nullptr; napi_value widgetLoaded = nullptr; napi_value widgetReleased = nullptr; + napi_value cmpFailWithFrozen = nullptr; NAPI_CALL(env, napi_create_object(env, &userAuthTipCode)); NAPI_CALL(env, napi_create_int32(env, UserAuthTipCode::TIP_CODE_FAIL, &compareFailure)); NAPI_CALL(env, napi_create_int32(env, UserAuthTipCode::TIP_CODE_TIMEOUT, &timeout)); @@ -986,12 +987,14 @@ napi_value UserAuthTipCodeConstructor(napi_env env) NAPI_CALL(env, napi_create_int32(env, UserAuthTipCode::TIP_CODE_PERMANENTLY_LOCKED, &permanentLocked)); NAPI_CALL(env, napi_create_int32(env, UserAuthTipCode::TIP_CODE_WIDGET_LOADED, &widgetLoaded)); NAPI_CALL(env, napi_create_int32(env, UserAuthTipCode::TIP_CODE_WIDGET_RELEASED, &widgetReleased)); + NAPI_CALL(env, napi_create_int32(env, UserAuthTipCode::TIP_CODE_COMPARE_FAIL_WITH_FROZEN, &cmpFailWithFrozen)); NAPI_CALL(env, napi_set_named_property(env, userAuthTipCode, "COMPARE_FAILURE", compareFailure)); NAPI_CALL(env, napi_set_named_property(env, userAuthTipCode, "TIMEOUT", timeout)); NAPI_CALL(env, napi_set_named_property(env, userAuthTipCode, "TEMPORARILY_LOCKED", temporaryLocked)); NAPI_CALL(env, napi_set_named_property(env, userAuthTipCode, "PERMANENTLY_LOCKED", permanentLocked)); NAPI_CALL(env, napi_set_named_property(env, userAuthTipCode, "WIDGET_LOADED", widgetLoaded)); NAPI_CALL(env, napi_set_named_property(env, userAuthTipCode, "WIDGET_RELEASED", widgetReleased)); + NAPI_CALL(env, napi_set_named_property(env, userAuthTipCode, "COMPARE_FAILURE_WITH_FROZEN", cmpFailWithFrozen)); return userAuthTipCode; } diff --git a/services/context/src/widget_context.cpp b/services/context/src/widget_context.cpp index d54a3bf45f528f245b26e2f2a3ff15416228accf..f937ffe55ce2e2e995667f59f6d36b022fa12d18 100644 --- a/services/context/src/widget_context.cpp +++ b/services/context/src/widget_context.cpp @@ -805,10 +805,14 @@ UserAuthTipCode WidgetContext::GetAuthTipCode(int32_t authResult, int32_t freezi UserAuthTipCode tipCode = TIP_CODE_FAIL; if (authResult == ResultCode::TIMEOUT) { tipCode = TIP_CODE_TIMEOUT; - } else if (freezingTime == INT32_MAX) { - tipCode = TIP_CODE_PERMANENTLY_LOCKED; + } else if (authResult == ResultCode::LOCKED) { + if (freezingTime == INT32_MAX) { + tipCode = TIP_CODE_PERMANENTLY_LOCKED; + } else { + tipCode = TIP_CODE_TEMPORARILY_LOCKED; + } } else if (freezingTime > 0) { - tipCode = TIP_CODE_TEMPORARILY_LOCKED; + tipCode = TIP_CODE_COMPARE_FAIL_WITH_FROZEN; } else { tipCode = TIP_CODE_FAIL; } diff --git a/test/unittest/services/src/widget_context_test.cpp b/test/unittest/services/src/widget_context_test.cpp index 481112c2473ad4e650497a803c5bd88d24704b8a..e64728d444c4f692dc5db73f4605d34d9f282561 100644 --- a/test/unittest/services/src/widget_context_test.cpp +++ b/test/unittest/services/src/widget_context_test.cpp @@ -690,9 +690,11 @@ HWTEST_F(WidgetContextTest, WidgetContextTestGetAuthTipCode, TestSize.Level0) auto widgetContext = CreateWidgetContext(contextId, para); EXPECT_NE(widgetContext, nullptr); EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::TIMEOUT, 0), TIP_CODE_TIMEOUT); - EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::FAIL, 1), TIP_CODE_TEMPORARILY_LOCKED); - EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::FAIL, INT32_MAX), TIP_CODE_PERMANENTLY_LOCKED); + EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::FAIL, 1), TIP_CODE_COMPARE_FAIL_WITH_FROZEN); + EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::FAIL, INT32_MAX), TIP_CODE_COMPARE_FAIL_WITH_FROZEN); EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::FAIL, -1), TIP_CODE_FAIL); + EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::LOCKED, 1), TIP_CODE_TEMPORARILY_LOCKED); + EXPECT_EQ(widgetContext->GetAuthTipCode(ResultCode::LOCKED, INT32_MAX), TIP_CODE_PERMANENTLY_LOCKED); } HWTEST_F(WidgetContextTest, WidgetContextTestProcAuthResult, TestSize.Level0)