@nmshd/consumption 2.0.0-alpha.26 → 2.0.0-alpha.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/dist/buildInformation.js +4 -4
  2. package/dist/modules/attributes/LocalAttributesController.js +4 -4
  3. package/dist/modules/attributes/LocalAttributesController.js.map +1 -1
  4. package/dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.d.ts +6 -3
  5. package/dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.js +6 -1
  6. package/dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.js.map +1 -1
  7. package/dist/modules/attributes/local/LocalAttribute.d.ts +4 -2
  8. package/dist/modules/attributes/local/LocalAttribute.js +8 -2
  9. package/dist/modules/attributes/local/LocalAttribute.js.map +1 -1
  10. package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.d.ts +1 -1
  11. package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js +25 -8
  12. package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js.map +1 -1
  13. package/dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js +2 -2
  14. package/dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js.map +1 -1
  15. package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js +2 -2
  16. package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js.map +1 -1
  17. package/dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js +3 -2
  18. package/dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js.map +1 -1
  19. package/lib-web/nmshd.consumption.js +54 -25
  20. package/lib-web/nmshd.consumption.js.map +1 -1
  21. package/lib-web/nmshd.consumption.min.js +1 -1
  22. package/lib-web/nmshd.consumption.min.js.map +1 -1
  23. package/package.json +2 -2
package/dist/buildInformation.js CHANGED
@@ -6,10 +6,10 @@ const content_1 = require("@nmshd/content");
6
6
  const crypto_1 = require("@nmshd/crypto");
7
7
  const transport_1 = require("@nmshd/transport");
8
8
  exports.buildInformation = {
9
- version: "2.0.0-alpha.26",
10
- build: "46",
11
- date: "2022-07-06T13:53:17+00:00",
12
- commit: "b07ccf5a6db88a9deae7622e1b57a00d3dc5f21b",
9
+ version: "2.0.0-alpha.27",
10
+ build: "47",
11
+ date: "2022-07-07T08:22:46+00:00",
12
+ commit: "bffe38f5ede2e159089b02aaba7b18f82831bede",
13
13
  dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1","ts-simple-nameof":"^1.3.1"},
14
14
  libraries: {
15
15
  transport: transport_1.buildInformation,
package/dist/modules/attributes/LocalAttributesController.js CHANGED
@@ -121,16 +121,16 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
121
121
  }
122
122
  async createSharedLocalAttributeCopy(params) {
123
123
  const parsedParams = CreateSharedLocalAttributeCopyParams_1.CreateSharedLocalAttributeCopyParams.from(params);
124
- const sourceAttribute = await this.getLocalAttribute(parsedParams.attributeId);
124
+ const sourceAttribute = await this.getLocalAttribute(parsedParams.sourceAttributeId);
125
125
  if (!sourceAttribute) {
126
- throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.attributeId.toString());
126
+ throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.sourceAttributeId.toString());
127
127
  }
128
128
  const shareInfo = LocalAttributeShareInfo_1.LocalAttributeShareInfo.from({
129
129
  peer: parsedParams.peer,
130
130
  requestReference: parsedParams.requestReference,
131
- sourceAttribute: parsedParams.attributeId
131
+ sourceAttribute: parsedParams.sourceAttributeId
132
132
  });
133
- const sharedLocalAttributeCopy = await LocalAttribute_1.LocalAttribute.fromAttribute(sourceAttribute.content, undefined, shareInfo);
133
+ const sharedLocalAttributeCopy = await LocalAttribute_1.LocalAttribute.fromAttribute(sourceAttribute.content, undefined, shareInfo, parsedParams.attributeId);
134
134
  await this.attributes.create(sharedLocalAttributeCopy);
135
135
  return sharedLocalAttributeCopy;
136
136
  }
package/dist/modules/attributes/LocalAttributesController.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LocalAttributesController.js","sourceRoot":"","sources":["../../../src/modules/attributes/LocalAttributesController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LocalAttributesController.js","sourceRoot":"","sources":["../../../src/modules/attributes/LocalAttributesController.ts"],"names":[],"mappings":"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"}
package/dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.d.ts CHANGED
@@ -1,17 +1,20 @@
1
1
  import { ISerializable, Serializable } from "@js-soft/ts-serval";
2
2
  import { CoreAddress, CoreId, ICoreAddress, ICoreId } from "@nmshd/transport";
3
3
  export interface CreateSharedLocalAttributeCopyParamsJSON {
4
- attributeId: string;
4
+ attributeId?: string;
5
+ sourceAttributeId?: string;
5
6
  peer: string;
6
7
  requestReference: string;
7
8
  }
