chore: enable TC validation without LOC id.

logion-network/logion-internal#1088
logion-network · Dec 1, 2023 · d1ad184 · d1ad184
1 parent e89e121
commit d1ad184
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/packages/client-node/package.json b/packages/client-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@logion/client-node",
-  "version": "0.2.0",
+  "version": "0.2.1-1",
   "description": "logion SDK for Node.JS client applications",
   "main": "dist/index.js",
   "packageManager": "[email protected]",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@logion/client",
-  "version": "0.35.0",
+  "version": "0.36.0-1",
   "description": "logion SDK for client applications",
   "main": "dist/index.js",
   "packageManager": "[email protected]",

diff --git a/packages/client/src/license/CreativeCommons.ts b/packages/client/src/license/CreativeCommons.ts
@@ -43,6 +43,12 @@ export class CreativeCommons extends AbstractTermsAndConditionsElement<CreativeC
         return new CreativeCommons(licenseLocId, details as CreativeCommonsCode);
     }
 
+    static validateDetails(details: string) {
+        if (!values.has(details as CreativeCommonsCode)) {
+            throw new Error(`Invalid parameters: ${ details }. Valid values are: ${ (Array.from(values)) }.`)
+        }
+    }
+
     get details(): string {
         return this.parameters;
     }

diff --git a/packages/client/src/license/LogionClassification.ts b/packages/client/src/license/LogionClassification.ts
@@ -324,11 +324,15 @@ export class LogionClassification extends AbstractTermsAndConditionsElement<Logi
     }
 
     checkValidity() {
-        const { transferredRights } = this.parameters;
+        LogionClassification.staticCheckValidity(this.parameters);
+    }
+
+    static staticCheckValidity(parameters: LogionLicenseParameters) {
+        const { transferredRights } = parameters;
         const expirationSet: Condition = params => params.expiration !== undefined && params.expiration.length > 0;
         const regionalLimitSet: Condition = params => params.regionalLimit !== undefined && params.regionalLimit.length > 0;
         const oneAndOnlyOne = { min: 1, max: 1 };
-        new Validator(this.parameters)
+        new Validator(parameters)
             .allCodesValid()
             .allCountryCodesValid()
             .contains(oneAndOnlyOne, [ "PER-PRIV", "PER-PUB", "COM-NOMOD", "COM-MOD" ])
@@ -337,11 +341,11 @@ export class LogionClassification extends AbstractTermsAndConditionsElement<Logi
             .mutuallyExclusive("TIME", "NOTIME")
             .codePresentForCondition("TIME", expirationSet, "Transferred right TIME must be set if and only if expiration is set")
             .codePresentForCondition("REG", regionalLimitSet, "Transferred right REG must be set if and only if a regional limit is set")
-            .validIsoDate(this.parameters.expiration)
+            .validIsoDate(parameters.expiration)
             .validOrThrow();
         if (transferredRights.includes("COM-NOMOD") ||
             transferredRights.includes("COM-MOD")) {
-            new Validator(this.parameters)
+            new Validator(parameters)
                 .contains(oneAndOnlyOne, ["REG", "WW"])
                 .contains(oneAndOnlyOne, ["TIME", "NOTIME"])
                 .validOrThrow("When using COM-NOMOD or COM-MOD: ")
@@ -362,6 +366,11 @@ export class LogionClassification extends AbstractTermsAndConditionsElement<Logi
         }
         return new LogionClassification(licenseLocId, parameters, checkValidity);
     }
+
+    static validateDetails(details: string) {
+        const parameters = JSON.parse(details);
+        this.staticCheckValidity(parameters);
+    }
 }
 
 class Validator {