solid-ui 2.4.27-a6ef5829 → 2.4.27-a8ee341e
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/README.md +2 -1
- package/dist/solid-ui.js +480 -432
- package/dist/solid-ui.js.map +1 -1
- package/dist/solid-ui.min.js +1 -1
- package/dist/solid-ui.min.js.map +1 -1
- package/lib/chat/keys.d.ts +7 -0
- package/lib/chat/keys.d.ts.map +1 -1
- package/lib/chat/keys.js +95 -160
- package/lib/chat/keys.js.map +1 -1
- package/lib/chat/message.js +36 -9
- package/lib/chat/message.js.map +1 -1
- package/lib/utils/keyHelpers/accessData.d.ts +10 -0
- package/lib/utils/keyHelpers/accessData.d.ts.map +1 -0
- package/lib/utils/{cryptoKeyHelpers.js → keyHelpers/accessData.js} +67 -69
- package/lib/utils/keyHelpers/accessData.js.map +1 -0
- package/lib/utils/keyHelpers/acl.d.ts +20 -0
- package/lib/utils/keyHelpers/acl.d.ts.map +1 -0
- package/lib/utils/keyHelpers/acl.js +93 -0
- package/lib/utils/keyHelpers/acl.js.map +1 -0
- package/lib/versionInfo.js +2 -2
- package/lib/versionInfo.js.map +1 -1
- package/package.json +1 -1
- package/lib/utils/cryptoKeyHelpers.d.ts +0 -6
- package/lib/utils/cryptoKeyHelpers.d.ts.map +0 -1
- package/lib/utils/cryptoKeyHelpers.js.map +0 -1
package/lib/chat/keys.d.ts
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { NamedNode } from 'rdflib';
|
|
2
2
|
export declare function generatePrivateKey(): string;
|
|
3
3
|
export declare function generatePublicKey(privateKey: string): string;
|
|
4
|
+
/**
|
|
5
|
+
* getPublicKey
|
|
6
|
+
* used for displaying messages in chat, therefore does not
|
|
7
|
+
* create a new key if not found
|
|
8
|
+
* @param webId
|
|
9
|
+
* @returns string | undefined
|
|
10
|
+
*/
|
|
4
11
|
export declare function getPublicKey(webId: NamedNode): Promise<string | undefined>;
|
|
5
12
|
export declare function getPrivateKey(webId: NamedNode): Promise<string>;
|
|
6
13
|
//# sourceMappingURL=keys.d.ts.map
|
package/lib/chat/keys.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/chat/keys.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/chat/keys.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAKlC,wBAAgB,kBAAkB,IAAK,MAAM,CAE5C;AAED,wBAAgB,iBAAiB,CAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAE,KAAK,EAAE,SAAS,+BAUnD;AAED,wBAAsB,aAAa,CAAE,KAAK,EAAE,SAAS,mBA6CpD"}
|
package/lib/chat/keys.js
CHANGED
|
@@ -17,7 +17,8 @@ var _utils = require("@noble/hashes/utils");
|
|
|
17
17
|
var _signature = require("./signature");
|
|
18
18
|
var _solidLogic = require("solid-logic");
|
|
19
19
|
var $rdf = _interopRequireWildcard(require("rdflib"));
|
|
20
|
-
var
|
|
20
|
+
var _accessData = require("../utils/keyHelpers/accessData");
|
|
21
|
+
var _acl = require("../utils/keyHelpers/acl");
|
|
21
22
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
22
23
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
23
24
|
function generatePrivateKey() {
|
|
@@ -26,74 +27,77 @@ function generatePrivateKey() {
|
|
|
26
27
|
function generatePublicKey(privateKey) {
|
|
27
28
|
return (0, _utils.bytesToHex)(_secp256k.schnorr.getPublicKey(privateKey));
|
|
28
29
|
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* getPublicKey
|
|
33
|
+
* used for displaying messages in chat, therefore does not
|
|
34
|
+
* create a new key if not found
|
|
35
|
+
* @param webId
|
|
36
|
+
* @returns string | undefined
|
|
37
|
+
*/
|
|
29
38
|
function getPublicKey(_x) {
|
|
30
39
|
return _getPublicKey.apply(this, arguments);
|
|
31
40
|
}
|
|
32
41
|
function _getPublicKey() {
|
|
33
|
-
_getPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function
|
|
42
|
+
_getPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
|
|
34
43
|
var publicKeyDoc, key;
|
|
35
|
-
return _regenerator["default"].wrap(function
|
|
36
|
-
while (1) switch (
|
|
44
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
45
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
37
46
|
case 0:
|
|
38
|
-
|
|
47
|
+
_context2.next = 2;
|
|
39
48
|
return _solidLogic.store.fetcher.load(webId);
|
|
40
49
|
case 2:
|
|
41
|
-
|
|
42
|
-
return (0,
|
|
50
|
+
_context2.next = 4;
|
|
51
|
+
return (0, _accessData.pubKeyUrl)(webId);
|
|
43
52
|
case 4:
|
|
44
|
-
publicKeyDoc =
|
|
45
|
-
|
|
46
|
-
|
|
53
|
+
publicKeyDoc = _context2.sent;
|
|
54
|
+
_context2.prev = 5;
|
|
55
|
+
_context2.next = 8;
|
|
47
56
|
return _solidLogic.store.fetcher.load(publicKeyDoc);
|
|
48
57
|
case 8:
|
|
49
58
|
// url.href)
|
|
50
59
|
key = _solidLogic.store.any(webId, _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
|
|
51
|
-
return
|
|
60
|
+
return _context2.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
|
|
52
61
|
case 12:
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
return
|
|
62
|
+
_context2.prev = 12;
|
|
63
|
+
_context2.t0 = _context2["catch"](5);
|
|
64
|
+
return _context2.abrupt("return", undefined);
|
|
56
65
|
case 15:
|
|
57
66
|
case "end":
|
|
58
|
-
return
|
|
67
|
+
return _context2.stop();
|
|
59
68
|
}
|
|
60
|
-
},
|
|
69
|
+
}, _callee2, null, [[5, 12]]);
|
|
61
70
|
}));
|
|
62
71
|
return _getPublicKey.apply(this, arguments);
|
|
63
72
|
}
|
|
64
73
|
function getPrivateKey(_x2) {
|
|
65
74
|
return _getPrivateKey.apply(this, arguments);
|
|
66
75
|
}
|
|
67
|
-
/**
|
|
68
|
-
* key container ACL
|
|
69
|
-
* @param me
|
|
70
|
-
* @returns aclBody
|
|
71
|
-
*/
|
|
72
76
|
function _getPrivateKey() {
|
|
73
|
-
_getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function
|
|
77
|
+
_getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId) {
|
|
74
78
|
var publicKeyDoc, privateKeyDoc, publicKey, privateKey, validPublicKey, del, add, newPublicKey, keyContainer;
|
|
75
|
-
return _regenerator["default"].wrap(function
|
|
76
|
-
while (1) switch (
|
|
79
|
+
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
|
80
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
77
81
|
case 0:
|
|
78
|
-
|
|
82
|
+
_context3.next = 2;
|
|
79
83
|
return _solidLogic.store.fetcher.load(webId);
|
|
80
84
|
case 2:
|
|
81
|
-
|
|
82
|
-
return (0,
|
|
85
|
+
_context3.next = 4;
|
|
86
|
+
return (0, _accessData.pubKeyUrl)(webId);
|
|
83
87
|
case 4:
|
|
84
|
-
publicKeyDoc =
|
|
85
|
-
|
|
86
|
-
return (0,
|
|
88
|
+
publicKeyDoc = _context3.sent;
|
|
89
|
+
_context3.next = 7;
|
|
90
|
+
return (0, _accessData.privKeyUrl)(webId);
|
|
87
91
|
case 7:
|
|
88
|
-
privateKeyDoc =
|
|
89
|
-
|
|
90
|
-
return (0,
|
|
92
|
+
privateKeyDoc = _context3.sent;
|
|
93
|
+
_context3.next = 10;
|
|
94
|
+
return (0, _accessData.getExistingPublicKey)(webId, publicKeyDoc);
|
|
91
95
|
case 10:
|
|
92
|
-
publicKey =
|
|
93
|
-
|
|
94
|
-
return (0,
|
|
96
|
+
publicKey = _context3.sent;
|
|
97
|
+
_context3.next = 13;
|
|
98
|
+
return (0, _accessData.getExistingPrivateKey)(webId, privateKeyDoc);
|
|
95
99
|
case 13:
|
|
96
|
-
privateKey =
|
|
100
|
+
privateKey = _context3.sent;
|
|
97
101
|
// is publicKey valid ?
|
|
98
102
|
validPublicKey = true;
|
|
99
103
|
if (privateKey && publicKey !== generatePublicKey(privateKey)) {
|
|
@@ -102,23 +106,23 @@ function _getPrivateKey() {
|
|
|
102
106
|
|
|
103
107
|
// create key pair or repair publicKey
|
|
104
108
|
if (!(!privateKey || !publicKey || !validPublicKey)) {
|
|
105
|
-
|
|
109
|
+
_context3.next = 34;
|
|
106
110
|
break;
|
|
107
111
|
}
|
|
108
112
|
del = [];
|
|
109
113
|
add = []; // if (privateKey) del.push($rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), store.sym(privateKeyDoc)))
|
|
110
114
|
if (privateKey) {
|
|
111
|
-
|
|
115
|
+
_context3.next = 24;
|
|
112
116
|
break;
|
|
113
117
|
}
|
|
114
118
|
// add = []
|
|
115
119
|
privateKey = generatePrivateKey();
|
|
116
120
|
add = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), _solidLogic.store.sym(privateKeyDoc))];
|
|
117
|
-
|
|
121
|
+
_context3.next = 24;
|
|
118
122
|
return saveKey(privateKeyDoc, [], add, webId.uri);
|
|
119
123
|
case 24:
|
|
120
124
|
if (!(!publicKey || !validPublicKey)) {
|
|
121
|
-
|
|
125
|
+
_context3.next = 31;
|
|
122
126
|
break;
|
|
123
127
|
}
|
|
124
128
|
del = [];
|
|
@@ -130,167 +134,98 @@ function _getPrivateKey() {
|
|
|
130
134
|
// update new valid key
|
|
131
135
|
newPublicKey = generatePublicKey(privateKey);
|
|
132
136
|
add = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + 'PublicKey'), $rdf.literal(newPublicKey), _solidLogic.store.sym(publicKeyDoc))];
|
|
133
|
-
|
|
137
|
+
_context3.next = 31;
|
|
134
138
|
return saveKey(publicKeyDoc, del, add);
|
|
135
139
|
case 31:
|
|
136
140
|
keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1);
|
|
137
|
-
|
|
138
|
-
return setAcl(keyContainer, keyContainerAclBody(webId.uri));
|
|
141
|
+
_context3.next = 34;
|
|
142
|
+
return (0, _acl.setAcl)(keyContainer, (0, _acl.keyContainerAclBody)(webId.uri));
|
|
139
143
|
case 34:
|
|
140
|
-
return
|
|
144
|
+
return _context3.abrupt("return", privateKey);
|
|
141
145
|
case 35:
|
|
142
146
|
case "end":
|
|
143
|
-
return
|
|
147
|
+
return _context3.stop();
|
|
144
148
|
}
|
|
145
|
-
},
|
|
149
|
+
}, _callee3);
|
|
146
150
|
}));
|
|
147
151
|
return _getPrivateKey.apply(this, arguments);
|
|
148
152
|
}
|
|
149
|
-
var
|
|
150
|
-
var
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
/**
|
|
155
|
-
* Read only ACL
|
|
156
|
-
* @param keyDoc
|
|
157
|
-
* @param me
|
|
158
|
-
* @returns aclBody
|
|
159
|
-
*/
|
|
160
|
-
var keyAclBody = function keyAclBody(keyDoc, me) {
|
|
161
|
-
var keyAgent = 'acl:agentClass foaf:Agent'; // publicKey
|
|
162
|
-
if (me !== null && me !== void 0 && me.length) keyAgent = "acl:agent <".concat(me, ">"); // privateKey
|
|
163
|
-
var aclBody = "\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n<#Read>\n a acl:Authorization;\n ".concat(keyAgent, ";\n acl:accessTo <").concat(keyDoc.split('/').pop(), ">;\n acl:mode acl:Read.\n");
|
|
164
|
-
return aclBody;
|
|
165
|
-
};
|
|
166
|
-
|
|
167
|
-
/**
|
|
168
|
-
* set ACL
|
|
169
|
-
* @param keyDoc
|
|
170
|
-
* @param aclBody
|
|
171
|
-
*/
|
|
172
|
-
function setAcl(_x3, _x4) {
|
|
173
|
-
return _setAcl.apply(this, arguments);
|
|
174
|
-
}
|
|
175
|
-
/**
|
|
176
|
-
* delete acl if keydoc exists
|
|
177
|
-
* create/edit keyDoc
|
|
178
|
-
* set keyDoc acl
|
|
179
|
-
*/
|
|
180
|
-
function _setAcl() {
|
|
181
|
-
_setAcl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(keyDoc, aclBody) {
|
|
182
|
-
var keyAclDoc, response, aclResponse;
|
|
183
|
-
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
|
184
|
-
while (1) switch (_context3.prev = _context3.next) {
|
|
153
|
+
var deleteKeyAcl = /*#__PURE__*/function () {
|
|
154
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(keyDoc) {
|
|
155
|
+
var keyAclDoc, response;
|
|
156
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
157
|
+
while (1) switch (_context.prev = _context.next) {
|
|
185
158
|
case 0:
|
|
186
|
-
|
|
159
|
+
_context.next = 2;
|
|
187
160
|
return _solidLogic.store.fetcher.load(keyDoc);
|
|
188
161
|
case 2:
|
|
189
|
-
// FIXME: check the Why value on this quad:
|
|
190
|
-
debug.log(_solidLogic.store.statementsMatching(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl')));
|
|
191
162
|
keyAclDoc = _solidLogic.store.any(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl'));
|
|
192
|
-
if (keyAclDoc) {
|
|
193
|
-
|
|
163
|
+
if (!keyAclDoc) {
|
|
164
|
+
_context.next = 16;
|
|
194
165
|
break;
|
|
195
166
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
_context3.prev = 6;
|
|
199
|
-
_context3.next = 9;
|
|
167
|
+
_context.prev = 4;
|
|
168
|
+
_context.next = 7;
|
|
200
169
|
return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
|
|
201
|
-
case
|
|
202
|
-
response =
|
|
170
|
+
case 7:
|
|
171
|
+
response = _context.sent;
|
|
203
172
|
// this may fail if webId is not an owner
|
|
204
173
|
debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
|
|
205
|
-
|
|
174
|
+
_context.next = 16;
|
|
206
175
|
break;
|
|
207
|
-
case
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
if (!(
|
|
211
|
-
|
|
176
|
+
case 11:
|
|
177
|
+
_context.prev = 11;
|
|
178
|
+
_context.t0 = _context["catch"](4);
|
|
179
|
+
if (!(_context.t0.response.status !== 404)) {
|
|
180
|
+
_context.next = 15;
|
|
212
181
|
break;
|
|
213
182
|
}
|
|
214
|
-
throw new Error(
|
|
215
|
-
case
|
|
216
|
-
debug.log('delete ' + keyAclDoc.value + ' ' +
|
|
217
|
-
case
|
|
218
|
-
_context3.next = 20;
|
|
219
|
-
return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
|
|
220
|
-
data: aclBody,
|
|
221
|
-
contentType: 'text/turtle'
|
|
222
|
-
});
|
|
223
|
-
case 20:
|
|
224
|
-
aclResponse = _context3.sent;
|
|
225
|
-
case 21:
|
|
183
|
+
throw new Error(_context.t0);
|
|
184
|
+
case 15:
|
|
185
|
+
debug.log('delete ' + keyAclDoc.value + ' ' + _context.t0.response.status); // should test 404 and 2xx
|
|
186
|
+
case 16:
|
|
226
187
|
case "end":
|
|
227
|
-
return
|
|
188
|
+
return _context.stop();
|
|
228
189
|
}
|
|
229
|
-
},
|
|
190
|
+
}, _callee, null, [[4, 11]]);
|
|
230
191
|
}));
|
|
231
|
-
return
|
|
232
|
-
|
|
233
|
-
|
|
192
|
+
return function deleteKeyAcl(_x3) {
|
|
193
|
+
return _ref.apply(this, arguments);
|
|
194
|
+
};
|
|
195
|
+
}();
|
|
196
|
+
|
|
197
|
+
/**
|
|
198
|
+
* delete acl if keydoc exists
|
|
199
|
+
* create/edit keyDoc
|
|
200
|
+
* set keyDoc acl
|
|
201
|
+
*/
|
|
202
|
+
function saveKey(_x4, _x5, _x6) {
|
|
234
203
|
return _saveKey.apply(this, arguments);
|
|
235
204
|
}
|
|
236
205
|
function _saveKey() {
|
|
237
206
|
_saveKey = (0, _asyncToGenerator2["default"])(function (keyDoc, del, add) {
|
|
238
207
|
var me = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
|
|
239
208
|
return /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
|
|
240
|
-
var
|
|
209
|
+
var aclBody;
|
|
241
210
|
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
|
242
211
|
while (1) switch (_context4.prev = _context4.next) {
|
|
243
212
|
case 0:
|
|
244
213
|
_context4.next = 2;
|
|
245
|
-
return
|
|
214
|
+
return deleteKeyAcl(keyDoc);
|
|
246
215
|
case 2:
|
|
247
|
-
_context4.
|
|
248
|
-
// get keyAcldoc
|
|
249
|
-
keyAclDoc = _solidLogic.store.any(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl'));
|
|
250
|
-
if (!keyAclDoc) {
|
|
251
|
-
_context4.next = 17;
|
|
252
|
-
break;
|
|
253
|
-
}
|
|
254
|
-
_context4.prev = 5;
|
|
255
|
-
_context4.next = 8;
|
|
256
|
-
return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
|
|
257
|
-
case 8:
|
|
258
|
-
response = _context4.sent;
|
|
259
|
-
// this may fail if webId is not an owner
|
|
260
|
-
debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
|
|
261
|
-
_context4.next = 17;
|
|
262
|
-
break;
|
|
263
|
-
case 12:
|
|
264
|
-
_context4.prev = 12;
|
|
265
|
-
_context4.t0 = _context4["catch"](5);
|
|
266
|
-
if (!(_context4.t0.response.status !== 404)) {
|
|
267
|
-
_context4.next = 16;
|
|
268
|
-
break;
|
|
269
|
-
}
|
|
270
|
-
throw new Error(_context4.t0);
|
|
271
|
-
case 16:
|
|
272
|
-
debug.log('delete ' + keyAclDoc.value + ' ' + _context4.t0.response.status); // should test 404 and 2xx
|
|
273
|
-
case 17:
|
|
274
|
-
_context4.next = 19;
|
|
216
|
+
_context4.next = 4;
|
|
275
217
|
return _solidLogic.store.updater.updateMany(del, add);
|
|
276
|
-
case
|
|
218
|
+
case 4:
|
|
277
219
|
// or a promise store.updater.update ?
|
|
278
220
|
// create READ only ACL
|
|
279
|
-
aclBody = keyAclBody(keyDoc, me);
|
|
280
|
-
_context4.next =
|
|
281
|
-
return setAcl(keyDoc, aclBody);
|
|
282
|
-
case
|
|
283
|
-
_context4.next = 27;
|
|
284
|
-
break;
|
|
285
|
-
case 24:
|
|
286
|
-
_context4.prev = 24;
|
|
287
|
-
_context4.t1 = _context4["catch"](2);
|
|
288
|
-
throw new Error(_context4.t1);
|
|
289
|
-
case 27:
|
|
221
|
+
aclBody = (0, _acl.keyAclBody)(keyDoc, me);
|
|
222
|
+
_context4.next = 7;
|
|
223
|
+
return (0, _acl.setAcl)(keyDoc, aclBody);
|
|
224
|
+
case 7:
|
|
290
225
|
case "end":
|
|
291
226
|
return _context4.stop();
|
|
292
227
|
}
|
|
293
|
-
}, _callee4
|
|
228
|
+
}, _callee4);
|
|
294
229
|
})();
|
|
295
230
|
});
|
|
296
231
|
return _saveKey.apply(this, arguments);
|
package/lib/chat/keys.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","names":["debug","_interopRequireWildcard","require","_secp256k","_utils","_signature","_solidLogic","$rdf","_cryptoKeyHelpers","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","generatePrivateKey","bytesToHex","schnorr","utils","randomPrivateKey","generatePublicKey","privateKey","getPublicKey","_x","_getPublicKey","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","webId","publicKeyDoc","wrap","_callee$","_context","prev","next","store","fetcher","load","pubKeyUrl","sent","any","sym","CERT","abrupt","value","t0","undefined","stop","getPrivateKey","_x2","_getPrivateKey","_callee2","privateKeyDoc","publicKey","validPublicKey","del","add","newPublicKey","keyContainer","_callee2$","_context2","privKeyUrl","publicKeyExists","privateKeyExists","confirm","uri","st","literal","saveKey","lit","log","substring","lastIndexOf","setAcl","keyContainerAclBody","me","aclBody","concat","keyAclBody","keyDoc","keyAgent","length","split","pop","_x3","_x4","_setAcl","_callee3","keyAclDoc","response","aclResponse","_callee3$","_context3","statementsMatching","Error","webOperation","status","data","contentType","_x5","_x6","_x7","_saveKey","_callee4","_callee4$","_context4","updater","updateMany","t1"],"sources":["../../src/chat/keys.ts"],"sourcesContent":["import * as debug from '../debug'\r\nimport { schnorr } from '@noble/curves/secp256k1'\r\nimport { bytesToHex } from '@noble/hashes/utils'\r\nimport { CERT } from './signature'\r\nimport { store } from 'solid-logic'\r\nimport { NamedNode } from 'rdflib'\r\nimport * as $rdf from 'rdflib'\r\nimport { publicKeyExists, pubKeyUrl, privKeyUrl, privateKeyExists } from '../utils/cryptoKeyHelpers'\r\n\r\nexport function generatePrivateKey (): string {\r\n return bytesToHex(schnorr.utils.randomPrivateKey())\r\n}\r\n\r\nexport function generatePublicKey (privateKey: string): string {\r\n return bytesToHex(schnorr.getPublicKey(privateKey))\r\n}\r\n\r\nexport async function getPublicKey (webId: NamedNode) {\r\n await store.fetcher.load(webId)\r\n const publicKeyDoc = await pubKeyUrl(webId)\r\n try {\r\n await store.fetcher.load(publicKeyDoc) // url.href)\r\n const key = store.any(webId, store.sym(CERT + 'PublicKey'))\r\n return key?.value // as NamedNode\r\n } catch (err) {\r\n return undefined\r\n }\r\n // this is called in display message and should not try to create a publicKeyDoc\r\n // const publicKey = await publicKeyExists(webId)\r\n // return publicKey\r\n}\r\n\r\nexport async function getPrivateKey (webId: NamedNode) {\r\n await store.fetcher.load(webId)\r\n // find keys url's\r\n const publicKeyDoc = await pubKeyUrl(webId)\r\n const privateKeyDoc = await privKeyUrl(webId)\r\n\r\n // find key pair\r\n const publicKey = await publicKeyExists(webId)\r\n let privateKey = await privateKeyExists(webId)\r\n\r\n // is publicKey valid ?\r\n let validPublicKey = true\r\n if (privateKey && (publicKey !== generatePublicKey(privateKey as string))) {\r\n if (confirm('This is strange the publicKey is not valid for\\n' + webId?.uri +\r\n '\\'shall we repair keeping the private key ?')) validPublicKey = false\r\n }\r\n\r\n // create key pair or repair publicKey\r\n if (!privateKey || !publicKey || !validPublicKey) {\r\n let del: any[] = []\r\n let add: any[] = []\r\n // if (privateKey) del.push($rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), store.sym(privateKeyDoc)))\r\n\r\n if (!privateKey) {\r\n // add = []\r\n privateKey = generatePrivateKey()\r\n add = [$rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.literal(privateKey), store.sym(privateKeyDoc))]\r\n await saveKey(privateKeyDoc, [], add, webId.uri)\r\n }\r\n if (!publicKey || !validPublicKey) {\r\n del = []\r\n // delete invalid public key\r\n if (publicKey) {\r\n del = [$rdf.st(webId, store.sym(CERT + 'PublicKey'), $rdf.lit(publicKey), store.sym(publicKeyDoc))]\r\n debug.log(del)\r\n }\r\n // update new valid key\r\n const newPublicKey = generatePublicKey(privateKey)\r\n add = [$rdf.st(webId, store.sym(CERT + 'PublicKey'), $rdf.literal(newPublicKey), store.sym(publicKeyDoc))]\r\n await saveKey(publicKeyDoc, del, add)\r\n }\r\n const keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1)\r\n await setAcl(keyContainer, keyContainerAclBody(webId.uri)) // includes DELETE and PUT\r\n }\r\n return privateKey as string\r\n}\r\n\r\n/**\r\n * key container ACL\r\n * @param me\r\n * @returns aclBody\r\n */\r\nconst keyContainerAclBody = (me: string) => {\r\n const aclBody = `\r\n@prefix : <#>.\r\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\r\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\r\n@prefix key: <./>.\r\n\r\n:ReadWrite\r\n a acl:Authorization;\r\n acl:accessTo key:;\r\n acl:default key:;\r\n acl:agent <${me}>;\r\n acl:mode acl:Read, acl:Write.\r\n`\r\n return aclBody\r\n}\r\n\r\n/**\r\n * Read only ACL\r\n * @param keyDoc\r\n * @param me\r\n * @returns aclBody\r\n */\r\nconst keyAclBody = (keyDoc, me) => {\r\n let keyAgent = 'acl:agentClass foaf:Agent' // publicKey\r\n if (me?.length) keyAgent = `acl:agent <${me}>` // privateKey\r\n const aclBody = `\r\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\r\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\r\n<#Read>\r\n a acl:Authorization;\r\n ${keyAgent};\r\n acl:accessTo <${keyDoc.split('/').pop()}>;\r\n acl:mode acl:Read.\r\n`\r\n return aclBody\r\n}\r\n\r\n/**\r\n * set ACL\r\n * @param keyDoc\r\n * @param aclBody\r\n */\r\nasync function setAcl (keyDoc: string, aclBody: string) {\r\n // Some servers don't present a Link http response header\r\n // if the container doesn't exist yet, refetch the resource\r\n\r\n await store.fetcher.load(keyDoc)\r\n\r\n // FIXME: check the Why value on this quad:\r\n debug.log(store.statementsMatching(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl')))\r\n const keyAclDoc = store.any(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n if (!keyAclDoc) {\r\n throw new Error('Key ACL doc not found!')\r\n }\r\n\r\n // delete READ only keyAclDoc. This is possible if the webId is an owner\r\n try {\r\n const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner\r\n debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx\r\n } catch (err) {\r\n if (err.response.status !== 404) { throw new Error(err) }\r\n debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\r\n }\r\n\r\n const aclResponse = await store.fetcher.webOperation('PUT', keyAclDoc.value, {\r\n data: aclBody,\r\n contentType: 'text/turtle'\r\n })\r\n}\r\n\r\n/**\r\n * delete acl if keydoc exists\r\n * create/edit keyDoc\r\n * set keyDoc acl\r\n */\r\nasync function saveKey (keyDoc: string, del, add, me: string = '') {\r\n await store.fetcher.load(keyDoc)\r\n // delete keyAclDoc\r\n try {\r\n // get keyAcldoc\r\n const keyAclDoc = store.any(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n if (keyAclDoc) {\r\n // delete READ only keyAclDoc. This is possible if the webId is an owner\r\n try {\r\n const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner\r\n debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx\r\n } catch (err) {\r\n if (err.response.status !== 404) { throw new Error(err) }\r\n debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\r\n }\r\n }\r\n\r\n // save key\r\n await store.updater.updateMany(del, add) // or a promise store.updater.update ?\r\n\r\n // create READ only ACL\r\n const aclBody = keyAclBody(keyDoc, me)\r\n await setAcl(keyDoc, aclBody)\r\n } catch (err) { throw new Error(err) }\r\n}\r\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"keys.js","names":["debug","_interopRequireWildcard","require","_secp256k","_utils","_signature","_solidLogic","$rdf","_accessData","_acl","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","generatePrivateKey","bytesToHex","schnorr","utils","randomPrivateKey","generatePublicKey","privateKey","getPublicKey","_x","_getPublicKey","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee2","webId","publicKeyDoc","wrap","_callee2$","_context2","prev","next","store","fetcher","load","pubKeyUrl","sent","any","sym","CERT","abrupt","value","t0","undefined","stop","getPrivateKey","_x2","_getPrivateKey","_callee3","privateKeyDoc","publicKey","validPublicKey","del","add","newPublicKey","keyContainer","_callee3$","_context3","privKeyUrl","getExistingPublicKey","getExistingPrivateKey","confirm","uri","st","literal","saveKey","lit","log","substring","lastIndexOf","setAcl","keyContainerAclBody","deleteKeyAcl","_ref","_callee","keyDoc","keyAclDoc","response","_callee$","_context","webOperation","status","Error","_x3","_x4","_x5","_x6","_saveKey","me","length","_callee4","aclBody","_callee4$","_context4","updater","updateMany","keyAclBody"],"sources":["../../src/chat/keys.ts"],"sourcesContent":["import * as debug from '../debug'\r\nimport { schnorr } from '@noble/curves/secp256k1'\r\nimport { bytesToHex } from '@noble/hashes/utils'\r\nimport { CERT } from './signature'\r\nimport { store } from 'solid-logic'\r\nimport { NamedNode } from 'rdflib'\r\nimport * as $rdf from 'rdflib'\r\nimport { getExistingPublicKey, pubKeyUrl, privKeyUrl, getExistingPrivateKey } from '../utils/keyHelpers/accessData'\r\nimport { setAcl, keyContainerAclBody, keyAclBody } from '../utils/keyHelpers/acl'\r\n\r\nexport function generatePrivateKey (): string {\r\n return bytesToHex(schnorr.utils.randomPrivateKey())\r\n}\r\n\r\nexport function generatePublicKey (privateKey: string): string {\r\n return bytesToHex(schnorr.getPublicKey(privateKey))\r\n}\r\n\r\n/**\r\n * getPublicKey\r\n * used for displaying messages in chat, therefore does not\r\n * create a new key if not found\r\n * @param webId\r\n * @returns string | undefined\r\n */\r\nexport async function getPublicKey (webId: NamedNode) {\r\n await store.fetcher.load(webId)\r\n const publicKeyDoc = await pubKeyUrl(webId)\r\n try {\r\n await store.fetcher.load(publicKeyDoc) // url.href)\r\n const key = store.any(webId, store.sym(CERT + 'PublicKey'))\r\n return key?.value // as NamedNode\r\n } catch (err) {\r\n return undefined\r\n }\r\n}\r\n\r\nexport async function getPrivateKey (webId: NamedNode) {\r\n await store.fetcher.load(webId)\r\n // find keys url's\r\n const publicKeyDoc = await pubKeyUrl(webId)\r\n const privateKeyDoc = await privKeyUrl(webId)\r\n\r\n // find key pair\r\n const publicKey = await getExistingPublicKey(webId, publicKeyDoc)\r\n let privateKey = await getExistingPrivateKey(webId, privateKeyDoc)\r\n\r\n // is publicKey valid ?\r\n let validPublicKey = true\r\n if (privateKey && (publicKey !== generatePublicKey(privateKey as string))) {\r\n if (confirm('This is strange the publicKey is not valid for\\n' + webId?.uri +\r\n '\\'shall we repair keeping the private key ?')) validPublicKey = false\r\n }\r\n\r\n // create key pair or repair publicKey\r\n if (!privateKey || !publicKey || !validPublicKey) {\r\n let del: any[] = []\r\n let add: any[] = []\r\n // if (privateKey) del.push($rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), store.sym(privateKeyDoc)))\r\n\r\n if (!privateKey) {\r\n // add = []\r\n privateKey = generatePrivateKey()\r\n add = [$rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.literal(privateKey), store.sym(privateKeyDoc))]\r\n await saveKey(privateKeyDoc, [], add, webId.uri)\r\n }\r\n if (!publicKey || !validPublicKey) {\r\n del = []\r\n // delete invalid public key\r\n if (publicKey) {\r\n del = [$rdf.st(webId, store.sym(CERT + 'PublicKey'), $rdf.lit(publicKey), store.sym(publicKeyDoc))]\r\n debug.log(del)\r\n }\r\n // update new valid key\r\n const newPublicKey = generatePublicKey(privateKey)\r\n add = [$rdf.st(webId, store.sym(CERT + 'PublicKey'), $rdf.literal(newPublicKey), store.sym(publicKeyDoc))]\r\n await saveKey(publicKeyDoc, del, add)\r\n }\r\n const keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1)\r\n await setAcl(keyContainer, keyContainerAclBody(webId.uri)) // includes DELETE and PUT\r\n }\r\n return privateKey as string\r\n}\r\n\r\nconst deleteKeyAcl = async (keyDoc: string) => {\r\n await store.fetcher.load(keyDoc)\r\n\r\n const keyAclDoc = store.any(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n if (keyAclDoc) {\r\n // delete READ only keyAclDoc. This is possible if the webId is an owner\r\n try {\r\n const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner\r\n debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx\r\n } catch (err) {\r\n if (err.response.status !== 404) { throw new Error(err) }\r\n debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\r\n }\r\n }\r\n}\r\n\r\n/**\r\n * delete acl if keydoc exists\r\n * create/edit keyDoc\r\n * set keyDoc acl\r\n */\r\nasync function saveKey (keyDoc: string, del, add, me: string = '') {\r\n // await store.fetcher.load(keyDoc) //think we can delete this\r\n // delete keyAclDoc\r\n /* try { //here\r\n // get keyAcldoc\r\n const keyAclDoc = store.any(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n if (keyAclDoc) {\r\n // delete READ only keyAclDoc. This is possible if the webId is an owner\r\n try {\r\n const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner\r\n debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx\r\n } catch (err) {\r\n if (err.response.status !== 404) { throw new Error(err) }\r\n debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\r\n }\r\n }\r\n */\r\n await deleteKeyAcl(keyDoc)\r\n // save key\r\n await store.updater.updateMany(del, add) // or a promise store.updater.update ?\r\n\r\n // create READ only ACL\r\n const aclBody = keyAclBody(keyDoc, me)\r\n await setAcl(keyDoc, aclBody)\r\n}\r\n"],"mappings":"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"}
|
package/lib/chat/message.js
CHANGED
|
@@ -39,7 +39,11 @@ var messageBodyStyle = style.messageBodyStyle;
|
|
|
39
39
|
var label = utils.label;
|
|
40
40
|
|
|
41
41
|
/**
|
|
42
|
+
* elementForImageURI
|
|
42
43
|
* HTML component for an image
|
|
44
|
+
* @param imageUri
|
|
45
|
+
* @param options { inlineImageHeightEms }
|
|
46
|
+
* @returns HTMLAnchorElement For Image
|
|
43
47
|
*/
|
|
44
48
|
function elementForImageURI(imageUri, options) {
|
|
45
49
|
var img = dom.createElement('img');
|
|
@@ -69,21 +73,27 @@ var anchor = function anchor(text, term) {
|
|
|
69
73
|
a.textContent = text;
|
|
70
74
|
return a;
|
|
71
75
|
};
|
|
72
|
-
function
|
|
76
|
+
function nickname(person) {
|
|
73
77
|
var s = _solidLogic.store.any(person, ns.foaf('nick'));
|
|
74
78
|
if (s) return '' + s.value;
|
|
75
79
|
return '' + label(person);
|
|
76
80
|
}
|
|
77
81
|
|
|
78
82
|
/**
|
|
83
|
+
* creatorAndDate
|
|
79
84
|
* Displays creator and date for a chat message
|
|
80
85
|
* inside the `td1` element
|
|
86
|
+
* @param td1
|
|
87
|
+
* @param creator
|
|
88
|
+
* @param date
|
|
89
|
+
* @param message
|
|
90
|
+
* @returns HTMLAnchorElement For Image
|
|
81
91
|
*/
|
|
82
92
|
function creatorAndDate(td1, creator, date, message) {
|
|
83
|
-
var nickAnchor = td1.appendChild(anchor(
|
|
93
|
+
var nickAnchor = td1.appendChild(anchor(nickname(creator), creator));
|
|
84
94
|
if (creator.uri) {
|
|
85
95
|
_solidLogic.store.fetcher.nowOrWhenFetched(creator.doc(), undefined, function (_ok, _body) {
|
|
86
|
-
nickAnchor.textContent =
|
|
96
|
+
nickAnchor.textContent = nickname(creator);
|
|
87
97
|
});
|
|
88
98
|
}
|
|
89
99
|
td1.appendChild(dom.createElement('br'));
|
|
@@ -91,14 +101,20 @@ function creatorAndDate(td1, creator, date, message) {
|
|
|
91
101
|
}
|
|
92
102
|
|
|
93
103
|
/**
|
|
104
|
+
* creatorAndDateHorizontal
|
|
94
105
|
* Horizontally displays creator and date for a chat message
|
|
95
106
|
* inside the `td1` element
|
|
107
|
+
* @param td1
|
|
108
|
+
* @param creator
|
|
109
|
+
* @param date
|
|
110
|
+
* @param message
|
|
111
|
+
* @returns HTMLAnchorElement For Image
|
|
96
112
|
*/
|
|
97
113
|
function creatorAndDateHorizontal(td1, creator, date, message) {
|
|
98
114
|
var nickAnchor = td1.appendChild(anchor(label(creator), creator));
|
|
99
115
|
if (creator.uri) {
|
|
100
116
|
_solidLogic.store.fetcher.nowOrWhenFetched(creator.doc(), undefined, function (_ok, _body) {
|
|
101
|
-
nickAnchor.textContent =
|
|
117
|
+
nickAnchor.textContent = nickname(creator);
|
|
102
118
|
});
|
|
103
119
|
}
|
|
104
120
|
var dateBit = td1.appendChild(anchor(date, message));
|
|
@@ -108,9 +124,17 @@ function creatorAndDateHorizontal(td1, creator, date, message) {
|
|
|
108
124
|
}
|
|
109
125
|
|
|
110
126
|
/**
|
|
127
|
+
* renderMessageRow
|
|
111
128
|
* Renders a chat message, read-only mode
|
|
129
|
+
* @param channelObject
|
|
130
|
+
* @param message
|
|
131
|
+
* @param fresh
|
|
132
|
+
* @param options
|
|
133
|
+
* @param userContext
|
|
134
|
+
* @returns Message Row HTML Table Element
|
|
112
135
|
*/
|
|
113
136
|
function renderMessageRow(channelObject, message, fresh, options, userContext) {
|
|
137
|
+
var unsignedMessage = false;
|
|
114
138
|
var colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true;
|
|
115
139
|
var creator = _solidLogic.store.any(message, ns.foaf('maker'));
|
|
116
140
|
var date = _solidLogic.store.any(message, ns.dct('created'));
|
|
@@ -130,10 +154,11 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
|
|
|
130
154
|
msg.maker = creator.uri;
|
|
131
155
|
|
|
132
156
|
// unsigned message
|
|
133
|
-
if (!(signature !== null && signature !== void 0 && signature.value))
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
else {
|
|
157
|
+
if (!(signature !== null && signature !== void 0 && signature.value)) {
|
|
158
|
+
unsignedMessage = true;
|
|
159
|
+
debug.warn(msgId.uri + ' is unsigned'); // TODO replace with UI (colored message ?)
|
|
160
|
+
} else {
|
|
161
|
+
// signed message, get public key and check signature
|
|
137
162
|
(0, _keys.getPublicKey)(creator).then(function (publicKey) {
|
|
138
163
|
debug.log(creator.uri + '\n' + msg.created + '\n' + msg.id + '\n' + publicKey);
|
|
139
164
|
if (!publicKey) {
|
|
@@ -153,6 +178,7 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
|
|
|
153
178
|
var sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()); // In message
|
|
154
179
|
|
|
155
180
|
var messageRow = dom.createElement('tr');
|
|
181
|
+
if (unsignedMessage) messageRow.setAttribute('style', 'background-color: red');
|
|
156
182
|
messageRow.AJAR_date = sortDate.value;
|
|
157
183
|
messageRow.AJAR_subject = message;
|
|
158
184
|
var td1 = dom.createElement('td');
|
|
@@ -241,7 +267,8 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
|
|
|
241
267
|
toolsTD.appendChild(tools);
|
|
242
268
|
});
|
|
243
269
|
return messageRow;
|
|
244
|
-
}
|
|
270
|
+
} // END OF RENDERMESSAGE
|
|
271
|
+
|
|
245
272
|
function switchToEditor(messageRow, message, channelObject, userContext) {
|
|
246
273
|
var messageTable = messageRow.parentNode;
|
|
247
274
|
var editRow = renderMessageEditor(channelObject, messageTable, userContext, channelObject.options, (0, _chatLogic.mostRecentVersion)(message));
|