Merge pull request #20940 from nextcloud/backport/20858/stable19

rullzer · web-flow · commit c19d6392317b · 2020-05-12T19:51:52.000+02:00
[stable19] Remember the webauthn name of devices
diff --git a/lib/private/Authentication/WebAuthn/CredentialRepository.php b/lib/private/Authentication/WebAuthn/CredentialRepository.php
@@ -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());
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -71,15 +71,17 @@ public function saveAndReturnCredentialSource(PublicKeyCredentialSource $publicK`
`71`	`71`	`} catch (IMapperException $e) {`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ $defaultName = false;`
`74`	`75`	`if ($name === null) {`
	`76`	`+ $defaultName = true;`
`75`	`77`	`$name = 'default';`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`$entity = PublicKeyCredentialEntity::fromPublicKeyCrendentialSource($name, $publicKeyCredentialSource);`
`79`	`81`
`80`	`82`	`if ($oldEntity) {`
`81`	`83`	`$entity->setId($oldEntity->getId());`
`82`		`- if ($name === null) {`
	`84`	`+ if ($defaultName) {`
`83`	`85`	`$entity->setName($oldEntity->getName());`
`84`	`86`	`}`
`85`	`87`	`}`