diff --git a/interfaces/innerkits/napi/include/user_auth_helper.h b/interfaces/innerkits/napi/include/user_auth_helper.h index 9b67031b2118dcbaa6537c7c02cb8e76f67f8c03..b4883f87e7007c33873da0ee15628d36b2e9e7f5 100755 --- a/interfaces/innerkits/napi/include/user_auth_helper.h +++ b/interfaces/innerkits/napi/include/user_auth_helper.h @@ -29,22 +29,13 @@ 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 - * @return napi_value UserAuth Instance + * @param exports */ -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 f73e4a83346284c02cd0160959117e30a66d1d50..c7a5a678ca8d5ae26aa968df5ead6cc6983f3fe9 100755 --- a/interfaces/innerkits/napi/src/user_auth_helper.cpp +++ b/interfaces/innerkits/napi/src/user_auth_helper.cpp @@ -207,38 +207,21 @@ void Init(napi_env env, napi_value exports) USERAUTH_HILOGI(MODULE_JS_NAPI, "%{public}s, start.", __func__); 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) { USERAUTH_HILOGE(MODULE_JS_NAPI, "napi_define_properties faild"); } -} - -napi_value Constructor(napi_env env, napi_callback_info info) -{ - USERAUTH_HILOGI(MODULE_JS_NAPI, "%{public}s, start.", __func__); - 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; -} -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; + Constructor(env, exports); } -napi_value GetCtor(napi_env env) +void Constructor(napi_env env, napi_value exports) { USERAUTH_HILOGI(MODULE_JS_NAPI, "%{public}s, start.", __func__); 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), @@ -248,9 +231,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) { + USERAUTH_HILOGE(MODULE_JS_NAPI, "napi_define_class faild"); + return; + } + + status = napi_set_named_property(env, exports, "UserAuth", cons); + if (status != napi_ok) { + USERAUTH_HILOGE(MODULE_JS_NAPI, "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)