chore: cleanup after branch update

Unleash · May 5, 2023 · 259bf11 · 259bf11
1 parent f911ae7
commit 259bf11
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/src/lib/error/api-error.test.ts b/src/lib/error/api-error.test.ts
@@ -342,8 +342,6 @@ describe('Error serialization special cases', () => {
     });
 });
 
-// test that password mismatch errors contain the expected props etc. ...
-
 describe('Error serialization special cases', () => {
     it('AuthenticationRequired: adds `path` and `type`', () => {
         const type = 'password';

diff --git a/src/lib/error/api-error.ts b/src/lib/error/api-error.ts
@@ -1,6 +1,5 @@
 import { v4 as uuidV4 } from 'uuid';
 import { FromSchema } from 'json-schema-to-ts';
-import { ErrorObject } from 'ajv';
 import OwaspValidationError from './owasp-validation-error';
 
 export const UnleashApiErrorTypes = [
@@ -232,12 +231,7 @@ export const fromLegacyError = (e: Error): UnleashError => {
     }
 
     if (name === 'OwaspValidationError') {
-        return new UnleashError({
-            name,
-            message:
-                'Password validation failed. Refer to the `details` property.',
-            details: (e as OwaspValidationError).toJSON().details,
-        });
+        return e as OwaspValidationError;
     }
 
     if (name === 'AuthenticationRequired') {

diff --git a/src/lib/error/owasp-validation-error.ts b/src/lib/error/owasp-validation-error.ts
@@ -2,26 +2,29 @@ import { TestResult } from 'owasp-password-strength-test';
 import { ApiErrorSchema, UnleashError } from './api-error';
 
 class OwaspValidationError extends UnleashError {
-    private errors: string[];
+    private details: [
+        { validationErrors: string[]; message: string },
+        ...{ validationErrors: string[]; message: string }[],
+    ];
 
     constructor(testResult: TestResult) {
+        const details = {
+            validationErrors: testResult.errors,
+            message: testResult.errors[0],
+        };
         super({
             message: testResult.errors[0],
             name: 'OwaspValidationError',
+            details: [details],
         });
-        this.errors = testResult.errors;
+
+        this.details = [details];
     }
 
     toJSON(): ApiErrorSchema {
         return {
             ...super.toJSON(),
-            details: [
-                {
-                    validationErrors: this.errors,
-                    message: this.errors[0],
-                    description: this.errors[0],
-                },
-            ],
+            details: this.details,
         };
     }
 }