8
9
  export interface ICreateSharedLocalAttributeCopyParams extends ISerializable {
9
- attributeId: ICoreId;
10
+ attributeId?: ICoreId;
11
+ sourceAttributeId: ICoreId;
10
12
  peer: ICoreAddress;
11
13
  requestReference: ICoreId;
12
14
  }
13
15
  export declare class CreateSharedLocalAttributeCopyParams extends Serializable implements ICreateSharedLocalAttributeCopyParams {
14
- attributeId: CoreId;
16
+ attributeId?: CoreId;
17
+ sourceAttributeId: CoreId;
15
18
  peer: CoreAddress;
16
19
  requestReference: CoreId;
17
20
  static from(value: ICreateSharedLocalAttributeCopyParams | CreateSharedLocalAttributeCopyParamsJSON): CreateSharedLocalAttributeCopyParams;
package/dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.js CHANGED
@@ -19,9 +19,14 @@ class CreateSharedLocalAttributeCopyParams extends ts_serval_1.Serializable {
19
19
  }
20
20
  __decorate([
21
21
  (0, ts_serval_1.serialize)(),
22
- (0, ts_serval_1.validate)(),
22
+ (0, ts_serval_1.validate)({ nullable: true }),
23
23
  __metadata("design:type", transport_1.CoreId)
24
24
  ], CreateSharedLocalAttributeCopyParams.prototype, "attributeId", void 0);
25
+ __decorate([
26
+ (0, ts_serval_1.serialize)(),
27
+ (0, ts_serval_1.validate)(),
28
+ __metadata("design:type", transport_1.CoreId)
29
+ ], CreateSharedLocalAttributeCopyParams.prototype, "sourceAttributeId", void 0);
25
30
  __decorate([
26
31
  (0, ts_serval_1.serialize)(),
27
32
  (0, ts_serval_1.validate)(),
package/dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CreateSharedLocalAttributeCopyParams.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/CreateSharedLocalAttributeCopyParams.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAqF;AACrF,gDAA6E;AAc7E,MAAa,oCACT,SAAQ,wBAAY;IAeb,MAAM,CAAC,IAAI,CACd,KAAuF;QAEvF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ;AAfG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACS,kBAAM;yEAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACE,uBAAW;kEAAA;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACc,kBAAM;8EAAA;AAdnC,oFAqBC"}
1
+ {"version":3,"file":"CreateSharedLocalAttributeCopyParams.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/CreateSharedLocalAttributeCopyParams.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAqF;AACrF,gDAA6E;AAgB7E,MAAa,oCACT,SAAQ,wBAAY;IAmBb,MAAM,CAAC,IAAI,CACd,KAAuF;QAEvF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ;AAnBG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACR,kBAAM;yEAAA;AAI3B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACe,kBAAM;+EAAA;AAIhC;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACE,uBAAW;kEAAA;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACc,kBAAM;8EAAA;AAlBnC,oFAyBC"}
package/dist/modules/attributes/local/LocalAttribute.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { IdentityAttribute, IdentityAttributeJSON, IIdentityAttribute, IRelationshipAttribute, RelationshipAttribute, RelationshipAttributeJSON } from "@nmshd/content";
2
- import { CoreDate, CoreId, CoreSynchronizable, ICoreDate, ICoreId, ICoreSynchronizable } from "@nmshd/transport";
2
+ import { CoreAddress, CoreDate, CoreId, CoreSynchronizable, ICoreDate, ICoreId, ICoreSynchronizable } from "@nmshd/transport";
3
3
  import { ILocalAttributeShareInfo, LocalAttributeShareInfo, LocalAttributeShareInfoJSON } from "./LocalAttributeShareInfo";
4
4
  export interface LocalAttributeJSON {
5
5
  content: IdentityAttributeJSON | RelationshipAttributeJSON;
@@ -23,6 +23,8 @@ export declare class LocalAttribute extends CoreSynchronizable implements ILocal
23
23
  succeeds?: CoreId;
24
24
  succeededBy?: CoreId;
25
25
  shareInfo?: LocalAttributeShareInfo;
26
+ isIdentityAttribute(): boolean;
27
+ isOwnedBy(identity: CoreAddress): boolean;
26
28
  static from(value: ILocalAttribute): LocalAttribute;
27
- static fromAttribute(attribute: IIdentityAttribute | IRelationshipAttribute, succeeds?: ICoreId, shareInfo?: ILocalAttributeShareInfo): Promise<LocalAttribute>;
29
+ static fromAttribute(attribute: IIdentityAttribute | IRelationshipAttribute, succeeds?: ICoreId, shareInfo?: ILocalAttributeShareInfo, id?: CoreId): Promise<LocalAttribute>;
28
30
  }
package/dist/modules/attributes/local/LocalAttribute.js CHANGED
@@ -28,13 +28,19 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
28
28
  ];
29
29
  this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((r) => r.content)];
30
30
  }
