Skip to content

[6.x] Fix creating passkeys #13566

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
jasonvarga merged 4 commits into from
Jan 15, 2026
Merged

[6.x] Fix creating passkeys #13566

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddf02d5
`Passkey@setCredential()` should also accept `CredentialRecord` objects
duncanmcclean Jan 15, 2026
36abe48
require 5.3.x branch right now
duncanmcclean Jan 15, 2026
1f07142
Update mocks
duncanmcclean Jan 15, 2026
5a993ea
formatting
duncanmcclean Jan 15, 2026
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
16 changes: 12 additions & 4 deletions src/Auth/WebAuthn/Passkey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,14 @@ public function credential(): PublicKeyCredentialSource
return $this->credential;
}

public function setCredential(array|PublicKeyCredentialSource $credential): Contract
public function setCredential(array|object $credential): Contract
{
$this->credential = $credential instanceof PublicKeyCredentialSource
? $credential
: $this->credentialFromArray($credential);
$this->credential = match (true) {
$credential instanceof PublicKeyCredentialSource => $credential,
is_object($credential) && $credential::class === 'Webauthn\CredentialRecord' => $this->credentialFromCredentialRecord($credential),
is_array($credential) => $this->credentialFromArray($credential),
default => throw new \InvalidArgumentException('Invalid credential type'),
};

return $this;
}
Expand Down Expand Up @@ -102,6 +105,11 @@ private function credentialToArray(PublicKeyCredentialSource $credential): array
return json_decode($json, true);
}

private function credentialFromCredentialRecord($record): PublicKeyCredentialSource
{
return \Webauthn\CredentialRecordConverter::toPublicKeyCredentialSource($record);
}

private function credentialFromArray(array $array): PublicKeyCredentialSource
{
return app(Serializer::class)->deserialize(json_encode($array), PublicKeyCredentialSource::class, 'json');
Expand Down