@api-client/core 0.18.60 → 0.18.61

package/data/models/example-generator-api.json

@@ -42071,10 +42071,10 @@
 "@id": "#197"
 },
 {
-"@id": "#203"
+"@id": "#200"
 },
 {
-"@id": "#200"
+"@id": "#203"
 },
 {
 "@id": "#206"
@@ -42810,10 +42810,10 @@
 "@id": "#219"
 },
 {
-"@id": "#210"
+"@id": "#219"
 },
 {
-"@id": "#219"
+"@id": "#210"
 },
 {
 "@id": "#213"
@@ -43499,7 +43499,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: 'J'\ndescription: 'Information and communication'\n",
+"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43520,7 +43520,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
+"doc:raw": "code: 'J'\ndescription: 'Information and communication'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44232,7 +44232,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '22'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)22 000000'\n",
+"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44295,7 +44295,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
+"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '22'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)22 000000'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44771,12 +44771,12 @@
 {
 "@id": "#202/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#202",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(5,0)]"
 },
 {
 "@id": "#205/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#205",
-"sourcemaps:value": "[(1,0)-(5,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#208/source-map/lexical/element_0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.18.60",
+  "version": "0.18.61",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/modeling/rules/MatchResourceOwner.ts

@@ -9,13 +9,22 @@ import { observed } from '../../decorators/observed.js'
 export interface MatchResourceOwnerAccessRuleSchema extends AccessRuleSchema {
   type: 'matchResourceOwner'
   /**
-   * The property on the resource that should match the authenticated user's ID.
-   * This is typically the ID of the user who owns the resource.
+   * The property on the resource that references the user's ID (the key in the semantically annotated `User` entity).
+   *
+   * When the current exposed entity has a property annotated with the "ResourceOwnerIdentifier" semantic,
+   * this property should be used. It directly references the user's key.
    *
    * The domain model should annotate this property with the "ResourceOwnerIdentifier" semantic
    * to indicate that it is used for ownership checks.
    */
-  property: string
+  property?: string
+
+  /**
+   * The target for the ownership check.
+   * - `property`: The check is performed against a specific property on the resource (default).
+   * - `user-entity`: The check is performed against the entity itself (used when the entity represents the user).
+   */
+  target?: 'property' | 'user-entity'
 }
 
 /**
@@ -26,18 +35,24 @@ export interface MatchResourceOwnerAccessRuleSchema extends AccessRuleSchema {
 export class MatchResourceOwnerAccessRule extends AccessRule implements MatchResourceOwnerAccessRuleSchema {
   override readonly type: 'matchResourceOwner'
 
-  @observed() accessor property: string
+  @observed() accessor property: string | undefined
+  @observed() accessor target: 'property' | 'user-entity'
 
   constructor(state: Partial<MatchResourceOwnerAccessRuleSchema> = {}) {
     super(state)
     this.type = 'matchResourceOwner'
-    this.property = state.property ?? ''
+    this.property = state.property
+    this.target = state.target ?? 'property'
   }
 
   override toJSON(): MatchResourceOwnerAccessRuleSchema {
-    return {
+    const json: MatchResourceOwnerAccessRuleSchema = {
       ...(super.toJSON() as MatchResourceOwnerAccessRuleSchema),
-      property: this.property,
+      target: this.target,
+    }
+    if (this.property) {
+      json.property = this.property
     }
+    return json
   }
 }

package/tests/unit/modeling/rules/MatchResourceOwner.spec.ts

@@ -5,7 +5,8 @@ test.group('MatchResourceOwnerAccessRule', () => {
   test('initializes with default values', ({ assert }) => {
     const rule = new MatchResourceOwnerAccessRule()
     assert.equal(rule.type, 'matchResourceOwner')
-    assert.equal(rule.property, '')
+    assert.isUndefined(rule.property)
+    assert.equal(rule.target, 'property')
   }).tags(['@modeling', '@rule', '@match-resource-owner'])
 
   test('initializes with provided values', ({ assert }) => {
@@ -13,6 +14,15 @@ test.group('MatchResourceOwnerAccessRule', () => {
 
     assert.equal(rule.type, 'matchResourceOwner')
     assert.equal(rule.property, 'creatorId')
+    assert.equal(rule.target, 'property')
+  }).tags(['@modeling', '@rule', '@match-resource-owner'])
+
+  test('initializes with target user-entity', ({ assert }) => {
+    const rule = new MatchResourceOwnerAccessRule({ target: 'user-entity' })
+
+    assert.equal(rule.type, 'matchResourceOwner')
+    assert.isUndefined(rule.property)
+    assert.equal(rule.target, 'user-entity')
   }).tags(['@modeling', '@rule', '@match-resource-owner'])
 
   test('toJSON returns valid schema', ({ assert }) => {
@@ -21,6 +31,16 @@ test.group('MatchResourceOwnerAccessRule', () => {
 
     assert.equal(json.type, 'matchResourceOwner')
     assert.equal(json.property, 'creatorId')
+    assert.equal(json.target, 'property')
+  }).tags(['@modeling', '@rule', '@match-resource-owner', '@serialization'])
+
+  test('toJSON omits property when undefined', ({ assert }) => {
+    const rule = new MatchResourceOwnerAccessRule({ target: 'user-entity' })
+    const json = rule.toJSON()
+
+    assert.equal(json.type, 'matchResourceOwner')
+    assert.isUndefined(json.property)
+    assert.equal(json.target, 'user-entity')
   }).tags(['@modeling', '@rule', '@match-resource-owner', '@serialization'])
 
   test('notifies change when property changes', async ({ assert }) => {