openharmony/account_os_account
1
0
Fork 0
mirror of https://gitee.com/openharmony/account_os_account synced 2024-11-26 19:50:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

【账号iam】删除凭据流程接口适配

Browse Source 
Signed-off-by: cclicn <lichenchen22@huawei.com>
This commit is contained in:
cclicn 2024-11-11 22:26:08 +08:00
parent 7d8f46cc9c
commit cfa6f17921
3 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/accountmgr/include/account_iam/account_iam_callback.h
View File

@ -131,9 +131,24 @@ public:
std::shared_ptr<IInputerData> inputerData) override;
};
class CommitDelCredCallback : public UserIdmClientCallback {
public:
CommitDelCredCallback() {}
virtual ~CommitDelCredCallback() {}
void OnResult(int32_t result, const UserIam::UserAuth::Attributes &extraInfo) override;
void OnAcquireInfo(int32_t module, uint32_t acquireInfo, const UserIam::UserAuth::Attributes &extraInfo) override;
public:
bool isCalled_ = false;
int32_t resultCode_ = -1;
std::mutex mutex_;
std::condition_variable onResultCondition_;
};
class DelUserCallback : public UserIdmClientCallback {
public:
DelUserCallback(uint32_t userId, const sptr<IIDMCallback> &callback);
DelUserCallback(uint32_t userId, const std::vector<uint8_t> &token, const sptr<IIDMCallback> &callback);
virtual ~DelUserCallback();
void OnResult(int32_t result, const Attributes &extraInfo) override;
@ -149,6 +164,7 @@ public:
private:
std::uint32_t userId_;
std::vector<uint8_t> token_;
const sptr<IIDMCallback> innerCallback_ = nullptr;
};
#endif // HAS_PIN_AUTH_PART

40
services/accountmgr/src/account_iam/account_iam_callback.cpp
View File

@ -456,8 +456,23 @@ void DelUserInputer::OnGetData(int32_t authSubType, std::vector<uint8_t> challen
inputerData->OnSetData(PinSubType::PIN_SIX, TEMP_PIN);
}
DelUserCallback::DelUserCallback(uint32_t userId, const sptr<IIDMCallback> &callback)
: userId_(userId), innerCallback_(callback)
void CommitDelCredCallback::OnResult(int32_t result, const UserIam::UserAuth::Attributes &extraInfo)
{
std::unique_lock<std::mutex> lock(mutex_);
ACCOUNT_LOGI("IAM OnResult callback! result %{public}d", result);
isCalled_ = true;
resultCode_ = result;
onResultCondition_.notify_one();
}
void CommitDelCredCallback::OnAcquireInfo(int32_t module, uint32_t acquireInfo,
const UserIam::UserAuth::Attributes &extraInfo)
{
ACCOUNT_LOGI("IAM OnAcquireInfo callback! module %{public}d, acquire %{public}u.", module, acquireInfo);
}
DelUserCallback::DelUserCallback(uint32_t userId, const std::vector<uint8_t> &token, const sptr<IIDMCallback> &callback)
: userId_(userId), token_(token), innerCallback_(callback)
{}
DelUserCallback::~DelUserCallback()
@ -508,21 +523,16 @@ void DelUserCallback::InnerOnResult(int32_t result, const Attributes &extraInfo)
return innerCallback_->OnResult(errCode, extraInfo);
}
auto eraseUserCallback = std::make_shared<OsAccountDeleteUserIdmCallback>();
errCode = UserIam::UserAuth::UserIdmClient::GetInstance().EraseUser(userId_, eraseUserCallback);
if (errCode != ERR_OK) {
ACCOUNT_LOGE("Failed to erase user, userId=%{public}d, errcode=%{public}d", userId_, errCode);
ReportOsAccountOperationFail(userId_, "deleteCredential", errCode, "Failed to erase user");
return innerCallback_->OnResult(errCode, extraInfo);
}
std::unique_lock<std::mutex> lock(eraseUserCallback->mutex_);
eraseUserCallback->onResultCondition_.wait(lock, [eraseUserCallback] { return eraseUserCallback->isCalled_; });
if (eraseUserCallback->resultCode_ != ERR_OK) {
auto deleteUserCallback = std::make_shared<CommitDelCredCallback>();
UserIDMClient::GetInstance().DeleteUser(userId_, token_, deleteUserCallback);
std::unique_lock<std::mutex> lock(deleteUserCallback->mutex_);
deleteUserCallback->onResultCondition_.wait(lock, [deleteUserCallback] { return deleteUserCallback->isCalled_; });
if (deleteUserCallback->resultCode_ != ERR_OK) {
ACCOUNT_LOGE("Failed to erase user in callback, userId=%{public}d, errcode=%{public}d",
userId_, eraseUserCallback->resultCode_);
ReportOsAccountOperationFail(userId_, "deleteCredential", eraseUserCallback->resultCode_,
userId_, deleteUserCallback->resultCode_);
ReportOsAccountOperationFail(userId_, "deleteCredential", deleteUserCallback->resultCode_,
"Failed to erase user");
return innerCallback_->OnResult(eraseUserCallback->resultCode_, extraInfo);
return innerCallback_->OnResult(deleteUserCallback->resultCode_, extraInfo);
}
(void)IInnerOsAccountManager::GetInstance().SetOsAccountCredentialId(userId_, 0);
errCode = innerIamMgr.UpdateStorageKeyContext(userId_);

2
services/accountmgr/src/account_iam/inner_account_iam_manager.cpp
View File

@ -241,7 +241,7 @@ void InnerAccountIAMManager::DelUser(
credInfo.authType = AuthType::PIN;
credInfo.pinType = PinSubType::PIN_SIX;
credInfo.token = authToken;
auto delUserCallback = std::make_shared<DelUserCallback>(userId, callback);
auto delUserCallback = std::make_shared<DelUserCallback>(userId, authToken, callback);
UserIDMClient::GetInstance().UpdateCredential(userId, credInfo, delUserCallback);
std::unique_lock<std::mutex> lock(delUserCallback->mutex_);
delUserCallback->onResultCondition_.wait(lock, [delUserCallback] {