31
+ isIdentityAttribute() {
32
+ return this.content instanceof content_1.IdentityAttribute;
33
+ }
34
+ isOwnedBy(identity) {
35
+ return this.content.owner.equals(identity);
36
+ }
31
37
  static from(value) {
32
38
  return this.fromAny(value);
33
39
  }
34
- static async fromAttribute(attribute, succeeds, shareInfo) {
40
+ static async fromAttribute(attribute, succeeds, shareInfo, id) {
35
41
  return this.from({
42
+ id: id ?? (await consumption_1.ConsumptionIds.attribute.generate()),
36
43
  content: attribute,
37
- id: await consumption_1.ConsumptionIds.attribute.generate(),
38
44
  createdAt: transport_1.CoreDate.utc(),
39
45
  succeeds: succeeds,
40
46
  shareInfo: shareInfo
package/dist/modules/attributes/local/LocalAttribute.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LocalAttribute.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,4CAOuB;AACvB,gDAAgH;AAChH,uDAAyC;AACzC,sDAAqD;AACrD,uEAIkC;AAmBlC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,8BAAkB;IAAtD;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1C,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YACzC,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;SAC7C,CAAA;QAEwB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAuC5F,CAAC;IAjBU,MAAM,CAAC,IAAI,CAAC,KAAsB;QACrC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAC7B,SAAsD,EACtD,QAAkB,EAClB,SAAoC;QAEpC,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,OAAO,EAAE,SAAS;YAClB,EAAE,EAAE,MAAM,4BAAc,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC7C,SAAS,EAAE,oBAAQ,CAAC,GAAG,EAAE;YACzB,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,SAAS;SACvB,CAAC,CAAA;IACN,CAAC;CACJ,CAAA;AAnCG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,CAAC,2BAAiB,EAAE,+BAAqB,CAAC,EAAE,CAAC;;+CACb;AAIzD;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,oBAAQ;iDAAA;AAI1B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACM,kBAAM;gDAAA;AAIxB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACS,kBAAM;mDAAA;AAI3B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACO,iDAAuB;iDAAA;AA7BjC,cAAc;IAD1B,IAAA,gBAAI,EAAC,gBAAgB,CAAC;GACV,cAAc,CAgD1B;AAhDY,wCAAc"}
1
+ {"version":3,"file":"LocalAttribute.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,4CAOuB;AACvB,gDAQyB;AACzB,uDAAyC;AACzC,sDAAqD;AACrD,uEAIkC;AAmBlC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,8BAAkB;IAAtD;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1C,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YACzC,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;SAC7C,CAAA;QAEwB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAgD5F,CAAC;IA1BU,mBAAmB;QACtB,OAAO,IAAI,CAAC,OAAO,YAAY,2BAAiB,CAAA;IACpD,CAAC;IAEM,SAAS,CAAC,QAAqB;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC9C,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAsB;QACrC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAC7B,SAAsD,EACtD,QAAkB,EAClB,SAAoC,EACpC,EAAW;QAEX,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,4BAAc,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACrD,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,oBAAQ,CAAC,GAAG,EAAE;YACzB,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,SAAS;SACvB,CAAC,CAAA;IACN,CAAC;CACJ,CAAA;AA5CG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,CAAC,2BAAiB,EAAE,+BAAqB,CAAC,EAAE,CAAC;;+CACb;AAIzD;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,oBAAQ;iDAAA;AAI1B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACM,kBAAM;gDAAA;AAIxB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACS,kBAAM;mDAAA;AAI3B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACO,iDAAuB;iDAAA;AA7BjC,cAAc;IAD1B,IAAA,gBAAI,EAAC,gBAAgB,CAAC;GACV,cAAc,CAyD1B;AAzDY,wCAAc"}
package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.d.ts CHANGED
@@ -5,7 +5,7 @@ import { LocalRequestInfo } from "../IRequestItemProcessor";
5
5
  import { ValidationResult } from "../ValidationResult";
6
6
  import { AcceptCreateAttributeRequestItemParametersJSON } from "./AcceptCreateAttributeRequestItemParameters";
7
7
  export declare class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor<CreateAttributeRequestItem, AcceptCreateAttributeRequestItemParametersJSON> {
8
- canCreateOutgoingRequestItem(requestItem: CreateAttributeRequestItem, _request: Request, _recipient: CoreAddress): ValidationResult | Promise<ValidationResult>;
8
+ canCreateOutgoingRequestItem(requestItem: CreateAttributeRequestItem, _request: Request, recipient: CoreAddress): ValidationResult | Promise<ValidationResult>;
9
9
  private canCreateRequestItemWithIdentityAttribute;
10
10
  private canCreateRequestItemWithRelationshipAttribute;
11
11
  accept(requestItem: CreateAttributeRequestItem, _params: AcceptCreateAttributeRequestItemParametersJSON, requestInfo: LocalRequestInfo): Promise<CreateAttributeAcceptResponseItem>;
package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js CHANGED
@@ -6,7 +6,14 @@ const consumption_1 = require("../../../../consumption");
6
6
  const GenericRequestItemProcessor_1 = require("../GenericRequestItemProcessor");
7
7
  const ValidationResult_1 = require("../ValidationResult");
8
8
  class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
9
- canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
9
+ canCreateOutgoingRequestItem(requestItem, _request, recipient) {
10
+ const recipientIsOwnerOfTheAttribute = requestItem.attribute.owner.equals(recipient);
11
+ // When the owner of the Attribute is not the recipient of the Request, this means that
12
+ // we need to set the sourceAttributeId, because we have to set shareInfo as soon as the
13
+ // RequestItem was accepted.
14
+ if (!recipientIsOwnerOfTheAttribute && !requestItem.sourceAttributeId) {
15
+ return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an attribute that is not owned by the recipient."));
16
+ }
10
17
  if (requestItem.attribute instanceof content_1.IdentityAttribute) {
11
18
  return this.canCreateRequestItemWithIdentityAttribute(requestItem);
12
19
  }
@@ -41,13 +48,23 @@ class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
41
48
  if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
42
49
  return;
43
50
  }
44
- /* TODO: in case of an own IdentityAttribute that was sent to the peer, we need to specify a source attribute; but currently we can't find the source attribute, because we don't know the id the user picked when sending the request */
45
- await this.consumptionController.attributes.createPeerLocalAttribute({
46
- id: responseItem.attributeId,
47
- content: requestItem.attribute,
48
- peer: requestInfo.peer,
49
- requestReference: requestInfo.id
50
- });
51
+ if (requestItem.sourceAttributeId) {
52
+ const sourceAttribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.sourceAttributeId);
53
+ await this.consumptionController.attributes.createSharedLocalAttributeCopy({
54
+ attributeId: responseItem.attributeId,
55
+ sourceAttributeId: sourceAttribute.id,
56
+ peer: requestInfo.peer,
57
+ requestReference: requestInfo.id
58
+ });
59
+ }
60
+ else {
61
+ await this.consumptionController.attributes.createPeerLocalAttribute({
62
+ id: responseItem.attributeId,
63
+ content: requestItem.attribute,
64
+ peer: requestInfo.peer,
65
+ requestReference: requestInfo.id
66
+ });
67
+ }
51
68
  }
52
69
  }
53
70
  exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CreateAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.ts"],"names":[],"mappings":";;;AAAA,4CAQuB;AAEvB,yDAA2D;AAC3D,gFAA4E;AAE5E,0DAAsD;AAGtD,MAAa,mCAAoC,SAAQ,yDAGxD;IACmB,4BAA4B,CACxC,WAAuC,EACvC,QAAiB,EACjB,UAAuB;QAEvB,IAAI,WAAW,CAAC,SAAS,YAAY,2BAAiB,EAAE;YACpD,OAAO,IAAI,CAAC,yCAAyC,CAAC,WAAW,CAAC,CAAA;SACrE;QAED,OAAO,IAAI,CAAC,6CAA6C,CAAC,WAAW,CAAC,CAAA;IAC1E,CAAC;IAEO,yCAAyC,CAAC,WAAuC;QACrF,MAAM,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAEhG,IAAI,CAAC,sBAAsB,EAAE;YACzB,OAAO,mCAAgB,CAAC,KAAK,CACzB,+BAAiB,CAAC,QAAQ,CAAC,kBAAkB,CACzC,sEAAsE,oCAA0B,CAAC,IAAI,sBAAsB,qCAA2B,CAAC,IAAI,WAAW,CACzK,CACJ,CAAA;SACJ;QAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;IACrC,CAAC;IAEO,6CAA6C,CAAC,WAAuC;QACzF,MAAM,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAEhG,IAAI,CAAC,sBAAsB,EAAE;YACzB,OAAO,mCAAgB,CAAC,KAAK,CACzB,+BAAiB,CAAC,QAAQ,CAAC,kBAAkB,CACzC,qEAAqE,CACxE,CACJ,CAAA;SACJ;QAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;IACrC,CAAC;IAEe,KAAK,CAAC,MAAM,CACxB,WAAuC,EACvC,OAAuD,EACvD,WAA6B;QAE7B,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,wBAAwB,CAAC;YAC5F,OAAO,EAAE,WAAW,CAAC,SAAS;YAC9B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,gBAAgB,EAAE,WAAW,CAAC,EAAE;SACnC,CAAC,CAAA;QAEF,OAAO,2CAAiC,CAAC,IAAI,CAAC;YAC1C,WAAW,EAAE,kBAAkB,CAAC,EAAE;YAClC,MAAM,EAAE,4BAAkB,CAAC,QAAQ;SACtC,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,yBAAyB,CAC3C,YAAoE,EACpE,WAAuC,EACvC,WAA6B;QAE7B,IAAI,CAAC,CAAC,YAAY,YAAY,2CAAiC,CAAC,EAAE;YAC9D,OAAM;SACT;QAED,yOAAyO;QAEzO,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,wBAAwB,CAAC;YACjE,EAAE,EAAE,YAAY,CAAC,WAAW;YAC5B,OAAO,EAAE,WAAW,CAAC,SAAS;YAC9B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,gBAAgB,EAAE,WAAW,CAAC,EAAE;SACnC,CAAC,CAAA;IACN,CAAC;CACJ;AA/ED,kFA+EC"}
1
+ {"version":3,"file":"CreateAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
package/dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js CHANGED
@@ -50,7 +50,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
50
50
  }
51
51
  async copyExistingAttribute(attributeId, requestInfo) {
52
52
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
53
- attributeId: transport_1.CoreId.from(attributeId),
53
+ sourceAttributeId: transport_1.CoreId.from(attributeId),
54
54
  peer: transport_1.CoreAddress.from(requestInfo.peer),
55
55
  requestReference: transport_1.CoreId.from(requestInfo.id)
56
56
  });
@@ -61,7 +61,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
61
61
  content: attribute
62
62
  });
