gdc-common-utils-ts 1.0.2 → 1.0.4

package/__tests__/utils-actor.test.ts

@@ -6,17 +6,41 @@ describe('parseActorFromSub', () => {
   });
 
   it('parses did:web subject with organization, email, and role', () => {
-    const sub = 'did:web:api.acme.org:employee:Doctor1@ACME.org:role:ISCO-08|2211';
+    const sub = 'did:web:api.acme.org:employee:doctor1@acme.org:ISCO-08|2211';
     const parsed = parseActorFromSub(sub);
     expect(parsed.sub).toBe(sub);
     expect(parsed.organization).toBe('did:web:api.acme.org');
-    expect(parsed.email).toBe('doctor1@acme.org');
+    expect(parsed.identifier).toBe('doctor1@acme.org');
     expect(parsed.role).toBe('ISCO-08|2211');
   });
 
+  it('parses did:web subject with role and device uuid', () => {
+    const sub = 'did:web:api.acme.org:employee:doctor1@acme.org:ISCO-08|2211:550e8400-e29b-41d4-a716-446655440000';
+    const parsed = parseActorFromSub(sub);
+    expect(parsed.organization).toBe('did:web:api.acme.org');
+    expect(parsed.identifier).toBe('doctor1@acme.org');
+    expect(parsed.role).toBe('ISCO-08|2211');
+  });
+
+  it('parses family subject with role and device uuid', () => {
+    const sub = 'did:web:api.acme.org:family:zQmHash123:v3-RoleCode|CHILD:550e8400-e29b-41d4-a716-446655440000';
+    const parsed = parseActorFromSub(sub);
+    expect(parsed.organization).toBe('did:web:api.acme.org');
+    expect(parsed.identifier).toBe('zQmHash123');
+    expect(parsed.role).toBe('v3-RoleCode|CHILD');
+  });
+
+  it('parses family subject with ONESELF role and no device uuid', () => {
+    const sub = 'did:web:api.acme.org:family:zQmHash123:v3-RoleCode|ONESELF';
+    const parsed = parseActorFromSub(sub);
+    expect(parsed.organization).toBe('did:web:api.acme.org');
+    expect(parsed.identifier).toBe('zQmHash123');
+    expect(parsed.role).toBe('v3-RoleCode|ONESELF');
+  });
+
   it('parses raw email subject', () => {
     const parsed = parseActorFromSub('  User@Example.com ');
     expect(parsed.sub).toBe('User@Example.com');
-    expect(parsed.email).toBe('user@example.com');
+    expect(parsed.identifier).toBe('user@example.com');
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdc-common-utils-ts",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
@@ -10,7 +10,6 @@
     "@stablelib/base64": "^1.0.1",
     "@stablelib/utf8": "^1.0.2",
     "base-x": "^4.0.0",
-    "multiformats": "^13.0.0",
     "pako": "^2.1.0"
   },
   "scripts": {
@@ -37,11 +36,11 @@
     "@babel/preset-env": "^7.24.0",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.14.10",
+    "@types/pako": "^2.0.2",
     "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.5.4",
-    "@types/pako": "^2.0.2",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.5.4"
   }
 }

package/src/utils/actor.ts

@@ -4,12 +4,14 @@ export type ParsedActor = {
   /**
    * The token subject / authenticated actor identifier (as provided in the token request).
    * Examples:
-   * - did:web:api.acme.org:employee:doctor1@acme.org:role:ISCO-08|2211
-   * - doctor1@acme.org
+   * - did:web:api.acme.org:employee:doctor1@acme.org:ISCO-08|2211
+   * - did:web:api.acme.org:employee:doctor1@acme.org:ISCO-08|2211:<device-uuid>
+   * - did:web:api.acme.org:family:<id>:v3-RoleCode|ONESELF
+   * - did:web:api.acme.org:family:<id>:v3-RoleCode|CHILD:<device-uuid>
    */
   sub: string;
-  /** The employee email if present (either from did:web employee DID or raw email). */
-  email?: string;
+  /** The actor identifier (employee email, familyId, or raw email). */
+  identifier?: string;
   /** The employee role code if present (e.g. "ISCO-08|2211"). */
   role?: string;
   /** The base organization did:web if `sub` is did:web (e.g. "did:web:api.acme.org"). */
@@ -28,25 +30,27 @@ export function parseActorFromSub(sub: string): ParsedActor {
     const host = after.split(':')[0];
     if (host) parsed.organization = `did:web:${host}`;
 
-    // Extract email and role from the canonical employee DID shape:
-    // did:web:<host>:employee:<email>:role:<roleCode>[:device:<uuid>]
+    // Extract email and role from endpoint-style DID shapes:
+    // did:web:<host>:(employee|family):<id>:<roleSystem>|<roleCode>[:<uuid>]
     const parts = after.split(':');
     const employeeIdx = parts.indexOf('employee');
-    if (employeeIdx >= 0 && parts.length > employeeIdx + 1) {
-      const email = parts[employeeIdx + 1];
-      if (email && email.includes('@')) parsed.email = email.toLowerCase();
+    const familyIdx = parts.indexOf('family');
+    const idIdx = employeeIdx >= 0 ? employeeIdx + 1 : familyIdx >= 0 ? familyIdx + 1 : -1;
+    const identifier = idIdx >= 0 ? parts[idIdx] : undefined;
+    if (identifier) {
+      parsed.identifier = identifier.includes('@') ? identifier.toLowerCase() : identifier;
     }
-    const roleIdx = parts.indexOf('role');
-    if (roleIdx >= 0 && parts.length > roleIdx + 1) {
-      parsed.role = parts[roleIdx + 1];
+
+    if (idIdx >= 0 && parts.length > idIdx + 1) {
+      const roleCandidate = parts[idIdx + 1];
+      if (roleCandidate && roleCandidate.includes('|')) parsed.role = roleCandidate;
     }
     return parsed;
   }
 
   // Raw email actor identifier
   if (trimmed.includes('@') && !/\s/.test(trimmed)) {
-    parsed.email = trimmed.toLowerCase();
+    parsed.identifier = trimmed.toLowerCase();
   }
   return parsed;
 }
-