gdc-common-utils-ts 2.3.22 → 2.3.24

package/dist/utils/consent.d.ts

@@ -53,6 +53,14 @@ export type BuildConsentClaimsSimpleInput = SubjectIdentifierInput & {
     actions: string[];
     consentIdentifier?: string;
     consentDate?: string;
+    /**
+     * Upper bound for the grant, serialized as `Consent.period-end`. Access is
+     * inactive at and after this instant.
+     *
+     * Use an ISO 8601 date or date-time. A date-time with an explicit timezone
+     * is recommended when the caller offers access until a specific hour.
+     */
+    periodEnd?: string;
     decision?: 'permit' | 'deny';
     /** Stable identifier/thread of the permission request that caused this decision. */
     eventBasedOn?: string;
@@ -90,6 +98,14 @@ export declare function normalizePhone(value: string): string;
  * @param value Raw identifier text.
  */
 export declare function normalizeIdentifierToken(value: string): string;
+/**
+ * Returns whether a Consent period boundary is an ISO 8601 calendar date or
+ * an absolute date-time carrying `Z` or an explicit numeric timezone.
+ *
+ * Date-only values remain supported for compatibility. Applications offering
+ * access until a specific hour should always send an absolute date-time.
+ */
+export declare function isValidConsentPeriodBoundary(value: string): boolean;
 /**
  * Parses a single canonical consent actor token into its resolved kind/value.
  *

package/dist/utils/consent.js

@@ -24,6 +24,27 @@ export function normalizeIdentifierToken(value) {
 function withPrefix(prefix, message) {
     return prefix ? `${prefix} ${message}` : message;
 }
+/**
+ * Returns whether a Consent period boundary is an ISO 8601 calendar date or
+ * an absolute date-time carrying `Z` or an explicit numeric timezone.
+ *
+ * Date-only values remain supported for compatibility. Applications offering
+ * access until a specific hour should always send an absolute date-time.
+ */
+export function isValidConsentPeriodBoundary(value) {
+    const normalized = String(value || '').trim();
+    if (!/^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,9})?)?(?:Z|[+-]\d{2}:\d{2}))?$/.test(normalized)) {
+        return false;
+    }
+    const [year, month, day] = normalized.slice(0, 10).split('-').map(Number);
+    const calendarDate = new Date(Date.UTC(year, month - 1, day));
+    if (calendarDate.getUTCFullYear() !== year
+        || calendarDate.getUTCMonth() !== month - 1
+        || calendarDate.getUTCDate() !== day) {
+        return false;
+    }
+    return !Number.isNaN(Date.parse(normalized));
+}
 /**
  * Parses a single canonical consent actor token into its resolved kind/value.
  *
@@ -152,6 +173,10 @@ export function buildConsentClaimsSimple(input, options = {}) {
     const actorIdentifier = resolveActorIdentifier(input.actor, { errorPrefix: options.errorPrefix });
     const subjectIdentifier = resolveSubjectIdentifier(input, { errorPrefix: options.errorPrefix });
     const consentDate = String(input.consentDate || '').trim() || new Date().toISOString().slice(0, 10);
+    const periodEnd = String(input.periodEnd || '').trim();
+    if (periodEnd && !isValidConsentPeriodBoundary(periodEnd)) {
+        throw new Error(withPrefix(options.errorPrefix, 'periodEnd must be a valid ISO 8601 date or date-time.'));
+    }
     const consentIdentifier = String(input.consentIdentifier || '').trim() || String(options.consentIdentifierFactory?.() || '').trim();
     if (!consentIdentifier) {
         throw new Error(withPrefix(options.errorPrefix, 'consentIdentifier is required when no consentIdentifierFactory is provided.'));
@@ -165,6 +190,7 @@ export function buildConsentClaimsSimple(input, options = {}) {
             [ClaimConsent.subject]: subjectIdentifier,
             [ClaimConsent.identifier]: consentIdentifier,
             [ClaimConsent.date]: consentDate,
+            ...(periodEnd ? { [ClaimConsent.periodEnd]: periodEnd } : {}),
             [ClaimConsent.purpose]: input.purpose,
             [ClaimConsent.action]: (input.actions || []).join(','),
             [ClaimConsent.actorIdentifier]: actorIdentifier,
@@ -230,8 +256,16 @@ function normalizeConsentRoleValue(value) {
     if (!trimmed || trimmed === '*')
         return trimmed;
     const [system, code] = trimmed.includes('|') ? trimmed.split('|', 2) : ['', trimmed];
+    const normalizedSystem = system.trim().toLowerCase();
+    const canonicalSystem = [
+        'isco-08',
+        'org.ilo.isco',
+        'org.ilo.isco-08',
+    ].includes(normalizedSystem)
+        ? 'org.ilo.isco-08'
+        : normalizedSystem;
     return system
-        ? `${system.trim().toLowerCase()}|${code.trim()}`
+        ? `${canonicalSystem}|${code.trim().toLowerCase()}`
         : trimmed.toLowerCase();
 }
 function parseNormalizedConsentRole(value) {
@@ -496,9 +530,9 @@ export function isConsentRuleActive(rule, options = {}) {
             : Date.now();
     const periodStart = String(readConsentRuleClaim(rule, ClaimConsent.periodStart) || '').trim();
     const periodEnd = String(readConsentRuleClaim(rule, ClaimConsent.periodEnd) || '').trim();
-    if (periodStart && !Number.isNaN(Date.parse(periodStart)) && Date.parse(periodStart) > now)
+    if (periodStart && (Number.isNaN(Date.parse(periodStart)) || Date.parse(periodStart) > now))
         return false;
-    if (periodEnd && !Number.isNaN(Date.parse(periodEnd)) && Date.parse(periodEnd) < now)
+    if (periodEnd && (Number.isNaN(Date.parse(periodEnd)) || Date.parse(periodEnd) <= now))
         return false;
     return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdc-common-utils-ts",
-  "version": "2.3.22",
+  "version": "2.3.24",
   "publishConfig": {
     "access": "public"
   },