openharmony/useriam_auth_executor_mgr
1
0
Fork 0
mirror of https://github.com/openharmony/useriam_auth_executor_mgr.git synced 2026-07-19 22:53:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: code review liuwenkai@huawei.com

Browse Source 
Signed-off-by: lwk <1076278852@qq.com>
This commit is contained in:
lwk
2022-03-24 19:18:42 +08:00
parent 400c168054
commit 883f0d426c
13 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/kitsimpl/include/coauth_callback_proxy.h
+2 -2
View File
@@ -29,8 +29,8 @@ public:
: IRemoteProxy<ICoAuthCallback>(impl) {}
~CoAuthCallbackProxy() override = default;
virtual void OnFinish(uint32_t resultCode, std::vector<uint8_t> &scheduleToken) override;
virtual void OnAcquireInfo(uint32_t acquire) override;
void OnFinish(uint32_t resultCode, std::vector<uint8_t> &scheduleToken) override;
void OnAcquireInfo(uint32_t acquire) override;
private:
bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply);
frameworks/kitsimpl/include/coauth_callback_stub.h
+2 -2
View File
@@ -28,8 +28,8 @@ public:
explicit CoAuthCallbackStub(const std::shared_ptr<CoAuthCallback>& impl);
~CoAuthCallbackStub() override = default;
virtual void OnFinish(uint32_t resultCode, std::vector<uint8_t> &scheduleToken) override;
virtual void OnAcquireInfo(uint32_t acquire) override;
void OnFinish(uint32_t resultCode, std::vector<uint8_t> &scheduleToken) override;
void OnAcquireInfo(uint32_t acquire) override;
int32_t OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override;
frameworks/kitsimpl/include/coauth_proxy.h
+10 -10
View File
@@ -30,16 +30,16 @@ public:
: IRemoteProxy<ICoAuth>(impl) {}
~CoAuthProxy() override = default;
virtual uint64_t Register(std::shared_ptr<AuthResPool::AuthExecutor> executorInfo,
const sptr<AuthResPool::IExecutorCallback> &callback) override;
virtual void QueryStatus(AuthResPool::AuthExecutor &executorInfo,
const sptr<AuthResPool::IQueryCallback> &callback) override;
virtual void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr<ICoAuthCallback> &callback) override;
virtual int32_t Cancel(uint64_t scheduleId) override;
virtual int32_t GetExecutorProp(AuthResPool::AuthAttributes &conditions,
std::shared_ptr<AuthResPool::AuthAttributes> values) override;
virtual void SetExecutorProp(AuthResPool::AuthAttributes &conditions,
const sptr<ISetPropCallback> &callback) override;
uint64_t Register(std::shared_ptr<AuthResPool::AuthExecutor> executorInfo,
const sptr<AuthResPool::IExecutorCallback> &callback) override;
void QueryStatus(AuthResPool::AuthExecutor &executorInfo,
const sptr<AuthResPool::IQueryCallback> &callback) override;
void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr<ICoAuthCallback> &callback) override;
int32_t Cancel(uint64_t scheduleId) override;
int32_t GetExecutorProp(AuthResPool::AuthAttributes &conditions,
std::shared_ptr<AuthResPool::AuthAttributes> values) override;
void SetExecutorProp(AuthResPool::AuthAttributes &conditions,
const sptr<ISetPropCallback> &callback) override;
private:
bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, bool isSync = true);
frameworks/kitsimpl/include/executor_callback_proxy.h
+7 -7
View File
@@ -29,13 +29,13 @@ public:
: IRemoteProxy<IExecutorCallback>(impl) {}
~ExecutorCallbackProxy() override = default;
virtual void OnMessengerReady(const sptr<IExecutorMessenger> &messenger) override;
virtual int32_t OnBeginExecute(uint64_t scheduleId, std::vector<uint8_t> &publicKey,
std::shared_ptr<AuthAttributes> commandAttrs) override;
virtual int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr<AuthAttributes> consumerAttr) override;
virtual int32_t OnSetProperty(std::shared_ptr<AuthAttributes> properties) override;
virtual int32_t OnGetProperty(std::shared_ptr<AuthAttributes> conditions,
std::shared_ptr<AuthAttributes> values) override;
void OnMessengerReady(const sptr<IExecutorMessenger> &messenger) override;
int32_t OnBeginExecute(uint64_t scheduleId, std::vector<uint8_t> &publicKey,
std::shared_ptr<AuthAttributes> commandAttrs) override;
int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr<AuthAttributes> consumerAttr) override;
int32_t OnSetProperty(std::shared_ptr<AuthAttributes> properties) override;
int32_t OnGetProperty(std::shared_ptr<AuthAttributes> conditions,
std::shared_ptr<AuthAttributes> values) override;
private:
bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply);
static inline BrokerDelegator<ExecutorCallbackProxy> delegator_;
frameworks/kitsimpl/include/executor_callback_stub.h
+7 -7
View File
@@ -27,13 +27,13 @@ class ExecutorCallbackStub : public IRemoteStub<IExecutorCallback> {
public:
ExecutorCallbackStub(const std::shared_ptr<ExecutorCallback>& impl);
~ExecutorCallbackStub() override = default;
virtual void OnMessengerReady(const sptr<IExecutorMessenger> &messenger) override;
virtual int32_t OnBeginExecute(uint64_t scheduleId, std::vector<uint8_t> &publicKey,
std::shared_ptr<AuthAttributes> commandAttrs) override;
virtual int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr<AuthAttributes> consumerAttr) override;
virtual int32_t OnSetProperty(std::shared_ptr<AuthAttributes> properties) override;
virtual int32_t OnGetProperty(std::shared_ptr<AuthAttributes> conditions,
std::shared_ptr<AuthAttributes> values) override;
void OnMessengerReady(const sptr<IExecutorMessenger> &messenger) override;
int32_t OnBeginExecute(uint64_t scheduleId, std::vector<uint8_t> &publicKey,
std::shared_ptr<AuthAttributes> commandAttrs) override;
int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr<AuthAttributes> consumerAttr) override;
int32_t OnSetProperty(std::shared_ptr<AuthAttributes> properties) override;
int32_t OnGetProperty(std::shared_ptr<AuthAttributes> conditions,
std::shared_ptr<AuthAttributes> values) override;
int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override;
private:
int32_t OnMessengerReadyStub(MessageParcel& data, MessageParcel& reply);
frameworks/kitsimpl/include/executor_messenger_proxy.h
+4 -4
View File
@@ -29,10 +29,10 @@ public:
: IRemoteProxy<IExecutorMessenger>(impl) {}
~ExecutorMessengerProxy() override = default;
virtual int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType,
int32_t dstType, std::shared_ptr<AuthMessage> msg) override;
virtual int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode,
std::shared_ptr<AuthAttributes> finalResult) override;
int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType,
int32_t dstType, std::shared_ptr<AuthMessage> msg) override;
int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode,
std::shared_ptr<AuthAttributes> finalResult) override;
private:
bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply);
frameworks/kitsimpl/include/query_callback_proxy.h
+1 -1
View File
@@ -28,7 +28,7 @@ public:
: IRemoteProxy<IQueryCallback>(impl) {}
~QueryCallbackProxy() override = default;
virtual void OnResult(uint32_t resultCode) override;
void OnResult(uint32_t resultCode) override;
private:
bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply);
frameworks/kitsimpl/include/query_callback_stub.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
explicit QueryCallbackStub(const std::shared_ptr<QueryCallback>& impl);
~QueryCallbackStub() override = default;
virtual void OnResult(uint32_t resultCode) override;
void OnResult(uint32_t resultCode) override;
int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override;
frameworks/kitsimpl/include/set_prop_callback_proxy.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
explicit SetPropCallbackProxy(const sptr<IRemoteObject>& impl)
: IRemoteProxy<ISetPropCallback>(impl) {}
~SetPropCallbackProxy() override = default;
virtual void OnResult(uint32_t result, std::vector<uint8_t> &extraInfo) override;
void OnResult(uint32_t result, std::vector<uint8_t> &extraInfo) override;
private:
bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply);
frameworks/kitsimpl/include/set_prop_callback_stub.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
explicit SetPropCallbackStub(const std::shared_ptr<SetPropCallback>& impl);
~SetPropCallbackStub() override = default;
virtual void OnResult(uint32_t result, std::vector<uint8_t> &extraInfo) override;
void OnResult(uint32_t result, std::vector<uint8_t> &extraInfo) override;
int32_t OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override;
interfaces/innerkits/include/executor_messenger.h
+4 -4
View File
@@ -27,10 +27,10 @@ class ExecutorMessenger : public ExecutorMessengerStub {
public:
ExecutorMessenger(UserIAM::CoAuth::AuthResPool*);
~ExecutorMessenger() override = default;
virtual int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType,
int32_t dstType, std::shared_ptr<AuthMessage> msg) override;
virtual int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode,
std::shared_ptr<AuthAttributes> finalResult) override;
int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType,
int32_t dstType, std::shared_ptr<AuthMessage> msg) override;
int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode,
std::shared_ptr<AuthAttributes> finalResult) override;
private:
void DeleteScheduleInfoById(uint64_t scheduleId);
int32_t DoSignToken(uint64_t scheduleId, std::vector<uint8_t>& scheduleToken,
services/include/coauth_service.h
+8 -8
View File
@@ -39,16 +39,16 @@ class CoAuthService : public SystemAbility, public CoAuthStub {
public:
DECLEAR_SYSTEM_ABILITY(CoAuthService);
explicit CoAuthService(int32_t systemAbilityId, bool runOnCreate = false);
virtual ~CoAuthService() override;
~CoAuthService() override;
void OnStart() override;
void OnStop() override;
virtual uint64_t Register(std::shared_ptr<ResAuthExecutor> executorInfo,
const sptr<ResIExecutorCallback> &callback) override;
virtual void QueryStatus(ResAuthExecutor &executorInfo, const sptr<ResIQueryCallback> &callback) override;
virtual void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr<ICoAuthCallback> &callback) override;
virtual int32_t Cancel(uint64_t scheduleId) override;
virtual int32_t GetExecutorProp(ResAuthAttributes &conditions, std::shared_ptr<ResAuthAttributes> values) override;
virtual void SetExecutorProp(ResAuthAttributes &conditions, const sptr<ISetPropCallback> &callback) override;
uint64_t Register(std::shared_ptr<ResAuthExecutor> executorInfo,
const sptr<ResIExecutorCallback> &callback) override;
void QueryStatus(ResAuthExecutor &executorInfo, const sptr<ResIQueryCallback> &callback) override;
void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr<ICoAuthCallback> &callback) override;
int32_t Cancel(uint64_t scheduleId) override;
int32_t GetExecutorProp(ResAuthAttributes &conditions, std::shared_ptr<ResAuthAttributes> values) override;
void SetExecutorProp(ResAuthAttributes &conditions, const sptr<ISetPropCallback> &callback) override;
private:
CoAuthRunningState state_ = CoAuthRunningState::STATE_STOPPED;
services/src/auth_res_manager.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ void AuthResManager::QueryStatus(ResAuthExecutor &executorInfo, sptr<ResIQueryCa
} else {
COAUTH_HILOGE(MODULE_SERVICE, "get AuthType failed");
}
if (isExist == false) {
if (!isExist) {
COAUTH_HILOGE(MODULE_SERVICE, "query status executor register is not exist");
} else {
COAUTH_HILOGI(MODULE_SERVICE, "query status executor register is exist");