63
63
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
64
- attributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
64
+ sourceAttributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
65
65
  peer: transport_1.CoreAddress.from(requestInfo.peer),
66
66
  requestReference: transport_1.CoreId.from(requestInfo.id)
67
67
  });
package/dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProposeAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProposeAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js CHANGED
@@ -50,7 +50,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
50
50
  }
51
51
  async copyExistingAttribute(attributeId, requestInfo) {
52
52
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
53
- attributeId: transport_1.CoreId.from(attributeId),
53
+ sourceAttributeId: transport_1.CoreId.from(attributeId),
54
54
  peer: transport_1.CoreAddress.from(requestInfo.peer),
55
55
  requestReference: transport_1.CoreId.from(requestInfo.id)
56
56
  });
@@ -61,7 +61,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
61
61
  content: attribute
62
62
  });
63
63
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
64
- attributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
64
+ sourceAttributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
65
65
  peer: transport_1.CoreAddress.from(requestInfo.peer),
66
66
  requestReference: transport_1.CoreId.from(requestInfo.id)
67
67
  });
package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReadAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.ts"],"names":[],"mappings":";;;;;;AAAA,4CAQuB;AACvB,gDAAuE;AACvE,yDAA2D;AAC3D,6EAAyE;AACzE,gFAA4E;AAE5E,6EAAoD;AACpD,0DAAsD;AACtD,yGAGmD;AAEnD,MAAa,iCAAkC,SAAQ,yDAGtD;IACmB,4BAA4B,CACxC,WAAqC,EACrC,QAAiB,EACjB,SAAsB;QAEtB,MAAM,qBAAqB,GAAG,IAAA,uBAAa,EAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QACtG,IAAI,qBAAqB,CAAC,OAAO,EAAE,EAAE;YACjC,OAAO,qBAAqB,CAAA;SAC/B;QAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;IACrC,CAAC;IAEe,KAAK,CAAC,SAAS,CAC3B,YAAsC,EACtC,MAAoD,EACpD,WAA6B;QAE7B,MAAM,YAAY,GAAG,mFAAwC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE1E,IAAI,YAAY,CAAC,uBAAuB,EAAE,EAAE;YACxC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAChF,YAAY,CAAC,WAAW,CAC3B,CAAA;YAED,IAAI,CAAC,cAAc,EAAE;gBACjB,OAAO,mCAAgB,CAAC,KAAK,CACzB,2BAAe,CAAC,OAAO,CAAC,cAAc,CAAC,+BAAc,EAAE,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CACpF,CAAA;aACJ;YAED,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrE,OAAO,mCAAgB,CAAC,KAAK,CACzB,+BAAiB,CAAC,QAAQ,CAAC,kBAAkB,CACzC,iFAAiF,CACpF,CACJ,CAAA;aACJ;SACJ;QAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;IACrC,CAAC;IAEe,KAAK,CAAC,MAAM,CACxB,YAAsC,EACtC,MAAoD,EACpD,WAA6B;QAE7B,MAAM,YAAY,GAAG,mFAAwC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE1E,IAAI,oBAAoC,CAAA;QACxC,IAAI,YAAY,CAAC,uBAAuB,EAAE,EAAE;YACxC,oBAAoB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;SACjG;aAAM;YACH,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,iBAAkB,EAAE,WAAW,CAAC,CAAA;SACrG;QAED,OAAO,yCAA+B,CAAC,IAAI,CAAC;YACxC,MAAM,EAAE,4BAAkB,CAAC,QAAQ;YACnC,WAAW,EAAE,oBAAoB,CAAC,EAAE;YACpC,SAAS,EAAE,oBAAoB,CAAC,OAAO;SAC1C,CAAC,CAAA;IACN,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,WAAmB,EAAE,WAA6B;QAClF,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,8BAA8B,CAAC;YAC9E,WAAW,EAAE,kBAAM,CAAC,IAAI,CAAC,WAAW,CAAC;YACrC,IAAI,EAAE,uBAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YACxC,gBAAgB,EAAE,kBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;SAChD,CAAC,CAAA;IACN,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC5B,SAAoD,EACpD,WAA6B;QAE7B,IAAI,SAAS,YAAY,2BAAiB,EAAE;YACxC,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,oBAAoB,CAAC;gBAC9F,OAAO,EAAE,SAAS;aACrB,CAAC,CAAA;YAEF,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,8BAA8B,CAAC;gBAC9E,WAAW,EAAE,kBAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACrD,IAAI,EAAE,uBAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBACxC,gBAAgB,EAAE,kBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;aAChD,CAAC,CAAA;SACL;QAED,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,wBAAwB,CAAC;YACxE,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,gBAAgB,EAAE,kBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;SAChD,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,yBAAyB,CAC3C,YAAkE,EAClE,YAAsC,EACtC,WAA6B;QAE7B,IAAI,CAAC,CAAC,YAAY,YAAY,yCAA+B,CAAC,EAAE;YAC5D,OAAM;SACT;QAED,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,wBAAwB,CAAC;YACjE,EAAE,EAAE,YAAY,CAAC,WAAW;YAC5B,OAAO,EAAE,YAAY,CAAC,SAAS;YAC/B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,gBAAgB,EAAE,WAAW,CAAC,EAAE;SACnC,CAAC,CAAA;IACN,CAAC;CACJ;AAnHD,8EAmHC"}
1
+ {"version":3,"file":"ReadAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
package/dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js CHANGED
@@ -50,7 +50,7 @@ class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.G
50
50
  return ValidationResult_1.ValidationResult.success();
51
51
  }
