From 227647d78d7755c9c2f9e806f678b1a0199453bf Mon Sep 17 00:00:00 2001 From: zhouyan Date: Tue, 6 May 2025 17:20:47 +0800 Subject: [PATCH] =?UTF-8?q?napi=E6=8A=9B=E5=BC=82=E5=B8=B8Permissions?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=95=B4=E6=94=B9-5.1.0=E6=8C=91=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyan Change-Id: If06f3b8ccd45db273a9bd115286b7a7812ef4568 --- .../js/napi/accesstoken/src/napi_atmanager.cpp | 14 +++++++------- .../accesstoken/src/napi_request_permission.cpp | 4 ++-- .../privacy/src/permission_record_manager_napi.cpp | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp index 3f98af789..f78e23a34 100644 --- a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp @@ -345,7 +345,7 @@ bool NapiAtManager::ParseInputVerifyPermissionOrGetFlag(const napi_env env, cons // 1: the second parameter of argv if (!ParseString(env, argv[1], asyncContext.permissionName)) { - errMsg = GetParamErrorMsg("permissionName", "string"); + errMsg = GetParamErrorMsg("permissionName", "Permissions"); NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)), false); return false; @@ -382,7 +382,7 @@ bool NapiAtManager::ParseInputVerifyPermissionSync(const napi_env env, const nap // 1: the second parameter of argv if (!ParseString(env, argv[1], syncContext.permissionName)) { - errMsg = GetParamErrorMsg("permissionName", "string"); + errMsg = GetParamErrorMsg("permissionName", "Permissions"); NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)), false); return false; @@ -607,7 +607,7 @@ napi_value NapiAtManager::VerifyAccessTokenSync(napi_env env, napi_callback_info } if ((syncContext->permissionName.empty()) || ((syncContext->permissionName.length() > NapiContextCommon::MAX_LENGTH))) { - std::string errMsg = GetParamErrorMsg("permissionName", "string"); + std::string errMsg = GetParamErrorMsg("permissionName", "Permissions"); NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, JS_ERROR_PARAM_INVALID, errMsg))); return nullptr; } @@ -659,7 +659,7 @@ bool NapiAtManager::ParseInputGrantOrRevokePermission(const napi_env env, const // 1: the second parameter of argv if (!ParseString(env, argv[1], asyncContext.permissionName)) { - errMsg = GetParamErrorMsg("permissionName", "string"); + errMsg = GetParamErrorMsg("permissionName", "Permissions"); NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)), false); return false; @@ -987,7 +987,7 @@ bool NapiAtManager::ParseInputSetToggleStatus(const napi_env env, const napi_cal asyncContext.env = env; // 0: the first parameter of argv if (!ParseString(env, argv[0], asyncContext.permissionName)) { - errMsg = GetParamErrorMsg("permissionName", "string"); + errMsg = GetParamErrorMsg("permissionName", "Permissions"); NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)), false); return false; @@ -1022,7 +1022,7 @@ bool NapiAtManager::ParseInputGetToggleStatus(const napi_env env, const napi_cal asyncContext.env = env; // 0: the first parameter of argv if (!ParseString(env, argv[0], asyncContext.permissionName)) { - errMsg = GetParamErrorMsg("permissionName", "string"); + errMsg = GetParamErrorMsg("permissionName", "Permissions"); NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)), false); return false; @@ -1169,7 +1169,7 @@ bool NapiAtManager::FillPermStateChangeScope(const napi_env env, const napi_valu scopeInfo.tokenIDs = {GetSelfTokenID()}; } if (!ParseStringArray(env, argv[index++], scopeInfo.permList)) { - errMsg = GetParamErrorMsg("permissionNameList", "Array"); + errMsg = GetParamErrorMsg("permissionNameList", "Array"); napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)); return false; } diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp index 38930d947..cd2a6c3f6 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp @@ -640,7 +640,7 @@ bool NapiRequestPermission::ParseRequestPermissionFromUser(const napi_env& env, // argv[1] : permissionList if (!ParseStringArray(env, argv[1], asyncContext->permissionList) || (asyncContext->permissionList.empty())) { - errMsg = GetParamErrorMsg("permissionList", "Array"); + errMsg = GetParamErrorMsg("permissionList", "Array"); NAPI_CALL_BASE( env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)), false); return false; @@ -805,7 +805,7 @@ bool NapiRequestPermission::ParseInputToGetQueryResult(const napi_env& env, cons // the second parameter of argv if (!ParseStringArray(env, argv[1], asyncContext.permissionList)) { - errMsg = GetParamErrorMsg("permissions", "Array"); + errMsg = GetParamErrorMsg("permissions", "Array"); NAPI_CALL_BASE( env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, errMsg)), false); return false; diff --git a/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp b/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp index d5f55eb75..37f3e0a2e 100644 --- a/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp +++ b/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp @@ -192,7 +192,7 @@ static bool ParseAddPermissionRecord( // 1: the second parameter of argv if (!ParseString(env, argv[SECOND_PARAM], asyncContext.permissionName)) { - ParamResolveErrorThrow(env, "permissionName", "string"); + ParamResolveErrorThrow(env, "permissionName", "Permissions"); return false; } @@ -295,7 +295,7 @@ static bool ParseStartAndStopUsingPermission( // 1: the second parameter of argv is permissionName if (!ParseString(env, argv[SECOND_PARAM], asyncContext.permissionName)) { - ParamResolveErrorThrow(env, "permissionName", "string"); + ParamResolveErrorThrow(env, "permissionName", "Permissions"); return false; } @@ -492,7 +492,7 @@ static bool ParseRequest(const napi_env& env, const napi_value& value, Permissio if (IsNeedParseProperty(env, value, "permissionNames", property) && !ParseStringArray(env, property, request.permissionList)) { - ParamResolveErrorThrow(env, "request:permissionNames", "Array"); + ParamResolveErrorThrow(env, "request:permissionNames", "Array"); return false; } @@ -943,7 +943,7 @@ static bool ParseInputToRegister(const napi_env env, const napi_callback_info cb std::vector permList; // 1: the second parameter of argv if (!ParseStringArray(env, argv[1], permList)) { - ParamResolveErrorThrow(env, "permList", "Array"); + ParamResolveErrorThrow(env, "permList", "Array"); return false; } std::sort(permList.begin(), permList.end()); @@ -979,13 +979,13 @@ static bool ParseInputToUnregister(const napi_env env, const napi_callback_info std::string type; // 0: the first parameter of argv if (!ParseString(env, argv[0], type)) { - ParamResolveErrorThrow(env, "permList", "Array"); + ParamResolveErrorThrow(env, "type", "string"); return false; } // 1: the second parameter of argv std::vector permList; if (!ParseStringArray(env, argv[1], permList)) { - ParamResolveErrorThrow(env, "permList", "Array"); + ParamResolveErrorThrow(env, "permList", "Array"); return false; } std::sort(permList.begin(), permList.end()); @@ -1189,7 +1189,7 @@ static bool ParseGetPermissionUsedType(const napi_env env, const napi_callback_i } if (!ParseString(env, argv[1], permissionName)) { - ParamResolveErrorThrow(env, "permissionName", "string"); + ParamResolveErrorThrow(env, "permissionName", "Permissions"); return false; } } -- Gitee