Skip to content

[stable19] Remember the webauthn name of devices #20940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
May 12, 2020
Merged

[stable19] Remember the webauthn name of devices #20940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remember the webauthn name of devices 
Fixes #20289
we should not reset to default once we have logged in with the device.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer @backportbot
rullzer authored and backportbot[bot] committed May 12, 2020
commit 8e9433aee915dfa5f73644b8657f2a8c368fafe7
4 changes: 3 additions & 1 deletion lib/private/Authentication/WebAuthn/CredentialRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,17 @@ public function saveAndReturnCredentialSource(PublicKeyCredentialSource $publicK
} catch (IMapperException $e) {
}

$defaultName = false;
if ($name === null) {
$defaultName = true;
$name = 'default';
}

$entity = PublicKeyCredentialEntity::fromPublicKeyCrendentialSource($name, $publicKeyCredentialSource);

if ($oldEntity) {
$entity->setId($oldEntity->getId());
if ($name === null) {
if ($defaultName) {
$entity->setName($oldEntity->getName());
}
}
Expand Down