52
52
  async accept(requestItem, _params, _requestInfo) {
53
- const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
53
+ const attribute = (await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId));
54
54
  if (!(await this.isAttributeAlreadyShared(attribute, requestItem.shareWith))) {
55
55
  await this.shareAttribute(attribute, requestItem.shareWith);
56
56
  }
@@ -71,7 +71,8 @@ class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.G
71
71
  async shareAttribute(attribute, shareWith) {
72
72
  const createAttributeRequestItem = content_1.CreateAttributeRequestItem.from({
73
73
  attribute: attribute.content,
74
- mustBeAccepted: true
74
+ mustBeAccepted: true,
75
+ sourceAttributeId: attribute.id
75
76
  });
76
77
  const createAttributeRequest = await this.consumptionController.outgoingRequests.create({
77
78
  peer: shareWith,
package/dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ShareAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ShareAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
package/lib-web/nmshd.consumption.js CHANGED
@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
17
17
  const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
18
18
  const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
19
19
  exports.buildInformation = {
20
- version: "2.0.0-alpha.26",
21
- build: "46",
22
- date: "2022-07-06T13:53:17+00:00",
23
- commit: "b07ccf5a6db88a9deae7622e1b57a00d3dc5f21b",
20
+ version: "2.0.0-alpha.27",
21
+ build: "47",
22
+ date: "2022-07-07T08:22:46+00:00",
23
+ commit: "bffe38f5ede2e159089b02aaba7b18f82831bede",
24
24
  dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1","ts-simple-nameof":"^1.3.1"},
25
25
  libraries: {
26
26
  transport: transport_1.buildInformation,
@@ -426,16 +426,16 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
426
426
  }
427
427
  async createSharedLocalAttributeCopy(params) {
428
428
  const parsedParams = CreateSharedLocalAttributeCopyParams_1.CreateSharedLocalAttributeCopyParams.from(params);
429
- const sourceAttribute = await this.getLocalAttribute(parsedParams.attributeId);
429
+ const sourceAttribute = await this.getLocalAttribute(parsedParams.sourceAttributeId);
430
430
  if (!sourceAttribute) {
431
- throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.attributeId.toString());
431
+ throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.sourceAttributeId.toString());
432
432
  }
433
433
  const shareInfo = LocalAttributeShareInfo_1.LocalAttributeShareInfo.from({
434
434
  peer: parsedParams.peer,
435
435
  requestReference: parsedParams.requestReference,
436
- sourceAttribute: parsedParams.attributeId
436
+ sourceAttribute: parsedParams.sourceAttributeId
437
437
  });
438
- const sharedLocalAttributeCopy = await LocalAttribute_1.LocalAttribute.fromAttribute(sourceAttribute.content, undefined, shareInfo);
438
+ const sharedLocalAttributeCopy = await LocalAttribute_1.LocalAttribute.fromAttribute(sourceAttribute.content, undefined, shareInfo, parsedParams.attributeId);
439
439
  await this.attributes.create(sharedLocalAttributeCopy);
440
440
  return sharedLocalAttributeCopy;
441
441
  }
@@ -596,9 +596,14 @@ class CreateSharedLocalAttributeCopyParams extends ts_serval_1.Serializable {
596
596
  }
597
597
  __decorate([
598
598
  (0, ts_serval_1.serialize)(),
599
- (0, ts_serval_1.validate)(),
599
+ (0, ts_serval_1.validate)({ nullable: true }),
600
600
  __metadata("design:type", transport_1.CoreId)
601
601
  ], CreateSharedLocalAttributeCopyParams.prototype, "attributeId", void 0);
602
+ __decorate([
603
+ (0, ts_serval_1.serialize)(),
604
+ (0, ts_serval_1.validate)(),
605
+ __metadata("design:type", transport_1.CoreId)
606
+ ], CreateSharedLocalAttributeCopyParams.prototype, "sourceAttributeId", void 0);
602
607
  __decorate([
603
608
  (0, ts_serval_1.serialize)(),
604
609
  (0, ts_serval_1.validate)(),
@@ -651,13 +656,19 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
651
656
  ];
652
657
  this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((r) => r.content)];
653
658
  }
659
+ isIdentityAttribute() {
660
+ return this.content instanceof content_1.IdentityAttribute;
661
+ }
662
+ isOwnedBy(identity) {
663
+ return this.content.owner.equals(identity);
664
+ }
654
665
  static from(value) {
655
666
  return this.fromAny(value);
656
667
  }
657
- static async fromAttribute(attribute, succeeds, shareInfo) {
668
+ static async fromAttribute(attribute, succeeds, shareInfo, id) {
658
669
  return this.from({
670
+ id: id ?? (await consumption_1.ConsumptionIds.attribute.generate()),
659
671
  content: attribute,
660
- id: await consumption_1.ConsumptionIds.attribute.generate(),
661
672
  createdAt: transport_1.CoreDate.utc(),
662
673
  succeeds: succeeds,
663
674
  shareInfo: shareInfo
@@ -2067,7 +2078,14 @@ const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist
2067
2078
  const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
2068
2079
  const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
2069
2080
  class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
2070
- canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
2081
+ canCreateOutgoingRequestItem(requestItem, _request, recipient) {
2082
+ const recipientIsOwnerOfTheAttribute = requestItem.attribute.owner.equals(recipient);
2083
+ // When the owner of the Attribute is not the recipient of the Request, this means that
2084
+ // we need to set the sourceAttributeId, because we have to set shareInfo as soon as the
2085
+ // RequestItem was accepted.
2086
+ if (!recipientIsOwnerOfTheAttribute && !requestItem.sourceAttributeId) {
2087
+ return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an attribute that is not owned by the recipient."));
2088
+ }
2071
2089
  if (requestItem.attribute instanceof content_1.IdentityAttribute) {
2072
2090
  return this.canCreateRequestItemWithIdentityAttribute(requestItem);
2073
2091
  }
@@ -2102,13 +2120,23 @@ class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
2102
2120
  if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
2103
2121
  return;
2104
2122
  }
2105
- /* TODO: in case of an own IdentityAttribute that was sent to the peer, we need to specify a source attribute; but currently we can't find the source attribute, because we don't know the id the user picked when sending the request */
2106
- await this.consumptionController.attributes.createPeerLocalAttribute({
2107
- id: responseItem.attributeId,
2108
- content: requestItem.attribute,
2109
- peer: requestInfo.peer,
2110
- requestReference: requestInfo.id
2111
- });
2123
+ if (requestItem.sourceAttributeId) {
2124
+ const sourceAttribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.sourceAttributeId);
2125
+ await this.consumptionController.attributes.createSharedLocalAttributeCopy({
2126
+ attributeId: responseItem.attributeId,
2127
+ sourceAttributeId: sourceAttribute.id,
2128
+ peer: requestInfo.peer,
2129
+ requestReference: requestInfo.id
2130
+ });
2131
+ }
2132
+ else {
2133
+ await this.consumptionController.attributes.createPeerLocalAttribute({
2134
+ id: responseItem.attributeId,
2135
+ content: requestItem.attribute,
2136
+ peer: requestInfo.peer,
2137
+ requestReference: requestInfo.id
2138
+ });
2139
+ }
2112
2140
  }
2113
2141
  }
2114
2142
  exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
@@ -2232,7 +2260,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
2232
2260
  }
2233
2261
  async copyExistingAttribute(attributeId, requestInfo) {
2234
2262
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
2235
- attributeId: transport_1.CoreId.from(attributeId),
2263
+ sourceAttributeId: transport_1.CoreId.from(attributeId),
2236
2264
  peer: transport_1.CoreAddress.from(requestInfo.peer),
2237
2265
  requestReference: transport_1.CoreId.from(requestInfo.id)
2238
2266
  });
