@adminforth/two-factors-auth 2.1.4 → 2.2.0

package/dist/index.js

@@ -11,6 +11,7 @@ import { AdminForthPlugin, Filters, suggestIfTypo } from "adminforth";
 import twofactor from 'node-2fa';
 import { generateRegistrationOptions, verifyRegistrationResponse, generateAuthenticationOptions, verifyAuthenticationResponse } from '@simplewebauthn/server';
 import { isoUint8Array, isoBase64URL } from '@simplewebauthn/server/helpers';
+import aaguids from './custom/aaguid.json';
 export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -483,7 +484,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             path: `/plugin/passkeys/finishRegisteringPasskey`,
             noAuth: false,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, cookies }) {
-                var _b, _c, _d, _e, _f;
+                var _b, _c, _d, _e, _f, _g;
                 const passkeysCookies = this.adminforth.auth.getCustomCookie({ cookies: cookies, name: "registerPasskeyTemporaryJWT" });
                 if (!passkeysCookies) {
                     return { error: 'Passkey token is required' };
@@ -515,6 +516,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                         throw new Error('Verification failed.');
                     }
                     const { aaguid, credential, credentialBackedUp } = registrationInfo;
+                    const provider_name = ((_g = aaguids[aaguid]) === null || _g === void 0 ? void 0 : _g.name) || 'Unknown';
                     const credentialPublicKey = credential.publicKey;
                     const credentialID = credential.id;
                     const base64CredentialID = credentialID;
@@ -536,7 +538,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                                 created_at: new Date().toISOString(),
                                 last_used_at: new Date().toISOString(),
                                 aaguid: aaguid,
-                                name: `Passkey ${adminUser.username}`,
+                                name: provider_name,
                             }),
                         },
                         adminUser: adminUser
@@ -574,7 +576,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             path: `/plugin/passkeys/getPasskeys`,
             noAuth: false,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser }) {
-                var _b;
+                var _b, _c, _d;
                 let passkeys;
                 try {
                     passkeys = yield this.adminforth.resource(this.options.passkeys.credentialResourceID).list([Filters.EQ(this.options.passkeys.credentialUserIdFieldName, adminUser.pk)]);
@@ -587,12 +589,14 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     const parsedKey = JSON.parse(pk[this.options.passkeys.credentialMetaFieldName]);
                     dataToReturn.push({
                         name: parsedKey.name,
+                        light_icon: ((_b = aaguids[parsedKey.aaguid]) === null || _b === void 0 ? void 0 : _b.icon_light) || null,
+                        dark_icon: ((_c = aaguids[parsedKey.aaguid]) === null || _c === void 0 ? void 0 : _c.icon_dark) || null,
                         created_at: parsedKey.created_at,
                         last_used_at: parsedKey.last_used_at,
                         id: pk[this.options.passkeys.credentialIdFieldName],
                     });
                 }
-                return { ok: true, data: dataToReturn, authenticatorAttachment: ((_b = this.options.passkeys) === null || _b === void 0 ? void 0 : _b.settings.authenticatorSelection.authenticatorAttachment) || 'both' };
+                return { ok: true, data: dataToReturn, authenticatorAttachment: ((_d = this.options.passkeys) === null || _d === void 0 ? void 0 : _d.settings.authenticatorSelection.authenticatorAttachment) || 'both' };
             })
         });
         server.endpoint({

package/index.ts

@@ -9,6 +9,7 @@ import {
   verifyAuthenticationResponse
 } from '@simplewebauthn/server';
 import { isoUint8Array, isoBase64URL } from '@simplewebauthn/server/helpers';
+import aaguids from './custom/aaguid.json';
 
 export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
   options: PluginOptions;
@@ -561,7 +562,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             credential,
             credentialBackedUp
           } = registrationInfo;
-          
+          const provider_name = aaguids[aaguid]?.name || 'Unknown';
           const credentialPublicKey = credential.publicKey;
           const credentialID = credential.id;
 
@@ -585,7 +586,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                 created_at              : new Date().toISOString(),
                 last_used_at            : new Date().toISOString(),
                 aaguid                  : aaguid,
-                name                    : `Passkey ${adminUser.username}`,
+                name                    : provider_name,
               }),
             },
             adminUser: adminUser
@@ -631,6 +632,8 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
           const parsedKey = JSON.parse(pk[this.options.passkeys.credentialMetaFieldName]);
           dataToReturn.push({
             name: parsedKey.name,
+            light_icon: aaguids[parsedKey.aaguid]?.icon_light || null,
+            dark_icon: aaguids[parsedKey.aaguid]?.icon_dark || null,
             created_at: parsedKey.created_at,
             last_used_at: parsedKey.last_used_at,
             id: pk[this.options.passkeys.credentialIdFieldName],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig to read more about this file */
-
     /* Projects */
     // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
     // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
@@ -107,6 +106,7 @@
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true,                                 /* Skip type checking all .d.ts files. */
+    "resolveJsonModule": true,
   },
   "exclude": ["node_modules", "dist", "custom"],           /* Exclude files from compilation. */
 }