From 6491e4cc2cb2dadfa2d447e617b7887573c6cdb7 Mon Sep 17 00:00:00 2001 From: "https://gitee.com/WALL_EYE" Date: Tue, 22 Feb 2022 20:05:29 +0800 Subject: [PATCH 1/3] fix new constructor for API8 Signed-off-by: https://gitee.com/WALL_EYE Change-Id: If6f6861936d700f00c5d42767db8db49ce2e2264 --- .../innerkits/napi/include/user_auth_helper.h | 12 +---- .../innerkits/napi/src/user_auth_helper.cpp | 46 ++++++++++--------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/interfaces/innerkits/napi/include/user_auth_helper.h b/interfaces/innerkits/napi/include/user_auth_helper.h index bd054be49..6b98be099 100755 --- a/interfaces/innerkits/napi/include/user_auth_helper.h +++ b/interfaces/innerkits/napi/include/user_auth_helper.h @@ -29,22 +29,14 @@ namespace UserAuth { */ void Init(napi_env env, napi_value exports); -/** - * @brief Get the Ctor object - * - * @param env - * @return napi_value UserAuth Instance - */ -napi_value GetCtor(napi_env env); - /** * @brief Construction method * * @param env - * @param info + * @param exports * @return napi_value UserAuth Instance */ -napi_value Constructor(napi_env env, napi_callback_info info); +void Constructor(napi_env env, napi_value exports); /** * @brief Get the Ctor object for API6 diff --git a/interfaces/innerkits/napi/src/user_auth_helper.cpp b/interfaces/innerkits/napi/src/user_auth_helper.cpp index 4600b83b2..fcfdb8b03 100755 --- a/interfaces/innerkits/napi/src/user_auth_helper.cpp +++ b/interfaces/innerkits/napi/src/user_auth_helper.cpp @@ -205,36 +205,20 @@ void Init(napi_env env, napi_value exports) { napi_status status; napi_property_descriptor exportFuncs[] = { - DECLARE_NAPI_FUNCTION("constructor", UserAuth::Constructor), DECLARE_NAPI_FUNCTION("getAuthenticator", UserAuth::ConstructorForAPI6), }; status = napi_define_properties(env, exports, sizeof(exportFuncs) / sizeof(*exportFuncs), exportFuncs); if (status != napi_ok) { HILOG_ERROR("napi_define_properties faild"); } -} -napi_value Constructor(napi_env env, napi_callback_info info) -{ - napi_value thisVar = nullptr; - napi_value userAuth = nullptr; - NAPI_CALL(env, napi_new_instance(env, GetCtor(env), 0, nullptr, &userAuth)); - NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - return userAuth; + Constructor(env, exports); } -napi_value ConstructorForAPI6(napi_env env, napi_callback_info info) -{ - napi_value thisVar = nullptr; - napi_value userAuthForAPI6 = nullptr; - NAPI_CALL(env, napi_new_instance(env, GetCtorForAPI6(env), 0, nullptr, &userAuthForAPI6)); - NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - return userAuthForAPI6; -} - -napi_value GetCtor(napi_env env) +void Constructor(napi_env env, napi_value exports) { napi_value cons = nullptr; + napi_status status = napi_ok; napi_property_descriptor clzDes[] = { DECLARE_NAPI_FUNCTION("getVersion", UserAuth::GetVersion), DECLARE_NAPI_FUNCTION("getAvailableStatus", UserAuth::GetAvailableStatus), @@ -244,9 +228,27 @@ napi_value GetCtor(napi_env env) DECLARE_NAPI_FUNCTION("authUser", UserAuth::AuthUser), DECLARE_NAPI_FUNCTION("cancelAuth", UserAuth::CancelAuth), }; - NAPI_CALL(env, napi_define_class(env, "UserAuth", NAPI_AUTO_LENGTH, UserAuthServiceConstructor, nullptr, - sizeof(clzDes) / sizeof(napi_property_descriptor), clzDes, &cons)); - return cons; + status = napi_define_class(env, "UserAuth", NAPI_AUTO_LENGTH, UserAuthServiceConstructor, nullptr, + sizeof(clzDes) / sizeof(napi_property_descriptor), clzDes, &cons); + if (status != napi_ok) { + HILOG_ERROR("napi_define_class faild"); + return; + } + + status = napi_set_named_property(env, exports, "constructor", cons); + if (status != napi_ok) { + HILOG_ERROR("napi_set_named_property faild"); + return; + } +} + +napi_value ConstructorForAPI6(napi_env env, napi_callback_info info) +{ + napi_value thisVar = nullptr; + napi_value userAuthForAPI6 = nullptr; + NAPI_CALL(env, napi_new_instance(env, GetCtorForAPI6(env), 0, nullptr, &userAuthForAPI6)); + NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); + return userAuthForAPI6; } napi_value GetCtorForAPI6(napi_env env) -- Gitee From a4a6965b3be13fd0a8f8e8297ac295eb23f67652 Mon Sep 17 00:00:00 2001 From: "https://gitee.com/WALL_EYE" Date: Tue, 22 Feb 2022 20:41:31 +0800 Subject: [PATCH 2/3] fix new constructor for API8 Signed-off-by: https://gitee.com/WALL_EYE Change-Id: Ie72e1e32082ddd769864063c7a77aeb42bff3c55 --- interfaces/innerkits/napi/src/user_auth_helper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/napi/src/user_auth_helper.cpp b/interfaces/innerkits/napi/src/user_auth_helper.cpp index fcfdb8b03..8396dd88c 100755 --- a/interfaces/innerkits/napi/src/user_auth_helper.cpp +++ b/interfaces/innerkits/napi/src/user_auth_helper.cpp @@ -235,7 +235,7 @@ void Constructor(napi_env env, napi_value exports) return; } - status = napi_set_named_property(env, exports, "constructor", cons); + status = napi_set_named_property(env, exports, "UserAuth", cons); if (status != napi_ok) { HILOG_ERROR("napi_set_named_property faild"); return; -- Gitee From 574fad11c1f591531d6c5dc887212c1d8d070c6a Mon Sep 17 00:00:00 2001 From: "https://gitee.com/WALL_EYE" Date: Wed, 23 Feb 2022 16:38:13 +0800 Subject: [PATCH 3/3] fix new constructor for API8 Signed-off-by: https://gitee.com/WALL_EYE Change-Id: Ib9a060fa545b65e81c0dccc6f2a2fdc2f64387de --- interfaces/innerkits/napi/include/user_auth_helper.h | 1 - interfaces/innerkits/napi/src/user_auth_helper.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/napi/include/user_auth_helper.h b/interfaces/innerkits/napi/include/user_auth_helper.h index 233a50dbb..b4883f87e 100755 --- a/interfaces/innerkits/napi/include/user_auth_helper.h +++ b/interfaces/innerkits/napi/include/user_auth_helper.h @@ -34,7 +34,6 @@ void Init(napi_env env, napi_value exports); * * @param env * @param exports - * @return napi_value UserAuth Instance */ void Constructor(napi_env env, napi_value exports); diff --git a/interfaces/innerkits/napi/src/user_auth_helper.cpp b/interfaces/innerkits/napi/src/user_auth_helper.cpp index b0ea8aaea..c7a5a678c 100755 --- a/interfaces/innerkits/napi/src/user_auth_helper.cpp +++ b/interfaces/innerkits/napi/src/user_auth_helper.cpp @@ -234,15 +234,15 @@ void Constructor(napi_env env, napi_value exports) status = napi_define_class(env, "UserAuth", NAPI_AUTO_LENGTH, UserAuthServiceConstructor, nullptr, sizeof(clzDes) / sizeof(napi_property_descriptor), clzDes, &cons); if (status != napi_ok) { - HILOG_ERROR("napi_define_class faild"); + USERAUTH_HILOGE(MODULE_JS_NAPI, "napi_define_class faild"); return; } status = napi_set_named_property(env, exports, "UserAuth", cons); if (status != napi_ok) { - HILOG_ERROR("napi_set_named_property faild"); - return; + USERAUTH_HILOGE(MODULE_JS_NAPI, "napi_set_named_property faild"); } + return; } napi_value ConstructorForAPI6(napi_env env, napi_callback_info info) -- Gitee