@@ -2243,7 +2271,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
2243
2271
  content: attribute
2244
2272
  });
2245
2273
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
2246
- attributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
2274
+ sourceAttributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
2247
2275
  peer: transport_1.CoreAddress.from(requestInfo.peer),
2248
2276
  requestReference: transport_1.CoreId.from(requestInfo.id)
2249
2277
  });
@@ -2394,7 +2422,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
2394
2422
  }
2395
2423
  async copyExistingAttribute(attributeId, requestInfo) {
2396
2424
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
2397
- attributeId: transport_1.CoreId.from(attributeId),
2425
+ sourceAttributeId: transport_1.CoreId.from(attributeId),
2398
2426
  peer: transport_1.CoreAddress.from(requestInfo.peer),
2399
2427
  requestReference: transport_1.CoreId.from(requestInfo.id)
2400
2428
  });
@@ -2405,7 +2433,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
2405
2433
  content: attribute
2406
2434
  });
2407
2435
  return await this.consumptionController.attributes.createSharedLocalAttributeCopy({
2408
- attributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
2436
+ sourceAttributeId: transport_1.CoreId.from(repositoryLocalAttribute.id),
2409
2437
  peer: transport_1.CoreAddress.from(requestInfo.peer),
2410
2438
  requestReference: transport_1.CoreId.from(requestInfo.id)
2411
2439
  });
@@ -2522,7 +2550,7 @@ class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.G
2522
2550
  return ValidationResult_1.ValidationResult.success();
2523
2551
  }
2524
2552
  async accept(requestItem, _params, _requestInfo) {
2525
- const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
2553
+ const attribute = (await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId));
2526
2554
  if (!(await this.isAttributeAlreadyShared(attribute, requestItem.shareWith))) {
2527
2555
  await this.shareAttribute(attribute, requestItem.shareWith);
2528
2556
  }
@@ -2543,7 +2571,8 @@ class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.G
2543
2571
  async shareAttribute(attribute, shareWith) {
2544
2572
  const createAttributeRequestItem = content_1.CreateAttributeRequestItem.from({
2545
2573
  attribute: attribute.content,
2546
- mustBeAccepted: true
2574
+ mustBeAccepted: true,
2575
+ sourceAttributeId: attribute.id
2547
2576
  });
2548
2577
  const createAttributeRequest = await this.consumptionController.outgoingRequests.create({
2549
2578
  peer: shareWith,