@nmshd/consumption 1.0.5 → 1.0.9
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.
- package/dist/buildInformation.js +4 -4
- package/dist/modules/index.d.ts +0 -1
- package/dist/modules/index.js +0 -1
- package/dist/modules/index.js.map +1 -1
- package/dist/modules/relationships/RelationshipInfoController.js +9 -3
- package/dist/modules/relationships/RelationshipInfoController.js.map +1 -1
- package/dist/modules/relationships/RelationshipInfoUtil.d.ts +15 -0
- package/dist/modules/relationships/{SingleRelationshipController.js → RelationshipInfoUtil.js} +53 -90
- package/dist/modules/relationships/RelationshipInfoUtil.js.map +1 -0
- package/dist/modules/relationships/local/RelationshipInfo.js +1 -1
- package/dist/modules/relationships/local/RelationshipInfo.js.map +1 -1
- package/lib-web/nmshd.consumption.js +71 -103
- package/lib-web/nmshd.consumption.js.map +1 -1
- package/lib-web/nmshd.consumption.min.js +1 -1
- package/lib-web/nmshd.consumption.min.js.map +1 -1
- package/package.json +24 -24
- package/dist/modules/relationships/SingleRelationshipController.d.ts +0 -21
- package/dist/modules/relationships/SingleRelationshipController.js.map +0 -1
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: "1.0.
|
|
10
|
-
build: "
|
|
11
|
-
date: "2021-
|
|
12
|
-
commit: "
|
|
9
|
+
version: "1.0.9",
|
|
10
|
+
build: "11",
|
|
11
|
+
date: "2021-12-21T13:20:41+00:00",
|
|
12
|
+
commit: "8c9ee503dff9ab6d92e5c9316a2e1bc94308a719",
|
|
13
13
|
dependencies: {},
|
|
14
14
|
libraries: {
|
|
15
15
|
transport: transport_1.buildInformation,
|
package/dist/modules/index.d.ts
CHANGED
|
@@ -6,7 +6,6 @@ export * from "./relationships/local/RelationshipAttribute";
|
|
|
6
6
|
export * from "./relationships/local/RelationshipInfo";
|
|
7
7
|
export * from "./relationships/local/RelationshipTheme";
|
|
8
8
|
export * from "./relationships/RelationshipInfoController";
|
|
9
|
-
export * from "./relationships/SingleRelationshipController";
|
|
10
9
|
export * from "./requests/local/ConsumptionRequest";
|
|
11
10
|
export * from "./requests/RequestsController";
|
|
12
11
|
export * from "./settings/local/Setting";
|
package/dist/modules/index.js
CHANGED
|
@@ -18,7 +18,6 @@ __exportStar(require("./relationships/local/RelationshipAttribute"), exports);
|
|
|
18
18
|
__exportStar(require("./relationships/local/RelationshipInfo"), exports);
|
|
19
19
|
__exportStar(require("./relationships/local/RelationshipTheme"), exports);
|
|
20
20
|
__exportStar(require("./relationships/RelationshipInfoController"), exports);
|
|
21
|
-
__exportStar(require("./relationships/SingleRelationshipController"), exports);
|
|
22
21
|
__exportStar(require("./requests/local/ConsumptionRequest"), exports);
|
|
23
22
|
__exportStar(require("./requests/RequestsController"), exports);
|
|
24
23
|
__exportStar(require("./settings/local/Setting"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAA4D;AAC5D,0EAAuD;AACvD,4DAAyC;AACzC,uDAAoC;AACpC,8EAA2D;AAC3D,yEAAsD;AACtD,0EAAuD;AACvD,6EAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAA4D;AAC5D,0EAAuD;AACvD,4DAAyC;AACzC,uDAAoC;AACpC,8EAA2D;AAC3D,yEAAsD;AACtD,0EAAuD;AACvD,6EAA0D;AAC1D,sEAAmD;AACnD,gEAA6C;AAC7C,2DAAwC;AACxC,gEAA6C;AAC7C,iEAA8C;AAC9C,sEAAmD;AACnD,yDAAsC;AACtC,gEAA6C"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RelationshipInfoController = void 0;
|
|
4
4
|
const consumption_1 = require("../../consumption");
|
|
5
5
|
const RelationshipInfo_1 = require("./local/RelationshipInfo");
|
|
6
|
+
const RelationshipInfoUtil_1 = require("./RelationshipInfoUtil");
|
|
6
7
|
class RelationshipInfoController extends consumption_1.ConsumptionBaseController {
|
|
7
8
|
constructor(parent) {
|
|
8
9
|
super(consumption_1.ConsumptionControllerName.RelationshipInfoController, parent);
|
|
@@ -18,15 +19,20 @@ class RelationshipInfoController extends consumption_1.ConsumptionBaseController
|
|
|
18
19
|
}
|
|
19
20
|
async getRelationshipInfoByRelationship(relationshipId) {
|
|
20
21
|
const result = await this.relationshipInfo.findOne({ relationshipId: relationshipId.toString() });
|
|
21
|
-
|
|
22
|
+
if (result) {
|
|
23
|
+
return await RelationshipInfo_1.RelationshipInfo.from(result);
|
|
24
|
+
}
|
|
25
|
+
const info = await new RelationshipInfoUtil_1.RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId);
|
|
26
|
+
await this.relationshipInfo.create(info);
|
|
27
|
+
return info;
|
|
22
28
|
}
|
|
23
29
|
async getRelationshipInfos(query) {
|
|
24
30
|
const items = await this.relationshipInfo.find(query);
|
|
25
31
|
return await this.parseArray(items, RelationshipInfo_1.RelationshipInfo);
|
|
26
32
|
}
|
|
27
33
|
async createRelationshipInfo(relationshipInfo) {
|
|
28
|
-
const
|
|
29
|
-
if (
|
|
34
|
+
const exists = await this.relationshipInfo.exists({ relationshipId: relationshipInfo.relationshipId });
|
|
35
|
+
if (exists) {
|
|
30
36
|
throw consumption_1.ConsumptionErrors.relationshipInfo.relationshipInfoExists(relationshipInfo.relationshipId.toString());
|
|
31
37
|
}
|
|
32
38
|
await this.relationshipInfo.create(relationshipInfo);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipInfoController.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoController.ts"],"names":[],"mappings":";;;AACA,mDAA2G;AAE3G,+DAA2D;
|
|
1
|
+
{"version":3,"file":"RelationshipInfoController.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoController.ts"],"names":[],"mappings":";;;AACA,mDAA2G;AAE3G,+DAA2D;AAC3D,iEAA6D;AAE7D,MAAa,0BAA2B,SAAQ,uCAAyB;IAGrE,YAAmB,MAA6B;QAC5C,KAAK,CAAC,uCAAyB,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAA;IACvE,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAA;QACzG,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,EAAU;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9D,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,mCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,CAAC;IAEM,KAAK,CAAC,iCAAiC,CAAC,cAAsB;QACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAEjG,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,mCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;SAC7C;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,2CAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAA;QACtG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,KAAW;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACrD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAmB,KAAK,EAAE,mCAAgB,CAAC,CAAA;IAC3E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAA;QACtG,IAAI,MAAM,EAAE;YACR,MAAM,+BAAiB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC9G;QAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACpD,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5F,IAAI,CAAC,mBAAmB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAChD;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAA;IAC7E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACxD,CAAC;CACJ;AAzDD,gEAyDC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { ILogger } from "@js-soft/logging-abstractions";
|
|
2
|
+
import { CoreId } from "@nmshd/transport";
|
|
3
|
+
import { ConsumptionController } from "../../consumption/ConsumptionController";
|
|
4
|
+
import { RelationshipInfo } from "./local/RelationshipInfo";
|
|
5
|
+
export declare class RelationshipInfoUtil {
|
|
6
|
+
private readonly parent;
|
|
7
|
+
protected _log: ILogger;
|
|
8
|
+
get log(): ILogger;
|
|
9
|
+
constructor(parent: ConsumptionController);
|
|
10
|
+
createInitialRelationshipInfo(id: CoreId): Promise<RelationshipInfo>;
|
|
11
|
+
private getTitle;
|
|
12
|
+
private createRelationshipInfo;
|
|
13
|
+
private parseTemplateBody;
|
|
14
|
+
private parseCreationRequest;
|
|
15
|
+
}
|
package/dist/modules/relationships/{SingleRelationshipController.js → RelationshipInfoUtil.js}
RENAMED
|
@@ -1,110 +1,77 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.RelationshipInfoUtil = void 0;
|
|
4
4
|
const content_1 = require("@nmshd/content");
|
|
5
5
|
const transport_1 = require("@nmshd/transport");
|
|
6
6
|
const consumption_1 = require("../../consumption");
|
|
7
7
|
const SharedItem_1 = require("../sharedItems/local/SharedItem");
|
|
8
8
|
const RelationshipAttribute_1 = require("./local/RelationshipAttribute");
|
|
9
9
|
const RelationshipInfo_1 = require("./local/RelationshipInfo");
|
|
10
|
-
class
|
|
10
|
+
class RelationshipInfoUtil {
|
|
11
11
|
constructor(parent) {
|
|
12
|
-
|
|
12
|
+
this.parent = parent;
|
|
13
|
+
this._log = transport_1.TransportLoggerFactory.getLogger(RelationshipInfoUtil);
|
|
13
14
|
}
|
|
14
|
-
get
|
|
15
|
-
return this.
|
|
15
|
+
get log() {
|
|
16
|
+
return this._log;
|
|
16
17
|
}
|
|
17
|
-
|
|
18
|
-
return this._info;
|
|
19
|
-
}
|
|
20
|
-
get attributeMap() {
|
|
21
|
-
return this._attributeMap;
|
|
22
|
-
}
|
|
23
|
-
async initWithRelationshipId(id) {
|
|
18
|
+
async createInitialRelationshipInfo(id) {
|
|
24
19
|
const relationship = await this.parent.accountController.relationships.getRelationship(id);
|
|
25
20
|
if (!relationship) {
|
|
26
21
|
throw transport_1.TransportErrors.general.recordNotFound(transport_1.Relationship, id.toString()).logWith(this._log);
|
|
27
22
|
}
|
|
28
|
-
return await this.initWithRelationship(relationship);
|
|
29
|
-
}
|
|
30
|
-
async initWithRelationship(relationship) {
|
|
31
|
-
await super.init();
|
|
32
|
-
this._relationship = relationship;
|
|
33
|
-
const info = await this.parent.relationshipInfo.getRelationshipInfoByRelationship(this.relationship.id);
|
|
34
|
-
if (!info) {
|
|
35
|
-
await this.initialFill();
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
const attributeMap = new Map();
|
|
39
|
-
for (const item of info.attributes) {
|
|
40
|
-
attributeMap.set(item.name, item);
|
|
41
|
-
}
|
|
42
|
-
this._attributeMap = attributeMap;
|
|
43
|
-
this._info = info;
|
|
44
|
-
}
|
|
45
|
-
return this;
|
|
46
|
-
}
|
|
47
|
-
async initialFill() {
|
|
48
|
-
const relationship = await this.parent.accountController.relationships.getRelationship(this._relationship.id);
|
|
49
|
-
if (!relationship) {
|
|
50
|
-
throw transport_1.TransportErrors.general
|
|
51
|
-
.recordNotFound(transport_1.Relationship, this._relationship.id.toString())
|
|
52
|
-
.logWith(this._log);
|
|
53
|
-
}
|
|
54
|
-
this._relationship = relationship;
|
|
55
23
|
const template = await this.parent.accountController.relationshipTemplates.getRelationshipTemplate(relationship.cache.template.id);
|
|
56
24
|
if (!template) {
|
|
57
25
|
throw transport_1.TransportErrors.general
|
|
58
26
|
.recordNotFound(transport_1.RelationshipTemplate, relationship.cache.template.id.toString())
|
|
59
27
|
.logWith(this._log);
|
|
60
28
|
}
|
|
61
|
-
await this.parseTemplateBody(template);
|
|
62
|
-
await this.parseCreationRequest();
|
|
63
|
-
|
|
64
|
-
return this;
|
|
29
|
+
await this.parseTemplateBody(relationship, template);
|
|
30
|
+
await this.parseCreationRequest(relationship);
|
|
31
|
+
return await this.createRelationshipInfo(relationship);
|
|
65
32
|
}
|
|
66
|
-
getTitle() {
|
|
33
|
+
getTitle(relationship, attributeMap) {
|
|
67
34
|
var _a, _b, _c, _d, _e, _f;
|
|
68
|
-
let title =
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
const gender = (_d =
|
|
73
|
-
const orgname = (_e =
|
|
74
|
-
const
|
|
75
|
-
if (
|
|
76
|
-
title =
|
|
35
|
+
let title = relationship.peer.address.toString().substring(3, 9);
|
|
36
|
+
const thingName = (_a = attributeMap.get("Thing.name")) === null || _a === void 0 ? void 0 : _a.content.value;
|
|
37
|
+
const givenName = (_b = attributeMap.get("Person.givenName")) === null || _b === void 0 ? void 0 : _b.content.value;
|
|
38
|
+
const familyName = (_c = attributeMap.get("Person.familyName")) === null || _c === void 0 ? void 0 : _c.content.value;
|
|
39
|
+
const gender = (_d = attributeMap.get("Person.gender")) === null || _d === void 0 ? void 0 : _d.content.value;
|
|
40
|
+
const orgname = (_e = attributeMap.get("Organization.name")) === null || _e === void 0 ? void 0 : _e.content.value;
|
|
41
|
+
const legalName = (_f = attributeMap.get("Organization.legalname")) === null || _f === void 0 ? void 0 : _f.content.value;
|
|
42
|
+
if (thingName) {
|
|
43
|
+
title = thingName;
|
|
77
44
|
}
|
|
78
|
-
else if (
|
|
79
|
-
title = `${
|
|
45
|
+
else if (givenName && familyName) {
|
|
46
|
+
title = `${givenName} ${familyName}`;
|
|
80
47
|
}
|
|
81
|
-
else if (
|
|
82
|
-
title =
|
|
48
|
+
else if (givenName) {
|
|
49
|
+
title = givenName;
|
|
50
|
+
}
|
|
51
|
+
else if (familyName && gender) {
|
|
52
|
+
title = `i18n://salutation.gender.${gender} ${familyName}`;
|
|
83
53
|
}
|
|
84
54
|
else if (orgname) {
|
|
85
55
|
title = orgname;
|
|
86
56
|
}
|
|
87
|
-
else if (
|
|
88
|
-
title =
|
|
57
|
+
else if (legalName) {
|
|
58
|
+
title = legalName;
|
|
89
59
|
}
|
|
90
60
|
return title;
|
|
91
61
|
}
|
|
92
|
-
async
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
});
|
|
104
|
-
info = await this.parent.relationshipInfo.createRelationshipInfo(info);
|
|
105
|
-
}
|
|
62
|
+
async createRelationshipInfo(relationship) {
|
|
63
|
+
const peerAddress = relationship.peer.address;
|
|
64
|
+
const truncatedAddress = peerAddress.address.substring(3, 9);
|
|
65
|
+
let info = await RelationshipInfo_1.RelationshipInfo.from({
|
|
66
|
+
attributes: [],
|
|
67
|
+
id: await consumption_1.ConsumptionIds.relationshipInfo.generate(),
|
|
68
|
+
isPinned: false,
|
|
69
|
+
relationshipId: relationship.id,
|
|
70
|
+
title: truncatedAddress
|
|
71
|
+
});
|
|
72
|
+
info = await this.parent.relationshipInfo.createRelationshipInfo(info);
|
|
106
73
|
const items = await this.parent.sharedItems.getSharedItems({
|
|
107
|
-
sharedBy:
|
|
74
|
+
sharedBy: relationship.peer.address.toString()
|
|
108
75
|
});
|
|
109
76
|
const attributes = [];
|
|
110
77
|
const attributeMap = new Map();
|
|
@@ -119,14 +86,13 @@ class SingleRelationshipController extends consumption_1.ConsumptionBaseControll
|
|
|
119
86
|
attributeMap.set(relAttr.name, relAttr);
|
|
120
87
|
}
|
|
121
88
|
}
|
|
122
|
-
this._attributeMap = attributeMap;
|
|
123
89
|
info.attributes = attributes;
|
|
124
|
-
const title = this.getTitle();
|
|
90
|
+
const title = this.getTitle(relationship, attributeMap);
|
|
125
91
|
info.title = title;
|
|
126
92
|
await this.parent.relationshipInfo.updateRelationshipInfo(info);
|
|
127
93
|
return info;
|
|
128
94
|
}
|
|
129
|
-
async parseTemplateBody(template) {
|
|
95
|
+
async parseTemplateBody(relationship, template) {
|
|
130
96
|
if (!template.cache) {
|
|
131
97
|
throw transport_1.TransportErrors.general.cacheEmpty(transport_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
|
|
132
98
|
}
|
|
@@ -138,9 +104,9 @@ class SingleRelationshipController extends consumption_1.ConsumptionBaseControll
|
|
|
138
104
|
const sharedAt = template.cache.createdAt;
|
|
139
105
|
const sharedBy = isTemplator
|
|
140
106
|
? this.parent.accountController.identity.address
|
|
141
|
-
:
|
|
107
|
+
: relationship.peer.address;
|
|
142
108
|
const sharedWith = isTemplator
|
|
143
|
-
?
|
|
109
|
+
? relationship.peer.address
|
|
144
110
|
: this.parent.accountController.identity.address;
|
|
145
111
|
for (const attribute of attributes) {
|
|
146
112
|
const sharedItem = await SharedItem_1.SharedItem.from({
|
|
@@ -157,17 +123,14 @@ class SingleRelationshipController extends consumption_1.ConsumptionBaseControll
|
|
|
157
123
|
}
|
|
158
124
|
}
|
|
159
125
|
}
|
|
160
|
-
async parseCreationRequest() {
|
|
161
|
-
const request =
|
|
126
|
+
async parseCreationRequest(relationship) {
|
|
127
|
+
const request = relationship.cache.creationChange.request;
|
|
162
128
|
if (!request.content) {
|
|
163
129
|
const error = new Error("error.consumption.noRequestContent");
|
|
164
130
|
this._log.error(error);
|
|
165
131
|
throw error;
|
|
166
132
|
}
|
|
167
|
-
|
|
168
|
-
if (this.parent.accountController.identity.isMe(request.createdBy)) {
|
|
169
|
-
isRequestor = true;
|
|
170
|
-
}
|
|
133
|
+
const isRequestor = this.parent.accountController.identity.isMe(request.createdBy);
|
|
171
134
|
if (request.content instanceof content_1.RelationshipCreationChangeRequestBody) {
|
|
172
135
|
const body = request.content;
|
|
173
136
|
const attributes = body.sharedAttributes;
|
|
@@ -175,9 +138,9 @@ class SingleRelationshipController extends consumption_1.ConsumptionBaseControll
|
|
|
175
138
|
const sharedAt = request.createdAt;
|
|
176
139
|
const sharedBy = isRequestor
|
|
177
140
|
? this.parent.accountController.identity.address
|
|
178
|
-
:
|
|
141
|
+
: relationship.peer.address;
|
|
179
142
|
const sharedWith = isRequestor
|
|
180
|
-
?
|
|
143
|
+
? relationship.peer.address
|
|
181
144
|
: this.parent.accountController.identity.address;
|
|
182
145
|
for (const attribute of attributes) {
|
|
183
146
|
const sharedItem = await SharedItem_1.SharedItem.from({
|
|
@@ -186,7 +149,7 @@ class SingleRelationshipController extends consumption_1.ConsumptionBaseControll
|
|
|
186
149
|
sharedAt: sharedAt,
|
|
187
150
|
sharedBy: sharedBy,
|
|
188
151
|
sharedWith: sharedWith,
|
|
189
|
-
reference:
|
|
152
|
+
reference: relationship.id,
|
|
190
153
|
expiresAt: attribute.validTo
|
|
191
154
|
});
|
|
192
155
|
await this.parent.sharedItems.createSharedItem(sharedItem);
|
|
@@ -198,5 +161,5 @@ class SingleRelationshipController extends consumption_1.ConsumptionBaseControll
|
|
|
198
161
|
}
|
|
199
162
|
}
|
|
200
163
|
}
|
|
201
|
-
exports.
|
|
202
|
-
//# sourceMappingURL=
|
|
164
|
+
exports.RelationshipInfoUtil = RelationshipInfoUtil;
|
|
165
|
+
//# sourceMappingURL=RelationshipInfoUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RelationshipInfoUtil.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ let RelationshipInfo = RelationshipInfo_1 = class RelationshipInfo extends trans
|
|
|
41
41
|
relationshipId: relationship.id,
|
|
42
42
|
attributes: [],
|
|
43
43
|
isPinned: false,
|
|
44
|
-
title: relationship.peer.address.address.
|
|
44
|
+
title: relationship.peer.address.address.substring(3, 9)
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
return await RelationshipInfo_1.from(relationship.metadata);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipInfo.js","sourceRoot":"","sources":["../../../../src/modules/relationships/local/RelationshipInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8D;AAC9D,gDAAyG;AACzG,uDAAyC;AACzC,sDAAqD;AACrD,mEAAuF;AACvF,2DAA2E;AAc3E,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,8BAAkB;IAAxD;;QACoB,wBAAmB,GAAG;YAClC,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;YACjD,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACxC,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;YAC9C,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;SAC3C,CAAA;QAEe,uBAAkB,GAAG;YACjC,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC3C,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5C,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;SACrD,CAAA;IAkDL,CAAC;IAhBU,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAA0B;QAC3D,IAAI,OAAO,YAAY,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC9C,OAAO,MAAM,kBAAgB,CAAC,IAAI,CAAC;gBAC/B,EAAE,EAAE,MAAM,4BAAc,CAAC,gBAAgB,CAAC,QAAQ,EAAE;gBACpD,cAAc,EAAE,YAAY,CAAC,EAAE;gBAC/B,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"RelationshipInfo.js","sourceRoot":"","sources":["../../../../src/modules/relationships/local/RelationshipInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8D;AAC9D,gDAAyG;AACzG,uDAAyC;AACzC,sDAAqD;AACrD,mEAAuF;AACvF,2DAA2E;AAc3E,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,8BAAkB;IAAxD;;QACoB,wBAAmB,GAAG;YAClC,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;YACjD,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACxC,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;YAC9C,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;SAC3C,CAAA;QAEe,uBAAkB,GAAG;YACjC,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC3C,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5C,IAAA,yBAAM,EAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;SACrD,CAAA;IAkDL,CAAC;IAhBU,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAA0B;QAC3D,IAAI,OAAO,YAAY,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC9C,OAAO,MAAM,kBAAgB,CAAC,IAAI,CAAC;gBAC/B,EAAE,EAAE,MAAM,4BAAc,CAAC,gBAAgB,CAAC,QAAQ,EAAE;gBACpD,cAAc,EAAE,YAAY,CAAC,EAAE;gBAC/B,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC;aAC3D,CAAC,CAAA;SACL;QACD,OAAO,MAAM,kBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAwB;QAC7C,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,kBAAgB,CAAC,CAAA;IACrD,CAAC;CACJ,CAAA;AA9CG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACW,kBAAM;wDAAA;AAI7B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,IAAI,EAAE,6CAAqB,EAAE,CAAC;;oDACD;AAI1C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;kDACY;AAIxB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;mDACa;AAIzB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;+CACQ;AAIpB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;yDACmB;AAI/B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;qDACe;AAI3B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACG,qCAAiB;+CAAA;AA9CvB,gBAAgB;IAD5B,IAAA,gBAAI,EAAC,kBAAkB,CAAC;GACZ,gBAAgB,CAgE5B;AAhEY,4CAAgB"}
|