sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WebAuthnでログインできないのを修正 (#6327)

Browse Source 
Resolve #6319
This commit is contained in:
Satsuki Yanagi
2020-05-09 08:20:22 +09:00
committed by GitHub
parent d1be8b43f6
commit 234294d564
4 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/client/components/signin.vue
View File

@ -51,7 +51,7 @@ import MkButton from './ui/button.vue';
import MkInput from './ui/input.vue';
import i18n from '../i18n';
import { apiUrl, host } from '../config';
import { hexifyAB } from '../scripts/2fa';
import { byteify, hexify } from '../scripts/2fa';
export default Vue.extend({
i18n,
@ -121,14 +121,9 @@ export default Vue.extend({
this.queryingKey = true;
return navigator.credentials.get({
publicKey: {
challenge: Buffer.from(
this.challengeData.challenge
.replace(/\-/g, '+')
.replace(/_/g, '/'),
'base64'
),
challenge: byteify(this.challengeData.challenge, 'base64'),
allowCredentials: this.challengeData.securityKeys.map(key => ({
id: Buffer.from(key.id, 'hex'),
id: byteify(key.id, 'hex'),
type: 'public-key',
transports: ['usb', 'nfc', 'ble', 'internal']
})),
@ -143,9 +138,9 @@ export default Vue.extend({
return this.$root.api('signin', {
username: this.username,
password: this.password,
signature: hexifyAB(credential.response.signature),
authenticatorData: hexifyAB(credential.response.authenticatorData),
clientDataJSON: hexifyAB(credential.response.clientDataJSON),
signature: hexify(credential.response.signature),
authenticatorData: hexify(credential.response.authenticatorData),
clientDataJSON: hexify(credential.response.clientDataJSON),
credentialId: credential.id,
challengeId: this.challengeData.challengeId
});