openharmony/useriam_user_idm
1
0
Fork 0
mirror of https://github.com/openharmony/useriam_user_idm.git synced 2026-07-01 21:04:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

!76 fix issue

Browse Source 
Merge pull request !76 from 王国强/master
This commit is contained in:
openharmony_ci
2022-03-25 03:33:12 +00:00
committed by Gitee
parent 2c568cfff3 3d5be96c06
commit 024a73ffd6
7 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OAT.xml
+1 -1
View File
@@ -4,7 +4,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
interfaces/innerkits/include/useridm_client.h
+1
View File
@@ -26,6 +26,7 @@ namespace UserIAM {
namespace UserIDM {
class UserIDMClient : public DelayedRefSingleton<UserIDM::UserIDMClient> {
DECLARE_DELAYED_REF_SINGLETON(UserIDMClient);
public:
DISALLOW_COPY_AND_MOVE(UserIDMClient);
interfaces/kits/napi/include/useridentity_manager.h
+1
View File
@@ -103,6 +103,7 @@ public:
napi_value NAPI_DelUser(napi_env env, napi_callback_info info);
napi_value NAPI_DelCred(napi_env env, napi_callback_info info);
napi_value NAPI_GetAuthInfo(napi_env env, napi_callback_info info);
private:
napi_value OpenSessionWrap(napi_env env, napi_callback_info info, AsyncOpenSession *asyncInfo);
napi_value OpenSessionCallback(napi_env env, napi_value *args, size_t argcAsync, AsyncOpenSession *asyncInfo);
interfaces/kits/napi/src/auth_common.cpp
+4 -4
View File
@@ -110,9 +110,9 @@ std::vector<uint8_t> AuthCommon::GetNamedAttribute(napi_env env, napi_value obj)
bool isTypedArray = false;
napi_is_typedarray(env, token, &isTypedArray);
if (isTypedArray) {
USERIDM_HILOGI(MODULE_JS_NAPI, "token is a array");
USERIDM_HILOGI(MODULE_JS_NAPI, "token is an array");
} else {
USERIDM_HILOGE(MODULE_JS_NAPI, "token is not a array");
USERIDM_HILOGE(MODULE_JS_NAPI, "token is not an array");
return retNull;
}
napi_get_typedarray_info(env, token, &arraytype, &length, reinterpret_cast<void **>(&data), &buffer, &offset);
@@ -241,9 +241,9 @@ std::vector<uint8_t> AuthCommon::JudgeArryType(napi_env env, size_t argc, napi_v
bool isTypedArray = false;
napi_is_typedarray(env, argv[argc], &isTypedArray);
if (isTypedArray) {
USERIDM_HILOGI(MODULE_JS_NAPI, "this is a array");
USERIDM_HILOGI(MODULE_JS_NAPI, "this is an array");
} else {
USERIDM_HILOGE(MODULE_JS_NAPI, "this is not a array");
USERIDM_HILOGE(MODULE_JS_NAPI, "this is not an array");
return retNull;
}
napi_get_typedarray_info(env, argv[argc], &arraytype, &length, reinterpret_cast<void **>(&data), &buffer, &offset);
interfaces/kits/napi/src/authface_userIDM_helper.cpp
+8 -8
View File
@@ -55,7 +55,7 @@ napi_value OpenSession(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper OpenSession error");
return nullptr;
@@ -72,7 +72,7 @@ napi_value AddCredential(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper AddCredential error");
return nullptr;
@@ -89,7 +89,7 @@ napi_value UpdateCredential(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper UpdateCredential error");
return nullptr;
@@ -106,7 +106,7 @@ napi_value CloseSession(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper CloseSession error");
return nullptr;
@@ -123,7 +123,7 @@ napi_value Cancel(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper Cancel error");
return nullptr;
@@ -140,7 +140,7 @@ napi_value DelUser(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper DelUser error");
return nullptr;
@@ -157,7 +157,7 @@ napi_value DelCred(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper DelCred error");
return nullptr;
@@ -174,7 +174,7 @@ napi_value GetAuthInfo(napi_env env, napi_callback_info info)
napi_value argv[ARGS_MAX_COUNT] = {nullptr};
NAPI_CALL(env, napi_get_cb_info(env, info, &argcAsync, argv, &thisVar, nullptr));
UserIdentityManager *userIdentityManager = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, (void **)&userIdentityManager));
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&userIdentityManager)));
if (userIdentityManager == nullptr) {
USERIDM_HILOGE(MODULE_JS_NAPI, "userIDM_helper GetAuthInfo error");
return nullptr;
interfaces/kits/napi/src/useridentity_manager.cpp
+9 -9
View File
@@ -145,7 +145,7 @@ napi_value UserIdentityManager::OpenSessionCallback(napi_env env, napi_value *ar
asyncInfo = nullptr;
}
},
(void *)asyncInfo, &asyncInfo->asyncWork));
reinterpret_cast<void *>(asyncInfo), &asyncInfo->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncInfo->asyncWork));
return result;
}
@@ -181,7 +181,7 @@ napi_value UserIdentityManager::OpenSessionPromise(napi_env env, napi_value *arg
asyncInfo = nullptr;
}
},
(void *)asyncInfo, &asyncInfo->asyncWork));
reinterpret_cast<void *>(asyncInfo), &asyncInfo->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncInfo->asyncWork));
return asyncInfo->promise;
}
@@ -235,7 +235,7 @@ napi_value UserIdentityManager::BuildAddCredentialInfo(napi_env env, napi_callba
napi_value resourceName = nullptr;
NAPI_CALL(env, napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName));
NAPI_CALL(env, napi_create_async_work(env, nullptr, resourceName, AddCredentialExecute, AddCredentialComplete,
(void *)asyncHolder, &asyncHolder->asyncWork));
reinterpret_cast<void *>(asyncHolder), &asyncHolder->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncHolder->asyncWork));
return result;
}
@@ -320,7 +320,7 @@ napi_value UserIdentityManager::BuildUpdateCredentialInfo(
NAPI_CALL(env, napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName));
NAPI_CALL(env, napi_create_async_work(
env, nullptr, resourceName, UpdateCredentialExecute, UpdateCredentialComplete,
(void *)asyncHolder, &asyncHolder->asyncWork));
reinterpret_cast<void *>(asyncHolder), &asyncHolder->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncHolder->asyncWork));
return result;
}
@@ -438,7 +438,7 @@ napi_value UserIdentityManager::DoDelUser(napi_env env, napi_callback_info info,
napi_value resourceName = nullptr;
NAPI_CALL(env, napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName));
NAPI_CALL(env, napi_create_async_work(env, nullptr, resourceName, DelUserExecute, DelUserComplete,
(void *)asyncHolder, &asyncHolder->asyncWork));
reinterpret_cast<void *>(asyncHolder), &asyncHolder->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncHolder->asyncWork));
return result;
}
@@ -514,7 +514,7 @@ napi_value UserIdentityManager::DoDelCred(napi_env env, napi_callback_info info,
napi_value resourceName = nullptr;
NAPI_CALL(env, napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName));
NAPI_CALL(env, napi_create_async_work(env, nullptr, resourceName, DelCredExecute, DelCredComplete,
(void *)asyncHolder, &asyncHolder->asyncWork));
reinterpret_cast<void *>(asyncHolder), &asyncHolder->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncHolder->asyncWork));
return result;
}
@@ -661,7 +661,7 @@ napi_value UserIdentityManager::GetAuthInfoCallback(napi_env env, napi_value *ar
NAPI_CALL(env, napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName));
NAPI_CALL(env, napi_create_async_work(
env, nullptr, resourceName, GetAuthInfoExecute, GetAuthInfoComplete,
(void *)asyncHolder, &asyncHolder->asyncWork));
reinterpret_cast<void *>(asyncHolder), &asyncHolder->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncHolder->asyncWork));
return result;
}
@@ -690,7 +690,7 @@ napi_value UserIdentityManager::GetAuthInfoPromise(napi_env env, napi_value *arg
NAPI_CALL(env, napi_create_async_work(
env, nullptr, resourceName,
GetAuthInfoExecute, GetAuthInfoComplete,
(void *)asyncHolder, &asyncHolder->asyncWork));
reinterpret_cast<void *>(asyncHolder), &asyncHolder->asyncWork));
NAPI_CALL(env, napi_queue_async_work(env, asyncHolder->asyncWork));
return asyncGetAuthInfo->promise;
}
@@ -710,7 +710,7 @@ extern "C" __attribute__((constructor)) void RegisterModule(void)
.nm_filename = nullptr,
.nm_register_func = Init,
.nm_modname = "UserIDM",
.nm_priv = ((void *)0),
.nm_priv = (reinterpret_cast<void *>(0)),
.reserved = {0}
};
napi_module_register(&module);
services/include/useridm_controller.h
+2 -2
View File
@@ -53,7 +53,7 @@ public:
private:
class CoAuthCallbackDeathRecipient : public IRemoteObject::DeathRecipient {
public:
CoAuthCallbackDeathRecipient(std::shared_ptr<UserIDMCoAuthHandler> callback);
explicit CoAuthCallbackDeathRecipient(std::shared_ptr<UserIDMCoAuthHandler> callback);
~CoAuthCallbackDeathRecipient() = default;
void OnRemoteDied(const wptr<IRemoteObject>& remote) override;
private:
@@ -63,7 +63,7 @@ private:
class SetPropCallbackDeathRecipient : public IRemoteObject::DeathRecipient {
public:
SetPropCallbackDeathRecipient(std::shared_ptr<UserIDMSetPropHandler> callback);
explicit SetPropCallbackDeathRecipient(std::shared_ptr<UserIDMSetPropHandler> callback);
~SetPropCallbackDeathRecipient() = default;
void OnRemoteDied(const wptr<IRemoteObject>& remote) override;
private: