diff --git a/bin/lamassu-register b/bin/lamassu-register index 1fbb98a4..c24a59b6 100755 --- a/bin/lamassu-register +++ b/bin/lamassu-register @@ -1,7 +1,7 @@ #!/usr/bin/env node const { asyncLocalStorage, defaultStore } = require('../lib/async-storage') -const authentication = require('../lib/new-admin/graphql/modules/authentication') +const userManagement = require('../lib/new-admin/graphql/modules/userManagement') const options = require('../lib/options') const name = process.argv[2] @@ -31,7 +31,7 @@ if (role !== 'user' && role !== 'superuser') { } asyncLocalStorage.run(defaultStore(), () => { - authentication.createRegisterToken(name, role).then(token => { + userManagement.createRegisterToken(name, role).then(token => { if (!token) { console.log(`A user named ${name} already exists!`) process.exit(2) diff --git a/lib/hardware-credentials.js b/lib/hardware-credentials.js index f7b863eb..761fd045 100644 --- a/lib/hardware-credentials.js +++ b/lib/hardware-credentials.js @@ -12,7 +12,7 @@ function getHardwareCredentials () { return db.any(sql) } -function getHardwareCredentialsOfUser (userID) { +function getHardwareCredentialsByUserId (userID) { const sql = `SELECT * FROM hardware_credentials WHERE user_id=$1` return db.any(sql, [userID]) } @@ -30,7 +30,7 @@ function updateHardwareCredential (credential) { module.exports = { createHardwareCredential, getHardwareCredentials, - getHardwareCredentialsOfUser, + getHardwareCredentialsByUserId, getUserByUserHandle, updateHardwareCredential } diff --git a/lib/new-admin/graphql/modules/authentication/FIDO2FAStrategy.js b/lib/new-admin/graphql/modules/authentication/FIDO2FAStrategy.js index 944829fe..9954ba5d 100644 --- a/lib/new-admin/graphql/modules/authentication/FIDO2FAStrategy.js +++ b/lib/new-admin/graphql/modules/authentication/FIDO2FAStrategy.js @@ -4,7 +4,6 @@ const _ = require('lodash/fp') const userManagement = require('../userManagement') const credentials = require('../../../../hardware-credentials') -const db = require('../../../../db') const options = require('../../../../options') const T = require('../../../../time') const users = require('../../../../users') @@ -17,9 +16,9 @@ const REMEMBER_ME_AGE = 90 * T.day const rpID = devMode ? `localhost` : domain const expectedOrigin = `https://${rpID}:3001` -const generateAttestationOptions = (userID, session) => { - return users.getUserById(userID).then(user => { - return Promise.all([credentials.getHardwareCredentialsOfUser(user.id), user]) +const generateAttestationOptions = (session, options) => { + return users.getUserById(options.userId).then(user => { + return Promise.all([credentials.getHardwareCredentialsByUserId(user.id), user]) }).then(([userDevices, user]) => { const options = simpleWebauthn.generateAttestationOptions({ rpName: 'Lamassu', @@ -49,10 +48,10 @@ const generateAttestationOptions = (userID, session) => { }) } -const generateAssertionOptions = (username, password, context) => { - return userManagement.authenticateUser(username, password).then(user => { - return credentials.getHardwareCredentialsOfUser(user.id).then(devices => { - const options = simpleWebauthn.generateAssertionOptions({ +const generateAssertionOptions = (session, options) => { + return userManagement.authenticateUser(options.username, options.password).then(user => { + return credentials.getHardwareCredentialsByUserId(user.id).then(devices => { + const opts = simpleWebauthn.generateAssertionOptions({ timeout: 60000, allowCredentials: devices.map(dev => ({ id: dev.data.credentialID, @@ -63,25 +62,25 @@ const generateAssertionOptions = (username, password, context) => { rpID }) - context.req.session.webauthn = { + session.webauthn = { assertion: { - challenge: options.challenge + challenge: opts.challenge } } - return options + return opts }) }) } -const validateAttestation = (userID, attestationResponse, context) => { - const webauthnData = context.req.session.webauthn.attestation +const validateAttestation = (session, options) => { + const webauthnData = session.webauthn.attestation const expectedChallenge = webauthnData.challenge return Promise.all([ - users.getUserById(userID), + users.getUserById(options.userId), simpleWebauthn.verifyAttestationResponse({ - credential: attestationResponse, + credential: options.attestationResponse, expectedChallenge: `${expectedChallenge}`, expectedOrigin, expectedRPID: rpID @@ -91,7 +90,7 @@ const validateAttestation = (userID, attestationResponse, context) => { const { verified, attestationInfo } = verification if (!(verified || attestationInfo)) { - context.req.session.webauthn = null + session.webauthn = null return false } @@ -101,7 +100,7 @@ const validateAttestation = (userID, attestationResponse, context) => { credentialID } = attestationInfo - return credentials.getHardwareCredentialsOfUser(user.id) + return credentials.getHardwareCredentialsByUserId(user.id) .then(userDevices => { const existingDevice = userDevices.find(device => device.data.credentialID === credentialID) @@ -114,23 +113,23 @@ const validateAttestation = (userID, attestationResponse, context) => { credentials.createHardwareCredential(user.id, newDevice) } - context.req.session.webauthn = null + session.webauthn = null return verified }) }) } -const validateAssertion = (username, password, rememberMe, assertionResponse, context) => { - return userManagement.authenticateUser(username, password).then(user => { - const expectedChallenge = context.req.session.webauthn.assertion.challenge +const validateAssertion = (session, options) => { + return userManagement.authenticateUser(options.username, options.password).then(user => { + const expectedChallenge = session.webauthn.assertion.challenge - return credentials.getHardwareCredentialsOfUser(user.id).then(devices => { + return credentials.getHardwareCredentialsByUserId(user.id).then(devices => { const dbAuthenticator = _.find(dev => { - return Buffer.from(dev.data.credentialID).compare(base64url.toBuffer(assertionResponse.rawId)) === 0 + return Buffer.from(dev.data.credentialID).compare(base64url.toBuffer(options.assertionResponse.rawId)) === 0 }, devices) if (!dbAuthenticator.data) { - throw new Error(`Could not find authenticator matching ${assertionResponse.id}`) + throw new Error(`Could not find authenticator matching ${options.assertionResponse.id}`) } const convertedAuthenticator = _.merge( @@ -141,7 +140,7 @@ const validateAssertion = (username, password, rememberMe, assertionResponse, co let verification try { verification = simpleWebauthn.verifyAssertionResponse({ - credential: assertionResponse, + credential: options.assertionResponse, expectedChallenge: `${expectedChallenge}`, expectedOrigin, expectedRPID: rpID, @@ -155,7 +154,7 @@ const validateAssertion = (username, password, rememberMe, assertionResponse, co const { verified, assertionInfo } = verification if (!verified) { - context.req.session.webauthn = null + session.webauthn = null return false } @@ -163,10 +162,10 @@ const validateAssertion = (username, password, rememberMe, assertionResponse, co return credentials.updateHardwareCredential(dbAuthenticator) .then(() => { const finalUser = { id: user.id, username: user.username, role: user.role } - context.req.session.user = finalUser - if (rememberMe) context.req.session.cookie.maxAge = REMEMBER_ME_AGE + session.user = finalUser + if (options.rememberMe) session.cookie.maxAge = REMEMBER_ME_AGE - context.req.session.webauthn = null + session.webauthn = null return verified }) }) diff --git a/lib/new-admin/graphql/modules/authentication/FIDOPasswordlessStrategy.js b/lib/new-admin/graphql/modules/authentication/FIDOPasswordlessStrategy.js index 92fbc20b..0e834e13 100644 --- a/lib/new-admin/graphql/modules/authentication/FIDOPasswordlessStrategy.js +++ b/lib/new-admin/graphql/modules/authentication/FIDOPasswordlessStrategy.js @@ -15,11 +15,11 @@ const REMEMBER_ME_AGE = 90 * T.day const rpID = devMode ? `localhost` : domain const expectedOrigin = `https://${rpID}:3001` -const generateAttestationOptions = (userID, session) => { - return users.getUserById(userID).then(user => { - return Promise.all([credentials.getHardwareCredentialsOfUser(user.id), user]) +const generateAttestationOptions = (session, options) => { + return users.getUserById(options.userId).then(user => { + return Promise.all([credentials.getHardwareCredentialsByUserId(user.id), user]) }).then(([userDevices, user]) => { - const options = simpleWebauthn.generateAttestationOptions({ + const opts = simpleWebauthn.generateAttestationOptions({ rpName: 'Lamassu', rpID, userName: user.username, @@ -39,18 +39,18 @@ const generateAttestationOptions = (userID, session) => { session.webauthn = { attestation: { - challenge: options.challenge + challenge: opts.challenge } } - return options + return opts }) } -const generateAssertionOptions = (username, context) => { - return users.getUserByUsername(username).then(user => { - return credentials.getHardwareCredentialsOfUser(user.id).then(devices => { - const options = simpleWebauthn.generateAssertionOptions({ +const generateAssertionOptions = (session, options) => { + return users.getUserByUsername(options.username).then(user => { + return credentials.getHardwareCredentialsByUserId(user.id).then(devices => { + const opts = simpleWebauthn.generateAssertionOptions({ timeout: 60000, allowCredentials: devices.map(dev => ({ id: dev.data.credentialID, @@ -61,25 +61,25 @@ const generateAssertionOptions = (username, context) => { rpID }) - context.req.session.webauthn = { + session.webauthn = { assertion: { - challenge: options.challenge + challenge: opts.challenge } } - return options + return opts }) }) } -const validateAttestation = (userID, attestationResponse, context) => { - const webauthnData = context.req.session.webauthn.attestation +const validateAttestation = (session, options) => { + const webauthnData = session.webauthn.attestation const expectedChallenge = webauthnData.challenge return Promise.all([ - users.getUserById(userID), + users.getUserById(options.userId), simpleWebauthn.verifyAttestationResponse({ - credential: attestationResponse, + credential: options.attestationResponse, expectedChallenge: `${expectedChallenge}`, expectedOrigin, expectedRPID: rpID @@ -89,7 +89,7 @@ const validateAttestation = (userID, attestationResponse, context) => { const { verified, attestationInfo } = verification if (!(verified || attestationInfo)) { - context.req.session.webauthn = null + session.webauthn = null return false } @@ -99,7 +99,7 @@ const validateAttestation = (userID, attestationResponse, context) => { credentialID } = attestationInfo - return credentials.getHardwareCredentialsOfUser(user.id) + return credentials.getHardwareCredentialsByUserId(user.id) .then(userDevices => { const existingDevice = userDevices.find(device => device.data.credentialID === credentialID) @@ -112,23 +112,23 @@ const validateAttestation = (userID, attestationResponse, context) => { credentials.createHardwareCredential(user.id, newDevice) } - context.req.session.webauthn = null + session.webauthn = null return verified }) }) } -const validateAssertion = (username, rememberMe, assertionResponse, context) => { - return users.getUserByUsername(username).then(user => { - const expectedChallenge = context.req.session.webauthn.assertion.challenge +const validateAssertion = (session, options) => { + return users.getUserByUsername(options.username).then(user => { + const expectedChallenge = session.webauthn.assertion.challenge - return credentials.getHardwareCredentialsOfUser(user.id).then(devices => { + return credentials.getHardwareCredentialsByUserId(user.id).then(devices => { const dbAuthenticator = _.find(dev => { - return Buffer.from(dev.data.credentialID).compare(base64url.toBuffer(assertionResponse.rawId)) === 0 + return Buffer.from(dev.data.credentialID).compare(base64url.toBuffer(options.assertionResponse.rawId)) === 0 }, devices) if (!dbAuthenticator.data) { - throw new Error(`Could not find authenticator matching ${assertionResponse.id}`) + throw new Error(`Could not find authenticator matching ${options.assertionResponse.id}`) } const convertedAuthenticator = _.merge( @@ -139,7 +139,7 @@ const validateAssertion = (username, rememberMe, assertionResponse, context) => let verification try { verification = simpleWebauthn.verifyAssertionResponse({ - credential: assertionResponse, + credential: options.assertionResponse, expectedChallenge: `${expectedChallenge}`, expectedOrigin, expectedRPID: rpID, @@ -161,10 +161,10 @@ const validateAssertion = (username, rememberMe, assertionResponse, context) => return credentials.updateHardwareCredential(dbAuthenticator) .then(() => { const finalUser = { id: user.id, username: user.username, role: user.role } - context.req.session.user = finalUser - if (rememberMe) context.req.session.cookie.maxAge = REMEMBER_ME_AGE + session.user = finalUser + if (options.rememberMe) session.cookie.maxAge = REMEMBER_ME_AGE - context.req.session.webauthn = null + session.webauthn = null return verified }) }) diff --git a/lib/new-admin/graphql/modules/authentication/FIDOUsernamelessStrategy.js b/lib/new-admin/graphql/modules/authentication/FIDOUsernamelessStrategy.js index 981a4e93..8c481468 100644 --- a/lib/new-admin/graphql/modules/authentication/FIDOUsernamelessStrategy.js +++ b/lib/new-admin/graphql/modules/authentication/FIDOUsernamelessStrategy.js @@ -15,13 +15,13 @@ const REMEMBER_ME_AGE = 90 * T.day const rpID = devMode ? `localhost` : domain const expectedOrigin = `https://${rpID}:3001` -const generateAttestationOptions = (userID, session) => { +const generateAttestationOptions = (session, options) => { return credentials.getHardwareCredentials().then(devices => { - const options = simpleWebauthn.generateAttestationOptions({ + const opts = simpleWebauthn.generateAttestationOptions({ rpName: 'Lamassu', rpID, userName: `Usernameless user created at ${new Date().toISOString()}`, - userID: userID, + userID: options.userId, timeout: 60000, attestationType: 'direct', excludeCredentials: devices.map(dev => ({ @@ -38,15 +38,15 @@ const generateAttestationOptions = (userID, session) => { session.webauthn = { attestation: { - challenge: options.challenge + challenge: opts.challenge } } - return options + return opts }) } -const generateAssertionOptions = context => { +const generateAssertionOptions = session => { return credentials.getHardwareCredentials().then(devices => { const options = simpleWebauthn.generateAssertionOptions({ timeout: 60000, @@ -59,7 +59,7 @@ const generateAssertionOptions = context => { rpID }) - context.req.session.webauthn = { + session.webauthn = { assertion: { challenge: options.challenge } @@ -68,14 +68,14 @@ const generateAssertionOptions = context => { }) } -const validateAttestation = (userID, attestationResponse, context) => { - const webauthnData = context.req.session.webauthn.attestation +const validateAttestation = (session, options) => { + const webauthnData = session.webauthn.attestation const expectedChallenge = webauthnData.challenge return Promise.all([ - users.getUserById(userID), + users.getUserById(options.userId), simpleWebauthn.verifyAttestationResponse({ - credential: attestationResponse, + credential: options.attestationResponse, expectedChallenge: `${expectedChallenge}`, expectedOrigin, expectedRPID: rpID @@ -85,7 +85,7 @@ const validateAttestation = (userID, attestationResponse, context) => { const { verified, attestationInfo } = verification if (!(verified || attestationInfo)) { - context.req.session.webauthn = null + session.webauthn = null return verified } @@ -100,7 +100,7 @@ const validateAttestation = (userID, attestationResponse, context) => { attestationObject } = attestationInfo - return credentials.getHardwareCredentialsOfUser(user.id) + return credentials.getHardwareCredentialsByUserId(user.id) .then(userDevices => { const existingDevice = userDevices.find(device => device.data.credentialID === credentialID) @@ -118,22 +118,22 @@ const validateAttestation = (userID, attestationResponse, context) => { credentials.createHardwareCredential(user.id, newDevice) } - context.req.session.webauthn = null + session.webauthn = null return verified }) }) } -const validateAssertion = (assertionResponse, context) => { - const expectedChallenge = context.req.session.webauthn.assertion.challenge +const validateAssertion = (session, options) => { + const expectedChallenge = session.webauthn.assertion.challenge return credentials.getHardwareCredentials().then(devices => { const dbAuthenticator = _.find(dev => { - return Buffer.from(dev.data.credentialID).compare(base64url.toBuffer(assertionResponse.rawId)) === 0 + return Buffer.from(dev.data.credentialID).compare(base64url.toBuffer(options.assertionResponse.rawId)) === 0 }, devices) if (!dbAuthenticator.data) { - throw new Error(`Could not find authenticator matching ${assertionResponse.id}`) + throw new Error(`Could not find authenticator matching ${options.assertionResponse.id}`) } const convertedAuthenticator = _.merge( @@ -144,7 +144,7 @@ const validateAssertion = (assertionResponse, context) => { let verification try { verification = simpleWebauthn.verifyAssertionResponse({ - credential: assertionResponse, + credential: options.assertionResponse, expectedChallenge: `${expectedChallenge}`, expectedOrigin, expectedRPID: rpID, @@ -158,7 +158,7 @@ const validateAssertion = (assertionResponse, context) => { const { verified, assertionInfo } = verification if (!verified) { - context.req.session.webauthn = null + session.webauthn = null return false } @@ -169,10 +169,10 @@ const validateAssertion = (assertionResponse, context) => { ]) .then(([_, user]) => { const finalUser = { id: user.id, username: user.username, role: user.role } - context.req.session.user = finalUser - context.req.session.cookie.maxAge = REMEMBER_ME_AGE + session.user = finalUser + session.cookie.maxAge = REMEMBER_ME_AGE - context.req.session.webauthn = null + session.webauthn = null return verified }) }) diff --git a/lib/new-admin/graphql/modules/userManagement.js b/lib/new-admin/graphql/modules/userManagement.js index 3ad63b2f..eeee2a26 100644 --- a/lib/new-admin/graphql/modules/userManagement.js +++ b/lib/new-admin/graphql/modules/userManagement.js @@ -144,7 +144,7 @@ const deleteSession = (sessionID, context) => { const login = (username, password) => { return authenticateUser(username, password) .then(user => { - return Promise.all([credentials.getHardwareCredentialsOfUser(user.id), user.twofa_code]) + return Promise.all([credentials.getHardwareCredentialsByUserId(user.id), user.twofa_code]) }) .then(([devices, twoFASecret]) => { if (!_.isEmpty(devices)) return 'FIDO' diff --git a/lib/new-admin/graphql/resolvers/users.resolver.js b/lib/new-admin/graphql/resolvers/users.resolver.js index b01b91e4..6f5f8b3d 100644 --- a/lib/new-admin/graphql/resolvers/users.resolver.js +++ b/lib/new-admin/graphql/resolvers/users.resolver.js @@ -3,45 +3,53 @@ const userManagement = require('../modules/userManagement') const users = require('../../../users') const sessionManager = require('../../../session-manager') -const getFIDOStrategyQueries = () => { +const getAttestationQueryOptions = variables => { switch (authentication.CHOSEN_STRATEGY) { case 'FIDO2FA': - return { - generateAttestationOptions: (...[, { userID }, context]) => authentication.strategy.generateAttestationOptions(userID, context.req.session), - generateAssertionOptions: (...[, { username, password }, context]) => authentication.strategy.generateAssertionOptions(username, password, context) - } + return { userId: variables.userID } case 'FIDOPasswordless': - return { - generateAttestationOptions: (...[, { userID }, context]) => authentication.strategy.generateAttestationOptions(userID, context.req.session), - generateAssertionOptions: (...[, { username }, context]) => authentication.strategy.generateAssertionOptions(username, context) - } + return { userId: variables.userID } case 'FIDOUsernameless': - return { - generateAttestationOptions: (...[, { userID }, context]) => authentication.strategy.generateAttestationOptions(userID, context.req.session), - generateAssertionOptions: (...[, { }, context]) => authentication.strategy.generateAssertionOptions(context) - } + return { userId: variables.userID } default: return {} } } -const getFIDOStrategyMutations = () => { +const getAssertionQueryOptions = variables => { switch (authentication.CHOSEN_STRATEGY) { case 'FIDO2FA': - return { - validateAttestation: (...[, { userID, attestationResponse }, context]) => authentication.strategy.validateAttestation(userID, attestationResponse, context), - validateAssertion: (...[, { username, password, rememberMe, assertionResponse }, context]) => authentication.strategy.validateAssertion(username, password, rememberMe, assertionResponse, context) - } + return { username: variables.username, password: variables.password } case 'FIDOPasswordless': - return { - validateAttestation: (...[, { userID, attestationResponse }, context]) => authentication.strategy.validateAttestation(userID, attestationResponse, context), - validateAssertion: (...[, { username, rememberMe, assertionResponse }, context]) => authentication.strategy.validateAssertion(username, rememberMe, assertionResponse, context) - } + return { username: variables.username } case 'FIDOUsernameless': - return { - validateAttestation: (...[, { userID, attestationResponse }, context]) => authentication.strategy.validateAttestation(userID, attestationResponse, context), - validateAssertion: (...[, { assertionResponse }, context]) => authentication.strategy.validateAssertion(assertionResponse, context) - } + return {} + default: + return {} + } +} + +const getAttestationMutationOptions = variables => { + switch (authentication.CHOSEN_STRATEGY) { + case 'FIDO2FA': + return { userId: variables.userID, attestationResponse: variables.attestationResponse } + case 'FIDOPasswordless': + return { userId: variables.userID, attestationResponse: variables.attestationResponse } + case 'FIDOUsernameless': + return { userId: variables.userID, attestationResponse: variables.attestationResponse } + default: + return {} + } +} + +const getAssertionMutationOptions = variables => { + switch (authentication.CHOSEN_STRATEGY) { + case 'FIDO2FA': + return { username: variables.username, password: variables.password, rememberMe: variables.rememberMe, assertionResponse: variables.assertionResponse } + case 'FIDOPasswordless': + return { username: variables.username, rememberMe: variables.rememberMe, assertionResponse: variables.assertionResponse } + case 'FIDOUsernameless': + return { assertionResponse: variables.assertionResponse } default: return {} } @@ -58,7 +66,8 @@ const resolver = { validateRegisterLink: (...[, { token }]) => userManagement.validateRegisterLink(token), validateResetPasswordLink: (...[, { token }]) => userManagement.validateResetPasswordLink(token), validateReset2FALink: (...[, { token }]) => userManagement.validateReset2FALink(token), - ...getFIDOStrategyQueries() + generateAttestationOptions: (...[, variables, context]) => authentication.strategy.generateAttestationOptions(context.req.session, getAttestationQueryOptions(variables)), + generateAssertionOptions: (...[, variables, context]) => authentication.strategy.generateAssertionOptions(context.req.session, getAssertionQueryOptions(variables)) }, Mutation: { enableUser: (...[, { confirmationCode, id }, context]) => userManagement.enableUser(confirmationCode, id, context), @@ -75,7 +84,8 @@ const resolver = { register: (...[, { token, username, password, role }]) => userManagement.register(token, username, password, role), resetPassword: (...[, { token, userID, newPassword }, context]) => userManagement.resetPassword(token, userID, newPassword, context), reset2FA: (...[, { token, userID, code }, context]) => userManagement.reset2FA(token, userID, code, context), - ...getFIDOStrategyMutations() + validateAttestation: (...[, variables, context]) => authentication.strategy.validateAttestation(context.req.session, getAttestationMutationOptions(variables)), + validateAssertion: (...[, variables, context]) => authentication.strategy.validateAssertion(context.req.session, getAssertionMutationOptions(variables)) } } diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index 9f9c3f31..cad5fe31 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -17172,25 +17172,6 @@ } } }, - "keccak": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.2.tgz", - "integrity": "sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==", - "requires": { - "node-addon-api": "^2.0.0", - "node-gyp-build": "^4.2.0", - "readable-stream": "^3.6.0" - } - }, - "keccak256": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/keccak256/-/keccak256-1.0.3.tgz", - "integrity": "sha512-EkF/4twuPm1V/gn75nejOUrKfDUJn87RMLzDWosXF3pXuOvesiSgX35GcmbqzdImCASEkE/WaklWGWSa+Ha5bQ==", - "requires": { - "bn.js": "^4.11.8", - "keccak": "^3.0.1" - } - }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -17232,14 +17213,12 @@ "from": "git+https://github.com/lamassu/lamassu-coins.git", "requires": { "bech32": "2.0.0", - "big-integer": "^1.6.48", "bignumber.js": "^9.0.0", "bitcoinjs-lib": "4.0.3", "bs58check": "^2.0.2", "cashaddrjs": "~0.2.8", "crypto-js": "^3.1.9-1", "ethereumjs-icap": "^0.3.1", - "keccak256": "^1.0.2", "lodash": "^4.17.10" }, "dependencies": { @@ -18486,11 +18465,6 @@ } } }, - "node-addon-api": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", - "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==" - }, "node-dir": { "version": "0.1.17", "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", @@ -18512,11 +18486,6 @@ "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, - "node-gyp-build": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz", - "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==" - }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", diff --git a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js index 3bb053b9..69ac1588 100644 --- a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js +++ b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js @@ -196,7 +196,9 @@ const InputFIDOState = ({ state, strategy }) => { )} {strategy === 'FIDO2FA' && ( <> -

Insert your Yubikey and touch it

+

+ Insert your hardware key and follow the instructions +

)}