summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJarrett Helton <jaydhelton@gmail.com>2021-02-19 06:20:48 -0500
committerJarrett Helton <jaydhelton@gmail.com>2021-02-19 06:20:48 -0500
commitfeeae8bd2816e631620fd347ac97314ee60b803b (patch)
treeb6101c11f6c0e6408407904e2bfcdd049388df26
parent8eb2dc218e8b57de4fb72e36f45ee3a66e86975a (diff)
clean up diff
-rw-r--r--example/index.ts28
-rw-r--r--packages/server/src/index.test.ts1
2 files changed, 13 insertions, 16 deletions
diff --git a/example/index.ts b/example/index.ts
index 3cbf2c9..631a0ee 100644
--- a/example/index.ts
+++ b/example/index.ts
@@ -20,17 +20,13 @@ import {
verifyAttestationResponse,
// Login ("Assertion")
generateAssertionOptions,
- GenerateAttestationOptionsOpts,
verifyAssertionResponse,
- VerifyAttestationResponseOpts,
- VerifiedAttestation,
} from '@simplewebauthn/server';
import type {
AttestationCredentialJSON,
AssertionCredentialJSON,
AuthenticatorDevice,
- PublicKeyCredentialCreationOptionsJSON,
} from '@simplewebauthn/typescript-types';
import { LoggedInUser } from './example-server';
@@ -99,7 +95,8 @@ app.get('/generate-attestation-options', (req, res) => {
username,
devices,
} = user;
- const generateAttestationOptionsOpts: GenerateAttestationOptionsOpts = {
+
+ const options = generateAttestationOptions({
rpName: 'SimpleWebAuthn Example',
rpID,
userID: loggedInUserId,
@@ -125,8 +122,7 @@ app.get('/generate-attestation-options', (req, res) => {
userVerification: 'preferred',
requireResidentKey: false,
},
- };
- const options: PublicKeyCredentialCreationOptionsJSON = generateAttestationOptions(generateAttestationOptionsOpts);
+ });
/**
* The server needs to temporarily remember this value for verification, so don't lose it until
@@ -143,15 +139,15 @@ app.post('/verify-attestation', async (req, res) => {
const user = inMemoryUserDeviceDB[loggedInUserId];
const expectedChallenge = user.currentChallenge;
- const verifyAttestationResponseOptions: VerifyAttestationResponseOpts = {
- credential: body,
- expectedChallenge: `${expectedChallenge}`,
- expectedOrigin,
- expectedRPID: rpID,
- };
- let verification: VerifiedAttestation;
+
+ let verification;
try {
- verification = await verifyAttestationResponse(verifyAttestationResponseOptions);
+ verification = await verifyAttestationResponse({
+ credential: body,
+ expectedChallenge: `${expectedChallenge}`,
+ expectedOrigin,
+ expectedRPID: rpID,
+ });
} catch (error) {
console.error(error);
return res.status(400).send({ error: error.message });
@@ -232,7 +228,7 @@ app.post('/verify-assertion', (req, res) => {
throw new Error(`could not find authenticator matching ${body.id}`);
}
- let verification: VerifyAssertionResponseOpts;
+ let verification;
try {
verification = verifyAssertionResponse({
credential: body,
diff --git a/packages/server/src/index.test.ts b/packages/server/src/index.test.ts
index 32b0548..ea02a04 100644
--- a/packages/server/src/index.test.ts
+++ b/packages/server/src/index.test.ts
@@ -7,6 +7,7 @@ test('should export method `generateAttestationOptions`', () => {
test('should export method `verifyAttestationResponse`', () => {
expect(index.verifyAttestationResponse).toBeDefined();
});
+
test('should export method `generateAssertionOptions`', () => {
expect(index.generateAssertionOptions).toBeDefined();
});