diff --git a/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h b/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h index 153881e18a2612fd7e63377897a20d54d92e70e7..ae9cfa00c495f7952f8c5cbd531ff7cc232f886c 100644 --- a/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h +++ b/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiGetAppCertInfo(napi_env env, napi_callback_info info); +napi_value CMNapiGetPublicCert(napi_env env, napi_callback_info info); napi_value CMNapiGetPrivateAppCertInfo(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h b/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h index 83ba2f52d1e8e8cf2497ba384d7ec92a3c2d07cf..6e1cc51d16308afe5b3f6acced8079bb72f25b9f 100644 --- a/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h +++ b/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiGetAppCertList(napi_env env, napi_callback_info info); +napi_value CMNapiGetAllPublicCerts(napi_env env, napi_callback_info info); napi_value CMNapiGetPrivateAppCertList(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h b/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h index 6acbd97eafc26e7fd62c0f5e85d37768d9988b37..79815eb3c332bca81186a2ce97e41ff369734f61 100644 --- a/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h +++ b/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h @@ -22,7 +22,7 @@ namespace CMNapi { napi_value CMNapiGetSystemCertList(napi_env env, napi_callback_info info); -napi_value CMNapiGetUserTrustedCertList(napi_env env, napi_callback_info info); +napi_value CMNapiGetAllUserTrustedCerts(napi_env env, napi_callback_info info); } // namespace CertManagerNapi #endif // CM_NAPI_GET_CERTIFICATE_LIST_H \ No newline at end of file diff --git a/interfaces/kits/napi/include/cm_napi_grant.h b/interfaces/kits/napi/include/cm_napi_grant.h index e69b8d22d4062d31eefe06a1ed7b5fc56727934f..da46518826abf026afe2e182c55e37d0efd726a4 100755 --- a/interfaces/kits/napi/include/cm_napi_grant.h +++ b/interfaces/kits/napi/include/cm_napi_grant.h @@ -20,10 +20,10 @@ #include "napi/native_node_api.h" namespace CMNapi { - napi_value CMNapiGrantAppCertificate(napi_env env, napi_callback_info info); + napi_value CMNapiGrantPublicCertificate(napi_env env, napi_callback_info info); napi_value CMNapiIsAuthorizedApp(napi_env env, napi_callback_info info); napi_value CMNapiGetAuthorizedAppList(napi_env env, napi_callback_info info); - napi_value CMNapiRemoveGrantedApp(napi_env env, napi_callback_info info); + napi_value CMNapiRemoveGrantedPublicCert(napi_env env, napi_callback_info info); } // namespace CMNapi #endif /* CM_NAPI_GRANT_H */ diff --git a/interfaces/kits/napi/include/cm_napi_install_app_cert.h b/interfaces/kits/napi/include/cm_napi_install_app_cert.h index 67aa60e280549253fd15f58c1d54a1c87db9b109..64cda4ee4fe3f9ccf44d6549842c17ed1d82fa70 100644 --- a/interfaces/kits/napi/include/cm_napi_install_app_cert.h +++ b/interfaces/kits/napi/include/cm_napi_install_app_cert.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiInstallAppCert(napi_env env, napi_callback_info info); +napi_value CMNapiInstallPublicCert(napi_env env, napi_callback_info info); napi_value CMNapiInstallPrivateAppCert(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h b/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h index f434a9127ae1ee2ee0a5cc56bcf8a436a5cf4718..cb13fda7b2df520f9ea7aa7ef1809227dc6923e7 100644 --- a/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h +++ b/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiUninstallAppCert(napi_env env, napi_callback_info info); +napi_value CMNapiUninstallPublicCert(napi_env env, napi_callback_info info); napi_value CMNapiUninstallPrivateAppCert(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/src/cm_napi.cpp b/interfaces/kits/napi/src/cm_napi.cpp index bea9393481f651164b272d0009b0f5882036970d..743f1b596b7f5541d24417db5ba39127249ec45e 100644 --- a/interfaces/kits/napi/src/cm_napi.cpp +++ b/interfaces/kits/napi/src/cm_napi.cpp @@ -110,26 +110,26 @@ extern "C" { DECLARE_NAPI_FUNCTION("getSystemTrustedCertificateList", CMNapiGetSystemCertList), DECLARE_NAPI_FUNCTION("getSystemTrustedCertificate", CMNapiGetSystemCertInfo), DECLARE_NAPI_FUNCTION("setCertificateStatus", CMNapiSetCertStatus), - DECLARE_NAPI_FUNCTION("installAppCertificate", CMNapiInstallAppCert), + DECLARE_NAPI_FUNCTION("installPublicCertificate", CMNapiInstallPublicCert), DECLARE_NAPI_FUNCTION("uninstallAllAppCertificate", CMNapiUninstallAllAppCert), - DECLARE_NAPI_FUNCTION("uninstallAppCertificate", CMNapiUninstallAppCert), - DECLARE_NAPI_FUNCTION("getAppCertificateList", CMNapiGetAppCertList), - DECLARE_NAPI_FUNCTION("getAppCertificate", CMNapiGetAppCertInfo), + DECLARE_NAPI_FUNCTION("uninstallPublicCertificate", CMNapiUninstallPublicCert), + DECLARE_NAPI_FUNCTION("getAllPublicCertificates", CMNapiGetAllPublicCerts), + DECLARE_NAPI_FUNCTION("getPublicCertificate", CMNapiGetPublicCert), DECLARE_NAPI_FUNCTION("installUserTrustedCertificate", CMNapiInstallUserTrustedCert), DECLARE_NAPI_FUNCTION("uninstallAllUserTrustedCertificate", CMNapiUninstallAllUserTrustedCert), DECLARE_NAPI_FUNCTION("uninstallUserTrustedCertificate", CMNapiUninstallUserTrustedCert), - DECLARE_NAPI_FUNCTION("getUserTrustedCertificateList", CMNapiGetUserTrustedCertList), + DECLARE_NAPI_FUNCTION("getAllUserTrustedCertificates", CMNapiGetAllUserTrustedCerts), DECLARE_NAPI_FUNCTION("getUserTrustedCertificate", CMNapiGetUserTrustedCertInfo), DECLARE_NAPI_FUNCTION("installPrivateCertificate", CMNapiInstallPrivateAppCert), DECLARE_NAPI_FUNCTION("uninstallPrivateCertificate", CMNapiUninstallPrivateAppCert), DECLARE_NAPI_FUNCTION("getPrivateCertificateList", CMNapiGetPrivateAppCertList), DECLARE_NAPI_FUNCTION("getAllAppPrivateCertificates", CMNapiGetPrivateAppCertList), DECLARE_NAPI_FUNCTION("getPrivateCertificate", CMNapiGetPrivateAppCertInfo), - DECLARE_NAPI_FUNCTION("grantAppCertificate", CMNapiGrantAppCertificate), + DECLARE_NAPI_FUNCTION("grantPublicCertificate", CMNapiGrantPublicCertificate), DECLARE_NAPI_FUNCTION("isAuthorizedApp", CMNapiIsAuthorizedApp), DECLARE_NAPI_FUNCTION("getAuthorizedAppList", CMNapiGetAuthorizedAppList), - DECLARE_NAPI_FUNCTION("removeGrantedAppCertificate", CMNapiRemoveGrantedApp), + DECLARE_NAPI_FUNCTION("removeGrantedPublicCertificate", CMNapiRemoveGrantedPublicCert), DECLARE_NAPI_FUNCTION("init", CMNapiInit), DECLARE_NAPI_FUNCTION("update", CMNapiUpdate), DECLARE_NAPI_FUNCTION("finish", CMNapiFinish), diff --git a/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp b/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp index fdbc134a969b6914886813f665bb9d5445faf3ae..9001926ce8c49b26af2173f9ae6ee05de724f581 100644 --- a/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiGetAppCertInfo(napi_env env, napi_callback_info info) +napi_value CMNapiGetPublicCert(napi_env env, napi_callback_info info) { return CMNapiGetAppCertInfoCommon(env, info, APPLICATION_CERTIFICATE_STORE); } diff --git a/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp b/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp index fbc46101d719b4a6daa0d331e7ad2bd57b9da822..7e306072c5016cd06279ce6b7bd99224e443b700 100644 --- a/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiGetAppCertList(napi_env env, napi_callback_info info) +napi_value CMNapiGetAllPublicCerts(napi_env env, napi_callback_info info) { return CMNapiGetAppCertListCommon(env, info, APPLICATION_CERTIFICATE_STORE); } diff --git a/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp b/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp index 35a607667e03d6cbe9a93b0dd24cedf26f13b310..cd3712227af2a52d7b0d44583a64f9ccd81cb712 100644 --- a/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp @@ -208,7 +208,7 @@ napi_value CMNapiGetSystemCertList(napi_env env, napi_callback_info info) return result; } -napi_value CMNapiGetUserTrustedCertList(napi_env env, napi_callback_info info) +napi_value CMNapiGetAllUserTrustedCerts(napi_env env, napi_callback_info info) { GetCertListAsyncContext context = CreateGetCertListAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/cm_napi_grant.cpp b/interfaces/kits/napi/src/cm_napi_grant.cpp index 65cad06df6c20d6b611b342f5f029c4aa4689471..6dde84050ab69152c5d8b793acdd31bea5f1090e 100644 --- a/interfaces/kits/napi/src/cm_napi_grant.cpp +++ b/interfaces/kits/napi/src/cm_napi_grant.cpp @@ -428,7 +428,7 @@ static napi_value GetUidListAsyncWork(napi_env env, GrantAsyncContext context) return promise; } -napi_value CMNapiGrantAppCertificate(napi_env env, napi_callback_info info) +napi_value CMNapiGrantPublicCertificate(napi_env env, napi_callback_info info) { GrantAsyncContext context = InitGrantAsyncContext(); if (context == nullptr) { @@ -503,7 +503,7 @@ napi_value CMNapiGetAuthorizedAppList(napi_env env, napi_callback_info info) return result; } -napi_value CMNapiRemoveGrantedApp(napi_env env, napi_callback_info info) +napi_value CMNapiRemoveGrantedPublicCert(napi_env env, napi_callback_info info) { GrantAsyncContext context = InitGrantAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp b/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp index ee0a2e0439ce074ae61c3e6549ab7d599fd4fc5e..01bc43c92470619ff2317608b495e713b87c5c8d 100644 --- a/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp +++ b/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiInstallAppCert(napi_env env, napi_callback_info info) +napi_value CMNapiInstallPublicCert(napi_env env, napi_callback_info info) { return CMNapiInstallAppCertCommon(env, info, APPLICATION_CERTIFICATE_STORE); } diff --git a/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp b/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp index e855e4a015bd2ba551fe6efd5dee515ca16db92b..6fdecb52e537a5194dda958e15a13056c3d79a1c 100644 --- a/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp +++ b/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiUninstallAppCert(napi_env env, napi_callback_info info) +napi_value CMNapiUninstallPublicCert(napi_env env, napi_callback_info info) { return CMNapiUninstallAppCertCommon(env, info, APPLICATION_CERTIFICATE_STORE); }