gdc-common-utils-ts 2.5.15 → 2.5.17

package/dist/CryptographyService.js

@@ -242,9 +242,24 @@ export class CryptographyService {
             throw new Error("Invalid Detached JWS format");
         const protectedHeaderB64Url = parts[0];
         const signatureB64Url = parts[1];
-        const payloadB64Url = Content.bytesToRawBase64UrlSafe(payloadBytes);
-        const signingInput = `${protectedHeaderB64Url}.${payloadB64Url}`;
-        const signingInputBytes = Content.stringToBytesUTF8(signingInput);
+        const protectedHeader = Content.base64UrlSafeToJSON(protectedHeaderB64Url);
+        if (protectedHeader.b64 !== undefined && typeof protectedHeader.b64 !== 'boolean') {
+            throw new Error("Detached JWS protected header 'b64' must be boolean.");
+        }
+        if (protectedHeader.b64 === false
+            && (!Array.isArray(protectedHeader.crit) || !protectedHeader.crit.includes('b64'))) {
+            throw new Error("RFC 7797 detached JWS with 'b64=false' must mark 'b64' critical.");
+        }
+        let signingInputBytes;
+        if (protectedHeader.b64 === false) {
+            const prefix = Content.stringToBytesUTF8(`${protectedHeaderB64Url}.`);
+            signingInputBytes = new Uint8Array(prefix.length + payloadBytes.length);
+            signingInputBytes.set(prefix);
+            signingInputBytes.set(payloadBytes, prefix.length);
+        }
+        else {
+            signingInputBytes = Content.stringToBytesUTF8(`${protectedHeaderB64Url}.${Content.bytesToRawBase64UrlSafe(payloadBytes)}`);
+        }
         const signatureBytes = Content.base64ToBytes(signatureB64Url);
         return this.verifyBytes(signatureBytes, signingInputBytes, publicJWKey);
     }

package/dist/examples/legal-organization-verification-transaction.d.ts

@@ -1 +1,2 @@
+export declare const EXAMPLE_LEGAL_ORGANIZATION_SERVICE_TYPE: string;
 export declare const EXAMPLE_LEGAL_ORGANIZATION_VERIFICATION_TRANSACTION_BUNDLE: import("..").BundleJsonApi<import("..").ErrorEntry | import("..").BundleEntry>;

package/dist/examples/legal-organization-verification-transaction.js

@@ -30,6 +30,15 @@ const exampleControllerBinding = {
         }
         : {}),
 };
