diff --git a/frameworks/kitsimpl/src/user_auth.cpp b/frameworks/kitsimpl/src/user_auth.cpp index 5ea6907..7b26f0d 100644 --- a/frameworks/kitsimpl/src/user_auth.cpp +++ b/frameworks/kitsimpl/src/user_auth.cpp @@ -121,7 +121,8 @@ void UserAuthNative::GetProperty(const GetPropertyRequest &request, std::shared_ proxy->GetProperty(request, asyncStub); } -void UserAuthNative::GetProperty(const int32_t userId, const GetPropertyRequest &request, std::shared_ptr callback) +void UserAuthNative::GetProperty(const int32_t userId, const GetPropertyRequest &request, + std::shared_ptr callback) { USERAUTH_HILOGD(MODULE_INNERKIT, "GetProperty start"); if (callback == nullptr) { diff --git a/frameworks/kitsimpl/src/userauth_proxy.cpp b/frameworks/kitsimpl/src/userauth_proxy.cpp index 481aa0c..293cecd 100644 --- a/frameworks/kitsimpl/src/userauth_proxy.cpp +++ b/frameworks/kitsimpl/src/userauth_proxy.cpp @@ -90,7 +90,8 @@ void UserAuthProxy::GetProperty(const GetPropertyRequest request, sptr &callback) +void UserAuthProxy::GetProperty(const int32_t userId, const GetPropertyRequest request, + sptr &callback) { USERAUTH_HILOGD(MODULE_INNERKIT, "UserAuthProxy GetProperty start"); MessageParcel data; diff --git a/frameworks/native/userauth/userauth.cpp b/frameworks/native/userauth/userauth.cpp index 2ccb98c..5ca1418 100644 --- a/frameworks/native/userauth/userauth.cpp +++ b/frameworks/native/userauth/userauth.cpp @@ -14,12 +14,10 @@ */ #include "userauth.h" -#include "user_auth.h" -#include #include #include -#include #include +#include "user_auth.h" #include "system_ability_definition.h" #include "userauth_hilog_wrapper.h" @@ -29,7 +27,8 @@ namespace UserAuth { UserAuth::UserAuth() = default; UserAuth::~UserAuth() = default; -void UserAuth::GetProperty(const int32_t userId, const GetPropertyRequest &request, std::shared_ptr callback) +void UserAuth::GetProperty(const int32_t userId, const GetPropertyRequest &request, + std::shared_ptr callback) { USERAUTH_HILOGD(MODULE_INNERAPI, "GetProperty start"); if (callback == nullptr) { @@ -40,7 +39,8 @@ void UserAuth::GetProperty(const int32_t userId, const GetPropertyRequest &reque UserAuthNative::GetInstance().GetProperty(userId, request, callback); } -void UserAuth::SetProperty(const int32_t userId, const SetPropertyRequest &request, std::shared_ptr callback) +void UserAuth::SetProperty(const int32_t userId, const SetPropertyRequest &request, + std::shared_ptr callback) { static_cast(userId); USERAUTH_HILOGD(MODULE_INNERAPI, "SetProperty start"); @@ -61,7 +61,6 @@ uint64_t UserAuth::AuthUser(const int32_t userId, const uint64_t challenge, cons return INVALID_PARAMETERS; } uint64_t ret = UserAuthNative::GetInstance().AuthUser(userId, challenge, authType, authTrustLevel, callback); - USERAUTH_HILOGI(MODULE_INNERAPI, "AuthUser result %{public}llu", ret); return ret; } @@ -69,10 +68,8 @@ int32_t UserAuth::CancelAuth(const uint64_t contextId) { USERAUTH_HILOGD(MODULE_INNERAPI, "CancelAuth start"); uint32_t ret = UserAuthNative::GetInstance().CancelAuth(contextId); - USERAUTH_HILOGI(MODULE_INNERAPI, "CancelAuth result %{public}u", ret); return ret; } - } // namespace UserAuth } // namespace UserIAM } // namespace OHOS diff --git a/interfaces/inner_api/include/common/common_info.h b/interfaces/inner_api/include/common/common_info.h index 057e682..aeccf07 100644 --- a/interfaces/inner_api/include/common/common_info.h +++ b/interfaces/inner_api/include/common/common_info.h @@ -44,8 +44,6 @@ enum ResultCode : int32_t { E_CHECK_PERMISSION_FAILED = 18, ERRORCODE_MAX = 19 }; - - } // namespace UserAuth } // namespace UserIAM } // namespace OHOS diff --git a/interfaces/inner_api/include/userauth/userauth.h b/interfaces/inner_api/include/userauth/userauth.h index 9e8eb20..968af2b 100644 --- a/interfaces/inner_api/include/userauth/userauth.h +++ b/interfaces/inner_api/include/userauth/userauth.h @@ -31,8 +31,10 @@ class UserAuth : public DelayedRefSingleton { public: DISALLOW_COPY_AND_MOVE(UserAuth); - void GetProperty(const int32_t userId, const GetPropertyRequest &request, std::shared_ptr callback); - void SetProperty(const int32_t userId, const SetPropertyRequest &request, std::shared_ptr callback); + void GetProperty(const int32_t userId, const GetPropertyRequest &request, + std::shared_ptr callback); + void SetProperty(const int32_t userId, const SetPropertyRequest &request, + std::shared_ptr callback); uint64_t AuthUser(const int32_t userId, const uint64_t challenge, const AuthType authType, const AuthTrustLevel authTrustLevel, std::shared_ptr callback); int32_t CancelAuth(const uint64_t contextId); diff --git a/interfaces/innerkits/napi/src/user_auth_impl.cpp b/interfaces/innerkits/napi/src/user_auth_impl.cpp index 7c17a99..05a5596 100644 --- a/interfaces/innerkits/napi/src/user_auth_impl.cpp +++ b/interfaces/innerkits/napi/src/user_auth_impl.cpp @@ -584,7 +584,8 @@ napi_value UserAuthImpl::AuthWrap(napi_env env, AuthInfo *authInfo) callback.reset(object); uint64_t result = UserAuthNative::GetInstance().Auth(authInfo->challenge, AuthType(authInfo->authType), AuthTrustLevel(authInfo->authTrustLevel), callback); - USERAUTH_HILOGI(MODULE_JS_NAPI, "UserAuthNative::GetInstance().Auth result = 0xXXXX%{public}04" PRIx64 "", MASK & result); + USERAUTH_HILOGI(MODULE_JS_NAPI, "UserAuthNative::GetInstance().Auth result = 0xXXXX%{public}04" PRIx64 "", + MASK & result); napi_value key = authBuild.Uint64ToUint8Array(env, result); USERAUTH_HILOGI(MODULE_JS_NAPI, "%{public}s end", __func__); return key; diff --git a/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn index 06756f2..70f6edc 100644 --- a/interfaces/innerkits/native/BUILD.gn +++ b/interfaces/innerkits/native/BUILD.gn @@ -20,7 +20,7 @@ config("userauth_private_config") { config("userauth_public_config") { include_dirs = [ - "include" , + "include", "../../inner_api/include/common", "../../inner_api/include/userauth", "../../inner_api/include/useridm", diff --git a/interfaces/innerkits/native/include/iuser_auth.h b/interfaces/innerkits/native/include/iuser_auth.h index 8100c59..17ee075 100644 --- a/interfaces/innerkits/native/include/iuser_auth.h +++ b/interfaces/innerkits/native/include/iuser_auth.h @@ -64,7 +64,8 @@ public: * param request the attribute field list, authentication credential type, and credential information. * param callback the authentication result code is returned through the callback. */ - virtual void GetProperty(const int32_t userId, const GetPropertyRequest request, sptr &callback) = 0; + virtual void GetProperty(const int32_t userId, const GetPropertyRequest request, + sptr &callback) = 0; /* * set properties: can be used to initialize algorithms. diff --git a/interfaces/innerkits/native/include/userauth_proxy.h b/interfaces/innerkits/native/include/userauth_proxy.h index 4bfeca6..dfbe498 100644 --- a/interfaces/innerkits/native/include/userauth_proxy.h +++ b/interfaces/innerkits/native/include/userauth_proxy.h @@ -31,7 +31,8 @@ public: int32_t GetAvailableStatus(const AuthType authType, const AuthTrustLevel authTrustLevel) override; void GetProperty(const GetPropertyRequest request, sptr &callback) override; - void GetProperty(const int32_t userId, const GetPropertyRequest request, sptr &callback) override; + void GetProperty(const int32_t userId, const GetPropertyRequest request, + sptr &callback) override; void SetProperty(const SetPropertyRequest request, sptr &callback) override; uint64_t Auth(const uint64_t challenge, const AuthType authType, const AuthTrustLevel authTrustLevel, sptr &callback) override; diff --git a/services/include/userauth_service.h b/services/include/userauth_service.h index ae90189..42c14b5 100644 --- a/services/include/userauth_service.h +++ b/services/include/userauth_service.h @@ -38,7 +38,8 @@ public: void OnStop() override; int32_t GetAvailableStatus(const AuthType authType, const AuthTrustLevel authTrustLevel) override; void GetProperty(const GetPropertyRequest request, sptr &callback) override; - void GetProperty(const int32_t userId, const GetPropertyRequest request, sptr &callback) override; + void GetProperty(const int32_t userId, const GetPropertyRequest request, + sptr &callback) override; void SetProperty(const SetPropertyRequest request, sptr &callback) override; uint64_t Auth(const uint64_t challenge, const AuthType authType, const AuthTrustLevel authTrustLevel, sptr &callback) override; diff --git a/services/src/userauth_service.cpp b/services/src/userauth_service.cpp index 947d48f..6fffd54 100644 --- a/services/src/userauth_service.cpp +++ b/services/src/userauth_service.cpp @@ -158,7 +158,8 @@ void UserAuthService::GetProperty(const GetPropertyRequest request, sptr &callback) +void UserAuthService::GetProperty(const int32_t userId, const GetPropertyRequest request, + sptr &callback) { USERAUTH_HILOGI(MODULE_SERVICE, "UserAuthService GetProperty start"); std::string callerName;