fix(core): deal with unqualified date times in local offsets (#553)

Signed-off-by: Matt Roberts <[email protected]>
accordproject · Jan 6, 2023 · 20315ea · 20315ea
1 parent 60012cf
commit 20315ea
Show file tree

Hide file tree

Showing 7 changed files with 213 additions and 78 deletions.
diff --git a/packages/concerto-cli/lib/commands.js b/packages/concerto-cli/lib/commands.js
@@ -122,7 +122,7 @@ class Commands {
             const factory = new Factory(modelManager);
             const serializer = new Serializer(factory, modelManager);
 
-            const object = serializer.fromJSON(json);
+            const object = serializer.fromJSON(json, options);
             return JSON.stringify(serializer.toJSON(object, options));
         }
     }

diff --git a/packages/concerto-core/lib/serializer.js b/packages/concerto-core/lib/serializer.js
@@ -194,7 +194,7 @@ class Serializer {
         parameters.resourceStack = new TypedStack(resource);
         parameters.modelManager = this.modelManager;
         parameters.factory = this.factory;
-        const populator = new JSONPopulator(options.acceptResourcesForRelationships === true, options.ergo === true, options.utcOffset);
+        const populator = new JSONPopulator(options.acceptResourcesForRelationships === true, options.ergo === true, options.utcOffset, options.strictQualifiedDateTimes === true);
         classDeclaration.accept(populator, parameters);
 
         // validate the resource against the model

diff --git a/packages/concerto-core/lib/serializer/jsonpopulator.js b/packages/concerto-core/lib/serializer/jsonpopulator.js
@@ -87,11 +87,13 @@ class JSONPopulator {
      * place of relationships, false by default.
      * @param {boolean} [ergo] target ergo.
      * @param {number} [utcOffset] - UTC Offset for DateTime values.
+     * @param {number} [strictQualifiedDateTimes] - Only allow fully-qualified date-times with offsets.
      */
-    constructor(acceptResourcesForRelationships, ergo, utcOffset) {
+    constructor(acceptResourcesForRelationships, ergo, utcOffset, strictQualifiedDateTimes) {
         this.acceptResourcesForRelationships = acceptResourcesForRelationships;
         this.ergo = ergo;
         this.utcOffset = utcOffset || 0; // Defaults to UTC
+        this.strictQualifiedDateTimes = strictQualifiedDateTimes;
     }
 
     /**
@@ -256,10 +258,16 @@ class JSONPopulator {
                 result = json;
             } else if (typeof json !== 'string') {
                 throw new ValidationException(`Expected value at path \`${path}\` to be of type \`${field.getType()}\``);
-            } else {
+            } else if (!this.strictQualifiedDateTimes){
                 result = dayjs.utc(json).utcOffset(this.utcOffset);
+            } else if (this.strictQualifiedDateTimes){
+                if (json.match(/^((?:(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2}(?:\.\d+)?))(Z|[+-]\d{2}:\d{2}))$/)){
+                    result = dayjs.utc(json);
+                } else {
+                    throw new ValidationException(`Expected value at path \`${path}\` to be of type \`${field.getType()}\` with format YYYY-MM-DDTHH:mm:ss[Z]`);
+                }
             }
-            if (!result.isValid()) {
+            if (!result || !result.isValid()) {
                 throw new ValidationException(`Expected value at path \`${path}\` to be of type \`${field.getType()}\``);
             }
         }

diff --git a/packages/concerto-core/test/concerto.js b/packages/concerto-core/test/concerto.js
@@ -387,6 +387,5 @@ describe('concerto', () => {
                 concerto.validate(obj);
             }).should.throw(/The class "org.accordproject.test.Person" is abstract and should not contain an instance./);
         });
-
     });
 });
diff --git a/packages/concerto-core/test/serializer.js b/packages/concerto-core/test/serializer.js
diff --git a/packages/concerto-core/test/serializer/jsongenerator.js b/packages/concerto-core/test/serializer/jsongenerator.js
@@ -111,7 +111,7 @@ describe('JSONGenerator', () => {
 
     beforeEach(() => {
         sandbox = sinon.createSandbox();
-        jsonGenerator = new JSONGenerator();
+        jsonGenerator = new JSONGenerator(null, null, null, null, null, 'Z');
         ergoJsonGenerator = new JSONGenerator(null,null,null,null,true);
         ergoJsonGeneratorId = new JSONGenerator(null,null,null,true,true);
     });

diff --git a/packages/concerto-core/types/lib/serializer/jsonpopulator.d.ts b/packages/concerto-core/types/lib/serializer/jsonpopulator.d.ts
@@ -18,11 +18,13 @@ declare class JSONPopulator {
      * place of relationships, false by default.
      * @param {boolean} [ergo] target ergo.
      * @param {number} [utcOffset] - UTC Offset for DateTime values.
+     * @param {number} [strictQualifiedDateTimes] - Only allow fully-qualified date-times with offsets.
      */
-    constructor(acceptResourcesForRelationships?: boolean, ergo?: boolean, utcOffset?: number);
+    constructor(acceptResourcesForRelationships?: boolean, ergo?: boolean, utcOffset?: number, strictQualifiedDateTimes?: number);
     acceptResourcesForRelationships: boolean;
     ergo: boolean;
     utcOffset: number;
+    strictQualifiedDateTimes: number;
     /**
      * Visitor design pattern
      * @param {Object} thing - the object being visited
-Original file line number
+Diff line change
@@ Expand Up / @@ -387,6 +387,5 @@ describe('concerto', () => { @@
                     concerto.validate(obj);
                 }).should.throw(/The class "org.accordproject.test.Person" is abstract and should not contain an instance./);
             });
         });
     });