+/** Canonical capabilities reused by organization-onboarding editor tests. */
+const exampleLegalOrganizationServiceType = serializeServiceCapabilityTokens([
+    ServiceCapability.IndexProvider,
+    ServiceCapability.DigitalTwinReader,
+]);
+if (!exampleLegalOrganizationServiceType) {
+    throw new Error('Canonical legal-organization example capabilities must not be empty.');
+}
+export const EXAMPLE_LEGAL_ORGANIZATION_SERVICE_TYPE = exampleLegalOrganizationServiceType;
 export const EXAMPLE_LEGAL_ORGANIZATION_VERIFICATION_TRANSACTION_BUNDLE = buildLegalOrganizationVerificationTransactionBundle({
     claims: {
         '@context': 'org.schema',
@@ -42,10 +51,7 @@ export const EXAMPLE_LEGAL_ORGANIZATION_VERIFICATION_TRANSACTION_BUNDLE = buildL
         [ClaimsServiceSchemaorg.category]: EXAMPLE_SECTOR,
         [ClaimsServiceSchemaorg.identifier]: EXAMPLE_TENANT_SERVICE_DID,
         [ClaimsServiceSchemaorg.url]: `https://operator.example.net/acme/cds-${String(EXAMPLE_JURISDICTION).toLowerCase()}/v1/${EXAMPLE_SECTOR}`,
-        [ClaimsServiceSchemaorg.serviceType]: serializeServiceCapabilityTokens([
-            ServiceCapability.IndexProvider,
-            ServiceCapability.DigitalTwinReader,
-        ]),
+        [ClaimsServiceSchemaorg.serviceType]: EXAMPLE_LEGAL_ORGANIZATION_SERVICE_TYPE,
     },
     controller: exampleControllerBinding,
     organization: {

package/dist/interfaces/ICryptography.d.ts

@@ -132,6 +132,7 @@ export interface ICryptography {
      * @param publicJWKey The signer's public key (JWK) to use for verification.
      * @returns A boolean indicating if the signature is valid.
      */
+    /** Verifies encoded detached JWS and RFC 7797 `b64=false` detached payloads. */
     verifyDetachedJws(payloadBytes: Uint8Array, detachedJws: string, publicJWKey: PublicJwk): Promise<boolean>;
     /**
      * Converts a JWS Object (with decoded headers and payload) into Compact Serialization format.

package/dist/utils/legal-organization-onboarding-editor.d.ts

@@ -10,6 +10,8 @@ export type LegalOrganizationFormTemplateFields = Readonly<{
     controllerRole?: string;
     serviceCategory?: string;
     serviceIdentifier?: string;
+    /** Canonical CSV of capabilities stored in `org.schema.Service.serviceType`. */
+    serviceType?: string;
     serviceUrl?: string;
     tenantAlias?: string;
 }>;
@@ -90,6 +92,8 @@ export interface LegalOrganizationOnboardingFacade {
     getServiceCategory(fields: LegalOrganizationFormTemplateFields): string | undefined;
     setServiceIdentifier(fields: LegalOrganizationFormTemplateFields, value: string): LegalOrganizationFormTemplateFields;
     getServiceIdentifier(fields: LegalOrganizationFormTemplateFields): string | undefined;
+    setServiceType(fields: LegalOrganizationFormTemplateFields, value: string): LegalOrganizationFormTemplateFields;
+    getServiceType(fields: LegalOrganizationFormTemplateFields): string | undefined;
     setServiceUrl(fields: LegalOrganizationFormTemplateFields, value: string): LegalOrganizationFormTemplateFields;
     getServiceUrl(fields: LegalOrganizationFormTemplateFields): string | undefined;
     /**
@@ -136,6 +140,8 @@ export interface LegalOrganizationOnboardingEditor {
     getServiceCategory(): string | undefined;
     setServiceIdentifier(value: string): LegalOrganizationOnboardingEditor;
     getServiceIdentifier(): string | undefined;
+    setServiceType(value: string): LegalOrganizationOnboardingEditor;
+    getServiceType(): string | undefined;
     setServiceUrl(value: string): LegalOrganizationOnboardingEditor;
     getServiceUrl(): string | undefined;
     setTenantAlias(value: string): LegalOrganizationOnboardingEditor;

package/dist/utils/legal-organization-onboarding-editor.js

@@ -51,6 +51,8 @@ function createEditorFromFacade(facade, initial) {
         getServiceCategory() { return facade.getServiceCategory(formFields); },
         setServiceIdentifier(value) { formFields = facade.setServiceIdentifier(formFields, value); return editor; },
         getServiceIdentifier() { return facade.getServiceIdentifier(formFields); },
+        setServiceType(value) { formFields = facade.setServiceType(formFields, value); return editor; },
+        getServiceType() { return facade.getServiceType(formFields); },
         setServiceUrl(value) { formFields = facade.setServiceUrl(formFields, value); return editor; },
         getServiceUrl() { return facade.getServiceUrl(formFields); },
         setTenantAlias(value) { formFields = facade.setTenantAlias(formFields, value); return editor; },
@@ -133,6 +135,12 @@ export function createLegalOrganizationOnboardingFacade() {
         getServiceIdentifier(fields) {
             return normalizeOptionalText(fields.serviceIdentifier);
         },
+        setServiceType(fields, value) {
+            return patchFields(fields, { serviceType: normalizeText(value) });
+        },
+        getServiceType(fields) {
+            return normalizeOptionalText(fields.serviceType);
+        },
         setServiceUrl(fields, value) {
             return patchFields(fields, { serviceUrl: normalizeText(value) });
         },
@@ -176,6 +184,9 @@ export function createLegalOrganizationOnboardingFacade() {
             if (normalizeOptionalText(fields.serviceIdentifier)) {
                 claims[ClaimsServiceSchemaorg.identifier] = normalizeText(fields.serviceIdentifier);
             }
+            if (normalizeOptionalText(fields.serviceType)) {
+                claims[ClaimsServiceSchemaorg.serviceType] = normalizeText(fields.serviceType);
+            }
             if (normalizeOptionalText(fields.serviceUrl)) {
                 claims[ClaimsServiceSchemaorg.url] = normalizeText(fields.serviceUrl);
             }
@@ -236,6 +247,14 @@ export function createLegalOrganizationOnboardingFacade() {
                     field: 'serviceCategory',
                 });
             }
+            if (!normalizeOptionalText(fields.serviceType)) {
+                issues.push({
+                    severity: 'error',
+                    code: 'missing-service-type',
+                    message: 'serviceType is required because GW authorizes activation capabilities from it.',
+                    field: 'serviceType',
+                });
+            }
             if (!normalizeOptionalText(fields.controllerRole)) {
                 issues.push({
                     severity: 'warning',

package/package.json

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