Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-23 04:07:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Rename userId to credentialId

Browse source
This commit is contained in:
varjolintu 2023-11-08 07:19:13 +02:00 • committed by Jonathan White
parent 1cbbcff259
commit 7371589955
7 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/browser/BrowserService.cpp
View file

@ -614,12 +614,18 @@ QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& public
rpId,
rpName,
username,
publicKeyCredentials.id,
publicKeyCredentials.credentialId,
userHandle,
publicKeyCredentials.key);
} else {
addPasskeyToGroup(
nullptr, origin, rpId, rpName, username, publicKeyCredentials.id, userHandle, publicKeyCredentials.key);
addPasskeyToGroup(nullptr,
origin,
rpId,
rpName,
username,
publicKeyCredentials.credentialId,
userHandle,
publicKeyCredentials.key);
}
hideWindow();
@ -678,7 +684,7 @@ void BrowserService::addPasskeyToGroup(Group* group,
const QString& rpId,
const QString& rpName,
const QString& username,
const QString& userId,
const QString& credentialId,
const QString& userHandle,
const QString& privateKey)
{
@ -699,7 +705,7 @@ void BrowserService::addPasskeyToGroup(Group* group,
entry->setUrl(url);
entry->setIcon(KEEPASSXCBROWSER_PASSKEY_ICON);
addPasskeyToEntry(entry, rpId, rpName, username, userId, userHandle, privateKey);
addPasskeyToEntry(entry, rpId, rpName, username, credentialId, userHandle, privateKey);
// Remove blank entry history
entry->removeHistoryItems(entry->historyItems());
@ -709,7 +715,7 @@ void BrowserService::addPasskeyToEntry(Entry* entry,
const QString& rpId,
const QString& rpName,
const QString& username,
const QString& userId,
const QString& credentialId,
const QString& userHandle,
const QString& privateKey)
{
@ -724,7 +730,7 @@ void BrowserService::addPasskeyToEntry(Entry* entry,
entry->beginUpdate();
entry->attributes()->set(BrowserPasskeys::KPEX_PASSKEY_USERNAME, username);
entry->attributes()->set(BrowserPasskeys::KPEX_PASSKEY_GENERATED_USER_ID, userId, true);
entry->attributes()->set(BrowserPasskeys::KPEX_PASSKEY_GENERATED_USER_ID, credentialId, true);
entry->attributes()->set(BrowserPasskeys::KPEX_PASSKEY_PRIVATE_KEY_PEM, privateKey, true);
entry->attributes()->set(BrowserPasskeys::KPEX_PASSKEY_RELYING_PARTY, rpId);
entry->attributes()->set(BrowserPasskeys::KPEX_PASSKEY_USER_HANDLE, userHandle, true);
@ -1346,9 +1352,9 @@ QJsonObject
BrowserService::getPublicKeyCredentialFromEntry(const Entry* entry, const QJsonObject& publicKey, const QString& origin)
{
const auto privateKeyPem = entry->attributes()->value(BrowserPasskeys::KPEX_PASSKEY_PRIVATE_KEY_PEM);
const auto userId = entry->attributes()->value(BrowserPasskeys::KPEX_PASSKEY_GENERATED_USER_ID);
const auto credentialId = entry->attributes()->value(BrowserPasskeys::KPEX_PASSKEY_GENERATED_USER_ID);
const auto userHandle = entry->attributes()->value(BrowserPasskeys::KPEX_PASSKEY_USER_HANDLE);
return browserPasskeys()->buildGetPublicKeyCredential(publicKey, origin, userId, userHandle, privateKeyPem);
return browserPasskeys()->buildGetPublicKeyCredential(publicKey, origin, credentialId, userHandle, privateKeyPem);
}
// Checks if the same user ID already exists for the current site