@adminforth/two-factors-auth 4.3.0 → 4.3.2

package/build.log

@@ -17,5 +17,5 @@ custom/tsconfig.json
 custom/use2faApi.ts
 custom/utils.js
 
-sent 288,176 bytes  received 248 bytes  576,848.00 bytes/sec
-total size is 287,203  speedup is 1.00
+sent 288,139 bytes  received 248 bytes  576,774.00 bytes/sec
+total size is 287,166  speedup is 1.00

package/custom/TwoFactorsSetup.vue

@@ -249,8 +249,7 @@ async function sendCode (value) {
     method: 'POST',
     path: '/plugin/twofa/confirmLogin',
     body: {
-      code: value,
-      secret: totp.value.newSecret,
+      code: value
     }
   })
   if (resp.allowedLogin) {

package/dist/custom/TwoFactorsSetup.vue

@@ -249,8 +249,7 @@ async function sendCode (value) {
     method: 'POST',
     path: '/plugin/twofa/confirmLogin',
     body: {
-      code: value,
-      secret: totp.value.newSecret,
+      code: value
     }
   })
   if (resp.allowedLogin) {

package/dist/endpoints/validation.d.ts

@@ -6,7 +6,7 @@ export declare const confirmLoginBodySchema: z.ZodObject<{
     passkeyOptions: z.ZodOptional<z.ZodAny>;
 }, z.core.$strict>;
 export declare const confirmLoginWithPasskeyBodySchema: z.ZodObject<{
-    passkeyResponse: z.ZodOptional<z.ZodAny>;
+    passkeyResponse: z.ZodRecord<z.ZodString, z.ZodAny>;
     rememberMe: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
 export declare const verifyTotpBodySchema: z.ZodObject<{
@@ -14,11 +14,11 @@ export declare const verifyTotpBodySchema: z.ZodObject<{
 }, z.core.$strict>;
 export declare const registrationOptionsBodySchema: z.ZodObject<{
     mode: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    confirmationResult: z.ZodOptional<z.ZodAny>;
+    confirmationResult: z.ZodRecord<z.ZodString, z.ZodAny>;
 }, z.core.$strict>;
 export declare const finishRegistrationBodySchema: z.ZodObject<{
     credential: z.ZodAny;
-    origin: z.ZodOptional<z.ZodString>;
+    origin: z.ZodString;
 }, z.core.$strict>;
 export declare const deletePasskeyBodySchema: z.ZodObject<{
     passkeyId: z.ZodString;
@@ -29,5 +29,5 @@ export declare const renamePasskeyBodySchema: z.ZodObject<{
 }, z.core.$strict>;
 export declare const resolveVerifyAutoBodySchema: z.ZodObject<{
     sessionsIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
-    confirmationResult: z.ZodOptional<z.ZodAny>;
+    confirmationResult: z.ZodRecord<z.ZodString, z.ZodAny>;
 }, z.core.$strict>;

package/dist/endpoints/validation.js

@@ -7,7 +7,7 @@ export const confirmLoginBodySchema = z.object({
     passkeyOptions: z.any().optional(),
 }).strict();
 export const confirmLoginWithPasskeyBodySchema = z.object({
-    passkeyResponse: z.any().optional(),
+    passkeyResponse: z.record(z.string(), z.any()),
     rememberMe: z.boolean().optional(),
 }).strict();
 export const verifyTotpBodySchema = z.object({
@@ -16,11 +16,11 @@ export const verifyTotpBodySchema = z.object({
 // passkey endpoints
 export const registrationOptionsBodySchema = z.object({
     mode: z.string().nullish(),
-    confirmationResult: z.any().optional(),
+    confirmationResult: z.record(z.string(), z.any()),
 }).strict();
 export const finishRegistrationBodySchema = z.object({
     credential: z.any(),
-    origin: z.string().optional(),
+    origin: z.string(),
 }).strict();
 export const deletePasskeyBodySchema = z.object({
     passkeyId: z.string(),
@@ -31,5 +31,5 @@ export const renamePasskeyBodySchema = z.object({
 }).strict();
 export const resolveVerifyAutoBodySchema = z.object({
     sessionsIds: z.array(z.string()).nullish(),
-    confirmationResult: z.any().optional(),
+    confirmationResult: z.record(z.string(), z.any()),
 }).strict();

package/dist/services/passkeyService.js

@@ -199,6 +199,10 @@ export class PasskeyService {
                 const credentialID = credential.id;
                 const base64CredentialID = credentialID;
                 const base64PublicKey = isoBase64URL.fromBuffer(credentialPublicKey);
+                const existingPasskey = yield this.passkeyRepository.getByCredentialId(base64CredentialID);
+                if (existingPasskey) {
+                    throw new Error('This passkey is already registered');
+                }
                 yield this.passkeyRepository.create({
                     [this.options.passkeys.credentialIdFieldName]: base64CredentialID,
                     [this.options.passkeys.credentialUserIdFieldName]: adminUser.pk,

package/endpoints/validation.ts

@@ -9,7 +9,7 @@ export const confirmLoginBodySchema = z.object({
 }).strict();
 
 export const confirmLoginWithPasskeyBodySchema = z.object({
-  passkeyResponse: z.any().optional(),
+  passkeyResponse: z.record(z.string(), z.any()),
   rememberMe: z.boolean().optional(),
 }).strict();
 
@@ -20,12 +20,12 @@ export const verifyTotpBodySchema = z.object({
 // passkey endpoints
 export const registrationOptionsBodySchema = z.object({
   mode: z.string().nullish(),
-  confirmationResult: z.any().optional(),
+  confirmationResult: z.record(z.string(), z.any()),
 }).strict();
 
 export const finishRegistrationBodySchema = z.object({
   credential: z.any(),
-  origin: z.string().optional(),
+  origin: z.string(),
 }).strict();
 
 export const deletePasskeyBodySchema = z.object({
@@ -39,5 +39,5 @@ export const renamePasskeyBodySchema = z.object({
 
 export const resolveVerifyAutoBodySchema = z.object({
   sessionsIds: z.array(z.string()).nullish(),
-  confirmationResult: z.any().optional(),
+  confirmationResult: z.record(z.string(), z.any()),
 }).strict();

package/package.json

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

package/services/passkeyService.ts

@@ -214,6 +214,11 @@ export class PasskeyService {
       const base64CredentialID = credentialID;
       const base64PublicKey = isoBase64URL.fromBuffer(credentialPublicKey);
 
+      const existingPasskey = await this.passkeyRepository.getByCredentialId(base64CredentialID);
+      if (existingPasskey) {
+        throw new Error('This passkey is already registered');
+      }
+
       await this.passkeyRepository.create({
           [this.options.passkeys.credentialIdFieldName]           : base64CredentialID,
           [this.options.passkeys.credentialUserIdFieldName]       : adminUser.pk,