From 23811d99cd05ccdeb5614daa14f732f4c10460cd Mon Sep 17 00:00:00 2001 From: q30043944 Date: Sat, 22 Mar 2025 17:31:29 +0800 Subject: [PATCH] =?UTF-8?q?reqId=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: q30043944 --- .../src/authentication/dm_auth_manager.cpp | 10 +++++----- test/commonunittest/UTTest_dm_auth_manager_first.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/implementation/src/authentication/dm_auth_manager.cpp b/services/implementation/src/authentication/dm_auth_manager.cpp index 3d8c42dbb..036dd48d5 100644 --- a/services/implementation/src/authentication/dm_auth_manager.cpp +++ b/services/implementation/src/authentication/dm_auth_manager.cpp @@ -2459,6 +2459,10 @@ void DmAuthManager::AuthDeviceFinish(int64_t requestId) void DmAuthManager::AuthDeviceError(int64_t requestId, int32_t errorCode) { LOGI("AuthDeviceError start."); + if (requestId != authResponseContext_->requestId) { + LOGE("AuthDeviceError requestId %{public}" PRId64 "is error.", requestId); + return; + } isAuthDevice_ = false; if (authRequestState_ == nullptr || authResponseState_ != nullptr) { if (CheckNeedShowAuthInfoDialog(errorCode)) { @@ -2475,10 +2479,6 @@ void DmAuthManager::AuthDeviceError(int64_t requestId, int32_t errorCode) return; } if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE) { - if (requestId != authResponseContext_->requestId) { - LOGE("DmAuthManager::AuthDeviceError requestId %{public}" PRId64 "is error.", requestId); - return; - } authResponseContext_->state = AuthState::AUTH_REQUEST_JOIN; authRequestContext_->reason = ERR_DM_AUTH_CODE_INCORRECT; authResponseContext_->reply = ERR_DM_AUTH_CODE_INCORRECT; @@ -2511,7 +2511,7 @@ void DmAuthManager::AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessi { LOGI("DmAuthManager::AuthDeviceSessionKey start. keyLen: %{public}u", sessionKeyLen); if (requestId != authResponseContext_->requestId) { - LOGE("DmAuthManager::onTransmit requestId %{public}" PRId64 "is error.", requestId); + LOGE("AuthDeviceSessionKey requestId %{public}" PRId64 "is error.", requestId); return; } CHECK_NULL_VOID(authMessageProcessor_); diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index 06a5ba958..5d26fbc2d 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -992,7 +992,7 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceError004, testing::ext::TestSize.Level1) authManager_->authResponseContext_->authType = AUTH_TYPE_UNKNOW; authManager_->authResponseContext_->requestId = 3; authManager_->authTimes_ = 3; - int64_t requestId = 0; + int64_t requestId = 3; int32_t errorCode = ERR_DM_FAILED; authManager_->AuthDeviceError(requestId, errorCode); ASSERT_EQ(authManager_->authResponseContext_->state, AuthState::AUTH_REQUEST_JOIN); -- Gitee