From 46df2ad4e432ddbb16f45ab8c5e34b908bd72220 Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@noc.ac.uk>
Date: Thu, 23 Feb 2023 09:37:10 +0000
Subject: [PATCH] fix: assign validator in place of promise

---
 dist/protocol.esm.js  | 10 +++++-----
 dist/protocol.js      | 10 +++++-----
 src/protocol/index.js | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dist/protocol.esm.js b/dist/protocol.esm.js
index 725de27..ad8f994 100644
--- a/dist/protocol.esm.js
+++ b/dist/protocol.esm.js
@@ -27,7 +27,7 @@ class GenericProtocol {
   constructor(schema, services) {
     this.schema = schema;
     this.services = services;
-    this.validator = this.createValidator(schema);
+    this.createValidator(schema);
   }
 
   /**
@@ -36,7 +36,7 @@ class GenericProtocol {
    * @returns {Validator}
    */
   createValidator(schema) {
-    return new Validator(schema);
+    this.validator = new Validator(schema);
   }
 
   /**
@@ -116,12 +116,12 @@ class GenericSoarProtocol extends GenericProtocol {
    */
   createValidator(schema) {
     if (typeof schema === 'string' && schema.match(/^[\w\.]+$/)) {
-      return this.loadSchema(schema)
+      this.loadSchema(schema)
       .then((schema) => {
-        return new Validator(schema);
+         this.validator = new Validator(schema);
       });
     } else {
-      return new Validator(schema);
+      this.validator = new Validator(schema);
     } 
   }
 
diff --git a/dist/protocol.js b/dist/protocol.js
index e91ec20..d58f994 100644
--- a/dist/protocol.js
+++ b/dist/protocol.js
@@ -29,7 +29,7 @@ class GenericProtocol {
   constructor(schema, services) {
     this.schema = schema;
     this.services = services;
-    this.validator = this.createValidator(schema);
+    this.createValidator(schema);
   }
 
   /**
@@ -38,7 +38,7 @@ class GenericProtocol {
    * @returns {Validator}
    */
   createValidator(schema) {
-    return new Validator(schema);
+    this.validator = new Validator(schema);
   }
 
   /**
@@ -118,12 +118,12 @@ class GenericSoarProtocol extends GenericProtocol {
    */
   createValidator(schema) {
     if (typeof schema === 'string' && schema.match(/^[\w\.]+$/)) {
-      return this.loadSchema(schema)
+      this.loadSchema(schema)
       .then((schema) => {
-        return new Validator(schema);
+         this.validator = new Validator(schema);
       });
     } else {
-      return new Validator(schema);
+      this.validator = new Validator(schema);
     } 
   }
 
diff --git a/src/protocol/index.js b/src/protocol/index.js
index 5f65b22..2ed8019 100644
--- a/src/protocol/index.js
+++ b/src/protocol/index.js
@@ -27,7 +27,7 @@ export class GenericProtocol {
   constructor(schema, services) {
     this.schema = schema;
     this.services = services;
-    this.validator = this.createValidator(schema);
+    this.createValidator(schema);
   }
 
   /**
@@ -36,7 +36,7 @@ export class GenericProtocol {
    * @returns {Validator}
    */
   createValidator(schema) {
-    return new Validator(schema);
+    this.validator = new Validator(schema);
   }
 
   /**
@@ -116,12 +116,12 @@ export class GenericSoarProtocol extends GenericProtocol {
    */
   createValidator(schema) {
     if (typeof schema === 'string' && schema.match(/^[\w\.]+$/)) {
-      return this.loadSchema(schema)
+      this.loadSchema(schema)
       .then((schema) => {
-        return new Validator(schema);
+         this.validator = new Validator(schema);
       });
     } else {
-      return new Validator(schema);
+      this.validator = new Validator(schema);
     } 
   }
 
-- 
GitLab