solid-ui 2.4.27-9d7e618e → 2.4.27-9f7a01da

package/lib/chat/chatLogic.js

@@ -85,7 +85,7 @@ var ChatChannel = /*#__PURE__*/function () {
         var oldMsg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
         var deleteIt = arguments.length > 2 ? arguments[2] : undefined;
         return /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-          var sts, now, timestamp, dateStamp, chatDocument, message, me, msg, oldMsgMaker, errMsg, privateKey, _errMsg;
+          var sts, now, timestamp, dateStamp, chatDocument, message, me, msg, oldMsgMaker, errMsg, privateKey, pubKey, sig, _errMsg;
           return _regenerator["default"].wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -96,8 +96,8 @@ var ChatChannel = /*#__PURE__*/function () {
                 chatDocument = oldMsg ? oldMsg.doc() : _this.dateFolder.leafDocumentFromDate(now);
                 message = _solidLogic.store.sym(chatDocument.uri + '#' + 'Msg' + timestamp); // const content = store.literal(text)
                 me = _solidLogic.authn.currentUser(); // If already logged on
-                msg = _signature.getBlankMsg;
-                msg.id = message;
+                msg = (0, _signature.getBlankMsg)();
+                msg.id = message.uri;
                 if (!oldMsg) {
                   _context2.next = 22;
                   break;
@@ -112,7 +112,7 @@ var ChatChannel = /*#__PURE__*/function () {
                 if (deleteIt) {
                   // we need to add a specific signature, else anyone can delete a msg ?
                   sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument));
-                  msg.dateDeleted = dateStamp;
+                  // msg.dateDeleted = dateStamp
                 }
                 _context2.next = 20;
                 break;
@@ -131,40 +131,48 @@ var ChatChannel = /*#__PURE__*/function () {
                 sts.push($rdf.st(message, ns.sioc('content'), _solidLogic.store.literal(text), chatDocument));
                 msg.content = text;
                 sts.push($rdf.st(message, ns.dct('created'), dateStamp, chatDocument));
-                msg.created = dateStamp;
+                msg.created = dateStamp.value;
                 if (!me) {
-                  _context2.next = 34;
+                  _context2.next = 36;
                   break;
                 }
                 sts.push($rdf.st(message, ns.foaf('maker'), me, chatDocument));
-                msg.maker = me;
-                // privateKey the cached private key of me, cache should be deleted after a certain time
+                msg.maker = me.uri;
+                // privateKey the cached private key of me, cached in store
                 _context2.next = 32;
-                return (0, _keys.getPrivateKey)(me);
+                return (0, _keys.getPrivateKey)(me.uri);
               case 32:
                 privateKey = _context2.sent;
-                sts.push($rdf.st(message, $rdf.sym("".concat(_signature.SEC, "Proof")), $rdf.sym((0, _signature.signMsg)(msg, privateKey), chatDocument)));
-              case 34:
-                _context2.prev = 34;
-                _context2.next = 37;
+                // const privateKey0 = 'a11bc5d2eee6cdb3b37f5473a712cad905ccfb13fb2ccdbf1be0a1ac4fdc7d2a'
+                // const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
+                pubKey = (0, _keys.getPublicKey)(me.uri);
+                sig = (0, _signature.signMsg)(msg, privateKey);
+                /* const verify = verifySignature(sig, msg, pubKey) // alain to remove
+                debug.warn('sig ' + sig)
+                debug.warn('verifySign ' + verify)
+                debug.warn(msg) */
+                sts.push($rdf.st(message, $rdf.sym("".concat(_signature.SEC, "Proof")), $rdf.lit(sig), chatDocument));
+              case 36:
+                _context2.prev = 36;
+                _context2.next = 39;
                 return _solidLogic.store.updater.update([], sts);
-              case 37:
-                _context2.next = 45;
-                break;
               case 39:
-                _context2.prev = 39;
-                _context2.t0 = _context2["catch"](34);
+                _context2.next = 47;
+                break;
+              case 41:
+                _context2.prev = 41;
+                _context2.t0 = _context2["catch"](36);
                 _errMsg = 'Error saving chat message: ' + _context2.t0;
                 debug.warn(_errMsg);
                 alert(_errMsg);
                 throw new Error(_errMsg);
-              case 45:
+              case 47:
                 return _context2.abrupt("return", message);
-              case 46:
+              case 48:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[34, 39]]);
+          }, _callee2, null, [[36, 41]]);
         })();
       });
       function updateMessage(_x2) {

package/lib/chat/chatLogic.js.map

@@ -1 +1 @@
-{"version":3,"file":"chatLogic.js","names":["debug","_interopRequireWildcard","require","_dateFolder","_solidLogic","ns","$rdf","utils","_signature","_keys","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ChatChannel","channel","options","_classCallCheck2","channelRoot","doc","dateFolder","DateFolder","div","_createClass2","value","_createMessage","_asyncToGenerator2","_regenerator","mark","_callee","text","wrap","_callee$","_context","prev","next","abrupt","updateMessage","stop","createMessage","_x","apply","arguments","_updateMessage","_this","oldMsg","length","undefined","deleteIt","_callee2","sts","now","timestamp","dateStamp","chatDocument","message","me","msg","oldMsgMaker","errMsg","privateKey","_errMsg","_callee2$","_context2","Date","getTime","term","leafDocumentFromDate","store","sym","uri","authn","currentUser","getBlankMsg","id","any","foaf","push","st","mostRecentVersion","dct","schema","dateDeleted","warn","alert","Error","wf","sioc","literal","content","created","maker","getPrivateKey","sent","concat","SEC","signMsg","updater","update","t0","_x2","_deleteMessage","_callee3","_callee3$","_context3","deleteMessage","_x3","exports","originalVersion","isDeleted","holds","isReplaced","isHidden","nick","person","s","label","_createIfNotExists","_x4","_createIfNotExists2","contentType","data","_callee4","response","_callee4$","_context4","fetcher","load","status","log","webOperation","t1","requested"],"sources":["../../src/chat/chatLogic.js"],"sourcesContent":["/**\n * Contains the [[ChatChannel]] class and logic for Solid Chat\n * @packageDocumentation\n */\n\nimport * as debug from '../debug'\nimport { DateFolder } from './dateFolder'\nimport { store, authn } from 'solid-logic'\nimport * as ns from '../ns'\nimport * as $rdf from 'rdflib' // pull in first avoid cross-refs\nimport * as utils from '../utils'\nimport { getBlankMsg, signMsg, SEC } from './signature'\nimport { getPrivateKey } from './keys'\n\n/* The Solid logic for a 'LongChat'\n*/\n/**\n * Common code for a chat (discussion area of messages about something)\n * This version runs over a series of files for different time periods\n *\n * Parameters for the whole chat like its title are stored on\n * index.ttl#this and the chats messages are stored in YYYY/MM/DD/chat.ttl\n *\n */\n\nexport class ChatChannel {\n  constructor (channel, options) {\n    this.channel = channel\n    this.channelRoot = channel.doc()\n    this.options = options\n    this.dateFolder = new DateFolder(this.channelRoot, 'chat.ttl')\n    this.div = null // : HTMLElement\n  }\n\n  /* Store a new message in the web,\n  */\n  async createMessage (text) {\n    return this.updateMessage(text)\n  }\n\n  /* Store a new message in the web,\n    as a replacement for an existing one.\n    The old one iis left, and the two are linked\n  */\n  async updateMessage (text, oldMsg = null, deleteIt) {\n    const sts = []\n    const now = new Date()\n    const timestamp = '' + now.getTime()\n    const dateStamp = $rdf.term(now)\n    const chatDocument = oldMsg ? oldMsg.doc() : this.dateFolder.leafDocumentFromDate(now)\n    const message = store.sym(chatDocument.uri + '#' + 'Msg' + timestamp)\n    // const content = store.literal(text)\n\n    const me = authn.currentUser() // If already logged on\n\n    const msg = getBlankMsg\n    msg.id = message\n    if (oldMsg) { // edit message replaces old one\n      const oldMsgMaker = store.any(oldMsg, ns.foaf('maker')) // may not be needed here, but needed on READ\n      if (oldMsgMaker.uri === me.uri) {\n        sts.push($rdf.st(mostRecentVersion(oldMsg), ns.dct('isReplacedBy'), message, chatDocument))\n        if (deleteIt) { // we need to add a specific signature, else anyone can delete a msg ?\n          sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument))\n          msg.dateDeleted = dateStamp\n        }\n      } else {\n        const errMsg = 'Error you cannot delete/edit a message from someone else : \\n' + oldMsgMaker.uri\n        debug.warn(errMsg)\n        alert(errMsg)\n        throw new Error(errMsg)\n      }\n    } else { // link new message to channel\n      sts.push($rdf.st(this.channel, ns.wf('message'), message, chatDocument))\n    }\n    sts.push(\n      $rdf.st(message, ns.sioc('content'), store.literal(text), chatDocument)\n    )\n    msg.content = text\n\n    sts.push(\n      $rdf.st(message, ns.dct('created'), dateStamp, chatDocument)\n    )\n    msg.created = dateStamp\n    if (me) {\n      sts.push($rdf.st(message, ns.foaf('maker'), me, chatDocument))\n      msg.maker = me\n      // privateKey the cached private key of me, cache should be deleted after a certain time\n      const privateKey = await getPrivateKey(me)\n      sts.push($rdf.st(message, $rdf.sym(`${SEC}Proof`), $rdf.sym(signMsg(msg, privateKey), chatDocument)))\n    }\n    try {\n      await store.updater.update([], sts)\n    } catch (err) {\n      const errMsg = 'Error saving chat message: ' + err\n      debug.warn(errMsg)\n      alert(errMsg)\n      throw new Error(errMsg)\n    }\n    return message\n  }\n\n  /* Mark a message as deleted\n  * Wee add a new version of the message,m witha deletion flag (deletion date)\n  * so that the deletion can be revoked by adding another non-deleted update\n  */\n  async deleteMessage (message) {\n    return this.updateMessage('(message deleted)', message, true)\n  }\n} // class ChatChannel\n\nexport function originalVersion (message) {\n  let msg = message\n  while (msg) {\n    message = msg\n    msg = store.any(null, ns.dct('isReplacedBy'), message, message.doc())\n  }\n  return message\n}\n\nexport function mostRecentVersion (message) {\n  let msg = message\n  while (msg) {\n    message = msg\n    msg = store.any(message, ns.dct('isReplacedBy'), null, message.doc())\n  }\n  return message\n}\n\nexport function isDeleted (message) {\n  return store.holds(message, ns.schema('dateDeleted'), null, message.doc())\n}\n\nexport function isReplaced (message) {\n  return store.holds(message, ns.dct('isReplacedBy'), null, message.doc())\n}\n\nexport function isHidden (message) {\n  return this.isDeleted(message) || this.isReplaced(message)\n}\n\n// A Nickname for a person\n\nexport function nick (person) {\n  const s = store.any(person, ns.foaf('nick'))\n  if (s) return '' + s.value\n  return '' + utils.label(person)\n}\n\nexport async function _createIfNotExists (doc, contentType = 'text/turtle', data = '') {\n  let response\n  try {\n    response = await store.fetcher.load(doc)\n  } catch (err) {\n    if (err.response.status === 404) {\n      debug.log(\n        'createIfNotExists: doc does NOT exist, will create... ' + doc\n      )\n      try {\n        response = await store.fetcher.webOperation('PUT', doc.uri, {\n          data,\n          contentType\n        })\n      } catch (err) {\n        debug.log('createIfNotExists doc FAILED: ' + doc + ': ' + err)\n        throw err\n      }\n      delete store.fetcher.requested[doc.uri] // delete cached 404 error\n      // debug.log('createIfNotExists doc created ok ' + doc)\n      return response\n    } else {\n      debug.log(\n        'createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err\n      )\n      throw err\n    }\n  }\n  // debug.log('createIfNotExists: doc exists, all good: ' + doc)\n  return response\n}\n// ends\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAKA,IAAAA,KAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,EAAA,GAAAJ,uBAAA,CAAAC,OAAA;AACA,IAAAI,IAAA,GAAAL,uBAAA,CAAAC,OAAA;AACA,IAAAK,KAAA,GAAAN,uBAAA,CAAAC,OAAA;AACA,IAAAM,UAAA,GAAAN,OAAA;AACA,IAAAO,KAAA,GAAAP,OAAA;AAAsC,SAAAQ,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,yBAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAV,wBAAAc,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,aAAAE,OAAA,CAAAF,GAAA,yBAAAA,GAAA,uCAAAA,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,cAAAN,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAZtC;AACA;AACA;AACA;AAM+B;AAK/B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAPA,IASaW,WAAW;EACtB,SAAAA,YAAaC,OAAO,EAAEC,OAAO,EAAE;IAAA,IAAAC,gBAAA,mBAAAH,WAAA;IAC7B,IAAI,CAACC,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACG,WAAW,GAAGH,OAAO,CAACI,GAAG,EAAE;IAChC,IAAI,CAACH,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACI,UAAU,GAAG,IAAIC,sBAAU,CAAC,IAAI,CAACH,WAAW,EAAE,UAAU,CAAC;IAC9D,IAAI,CAACI,GAAG,GAAG,IAAI,EAAC;EAClB;;EAEA;AACF;EADE,IAAAC,aAAA,aAAAT,WAAA;IAAAN,GAAA;IAAAgB,KAAA;MAAA,IAAAC,cAAA,OAAAC,kBAAA,2BAAAC,YAAA,YAAAC,IAAA,CAEA,SAAAC,QAAqBC,IAAI;QAAA,OAAAH,YAAA,YAAAI,IAAA,UAAAC,SAAAC,QAAA;UAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;YAAA;cAAA,OAAAF,QAAA,CAAAG,MAAA,WAChB,IAAI,CAACC,aAAa,CAACP,IAAI,CAAC;YAAA;YAAA;cAAA,OAAAG,QAAA,CAAAK,IAAA;UAAA;QAAA,GAAAT,OAAA;MAAA,CAChC;MAAA,SAAAU,cAAAC,EAAA;QAAA,OAAAf,cAAA,CAAAgB,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAH,aAAA;IAAA;IAED;AACF;AACA;AACA;EAHE;IAAA/B,GAAA;IAAAgB,KAAA;MAAA,IAAAmB,cAAA,OAAAjB,kBAAA,aAIA,UAAqBI,IAAI;QAAA,IAAAc,KAAA;QAAA,IAAEC,MAAM,GAAAH,SAAA,CAAAI,MAAA,QAAAJ,SAAA,QAAAK,SAAA,GAAAL,SAAA,MAAG,IAAI;QAAA,IAAEM,QAAQ,GAAAN,SAAA,CAAAI,MAAA,OAAAJ,SAAA,MAAAK,SAAA;QAAA,oBAAApB,YAAA,YAAAC,IAAA,UAAAqB,SAAA;UAAA,IAAAC,GAAA,EAAAC,GAAA,EAAAC,SAAA,EAAAC,SAAA,EAAAC,YAAA,EAAAC,OAAA,EAAAC,EAAA,EAAAC,GAAA,EAAAC,WAAA,EAAAC,MAAA,EAAAC,UAAA,EAAAC,OAAA;UAAA,OAAAlC,YAAA,YAAAI,IAAA,UAAA+B,UAAAC,SAAA;YAAA,kBAAAA,SAAA,CAAA7B,IAAA,GAAA6B,SAAA,CAAA5B,IAAA;cAAA;gBAC1Ce,GAAG,GAAG,EAAE;gBACRC,GAAG,GAAG,IAAIa,IAAI,EAAE;gBAChBZ,SAAS,GAAG,EAAE,GAAGD,GAAG,CAACc,OAAO,EAAE;gBAC9BZ,SAAS,GAAGjE,IAAI,CAAC8E,IAAI,CAACf,GAAG,CAAC;gBAC1BG,YAAY,GAAGT,MAAM,GAAGA,MAAM,CAAC1B,GAAG,EAAE,GAAGyB,KAAI,CAACxB,UAAU,CAAC+C,oBAAoB,CAAChB,GAAG,CAAC;gBAChFI,OAAO,GAAGa,iBAAK,CAACC,GAAG,CAACf,YAAY,CAACgB,GAAG,GAAG,GAAG,GAAG,KAAK,GAAGlB,SAAS,CAAC,EACrE;gBAEMI,EAAE,GAAGe,iBAAK,CAACC,WAAW,EAAE,EAAC;gBAEzBf,GAAG,GAAGgB,sBAAW;gBACvBhB,GAAG,CAACiB,EAAE,GAAGnB,OAAO;gBAAA,KACZV,MAAM;kBAAAkB,SAAA,CAAA5B,IAAA;kBAAA;gBAAA;gBAAI;gBACNuB,WAAW,GAAGU,iBAAK,CAACO,GAAG,CAAC9B,MAAM,EAAE1D,EAAE,CAACyF,IAAI,CAAC,OAAO,CAAC,CAAC,EAAC;gBAAA,MACpDlB,WAAW,CAACY,GAAG,KAAKd,EAAE,CAACc,GAAG;kBAAAP,SAAA,CAAA5B,IAAA;kBAAA;gBAAA;gBAC5Be,GAAG,CAAC2B,IAAI,CAACzF,IAAI,CAAC0F,EAAE,CAACC,iBAAiB,CAAClC,MAAM,CAAC,EAAE1D,EAAE,CAAC6F,GAAG,CAAC,cAAc,CAAC,EAAEzB,OAAO,EAAED,YAAY,CAAC,CAAC;gBAC3F,IAAIN,QAAQ,EAAE;kBAAE;kBACdE,GAAG,CAAC2B,IAAI,CAACzF,IAAI,CAAC0F,EAAE,CAACvB,OAAO,EAAEpE,EAAE,CAAC8F,MAAM,CAAC,aAAa,CAAC,EAAE5B,SAAS,EAAEC,YAAY,CAAC,CAAC;kBAC7EG,GAAG,CAACyB,WAAW,GAAG7B,SAAS;gBAC7B;gBAACU,SAAA,CAAA5B,IAAA;gBAAA;cAAA;gBAEKwB,MAAM,GAAG,+DAA+D,GAAGD,WAAW,CAACY,GAAG;gBAChGxF,KAAK,CAACqG,IAAI,CAACxB,MAAM,CAAC;gBAClByB,KAAK,CAACzB,MAAM,CAAC;gBAAA,MACP,IAAI0B,KAAK,CAAC1B,MAAM,CAAC;cAAA;gBAAAI,SAAA,CAAA5B,IAAA;gBAAA;cAAA;gBAElB;gBACPe,GAAG,CAAC2B,IAAI,CAACzF,IAAI,CAAC0F,EAAE,CAAClC,KAAI,CAAC7B,OAAO,EAAE5B,EAAE,CAACmG,EAAE,CAAC,SAAS,CAAC,EAAE/B,OAAO,EAAED,YAAY,CAAC,CAAC;cAAA;gBAE1EJ,GAAG,CAAC2B,IAAI,CACNzF,IAAI,CAAC0F,EAAE,CAACvB,OAAO,EAAEpE,EAAE,CAACoG,IAAI,CAAC,SAAS,CAAC,EAAEnB,iBAAK,CAACoB,OAAO,CAAC1D,IAAI,CAAC,EAAEwB,YAAY,CAAC,CACxE;gBACDG,GAAG,CAACgC,OAAO,GAAG3D,IAAI;gBAElBoB,GAAG,CAAC2B,IAAI,CACNzF,IAAI,CAAC0F,EAAE,CAACvB,OAAO,EAAEpE,EAAE,CAAC6F,GAAG,CAAC,SAAS,CAAC,EAAE3B,SAAS,EAAEC,YAAY,CAAC,CAC7D;gBACDG,GAAG,CAACiC,OAAO,GAAGrC,SAAS;gBAAA,KACnBG,EAAE;kBAAAO,SAAA,CAAA5B,IAAA;kBAAA;gBAAA;gBACJe,GAAG,CAAC2B,IAAI,CAACzF,IAAI,CAAC0F,EAAE,CAACvB,OAAO,EAAEpE,EAAE,CAACyF,IAAI,CAAC,OAAO,CAAC,EAAEpB,EAAE,EAAEF,YAAY,CAAC,CAAC;gBAC9DG,GAAG,CAACkC,KAAK,GAAGnC,EAAE;gBACd;gBAAAO,SAAA,CAAA5B,IAAA;gBAAA,OACyB,IAAAyD,mBAAa,EAACpC,EAAE,CAAC;cAAA;gBAApCI,UAAU,GAAAG,SAAA,CAAA8B,IAAA;gBAChB3C,GAAG,CAAC2B,IAAI,CAACzF,IAAI,CAAC0F,EAAE,CAACvB,OAAO,EAAEnE,IAAI,CAACiF,GAAG,IAAAyB,MAAA,CAAIC,cAAG,WAAQ,EAAE3G,IAAI,CAACiF,GAAG,CAAC,IAAA2B,kBAAO,EAACvC,GAAG,EAAEG,UAAU,CAAC,EAAEN,YAAY,CAAC,CAAC,CAAC;cAAA;gBAAAS,SAAA,CAAA7B,IAAA;gBAAA6B,SAAA,CAAA5B,IAAA;gBAAA,OAG/FiC,iBAAK,CAAC6B,OAAO,CAACC,MAAM,CAAC,EAAE,EAAEhD,GAAG,CAAC;cAAA;gBAAAa,SAAA,CAAA5B,IAAA;gBAAA;cAAA;gBAAA4B,SAAA,CAAA7B,IAAA;gBAAA6B,SAAA,CAAAoC,EAAA,GAAApC,SAAA;gBAE7BJ,OAAM,GAAG,6BAA6B,GAAAI,SAAA,CAAAoC,EAAM;gBAClDrH,KAAK,CAACqG,IAAI,CAACxB,OAAM,CAAC;gBAClByB,KAAK,CAACzB,OAAM,CAAC;gBAAA,MACP,IAAI0B,KAAK,CAAC1B,OAAM,CAAC;cAAA;gBAAA,OAAAI,SAAA,CAAA3B,MAAA,WAElBmB,OAAO;cAAA;cAAA;gBAAA,OAAAQ,SAAA,CAAAzB,IAAA;YAAA;UAAA,GAAAW,QAAA;QAAA;MAAA,CACf;MAAA,SAAAZ,cAAA+D,GAAA;QAAA,OAAAzD,cAAA,CAAAF,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAL,aAAA;IAAA;IAED;AACF;AACA;AACA;EAHE;IAAA7B,GAAA;IAAAgB,KAAA;MAAA,IAAA6E,cAAA,OAAA3E,kBAAA,2BAAAC,YAAA,YAAAC,IAAA,CAIA,SAAA0E,SAAqB/C,OAAO;QAAA,OAAA5B,YAAA,YAAAI,IAAA,UAAAwE,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAAtE,IAAA,GAAAsE,SAAA,CAAArE,IAAA;YAAA;cAAA,OAAAqE,SAAA,CAAApE,MAAA,WACnB,IAAI,CAACC,aAAa,CAAC,mBAAmB,EAAEkB,OAAO,EAAE,IAAI,CAAC;YAAA;YAAA;cAAA,OAAAiD,SAAA,CAAAlE,IAAA;UAAA;QAAA,GAAAgE,QAAA;MAAA,CAC9D;MAAA,SAAAG,cAAAC,GAAA;QAAA,OAAAL,cAAA,CAAA5D,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAA+D,aAAA;IAAA;EAAA;EAAA,OAAA3F,WAAA;AAAA,KACD;AAAA6F,OAAA,CAAA7F,WAAA,GAAAA,WAAA;AAEK,SAAS8F,eAAeA,CAAErD,OAAO,EAAE;EACxC,IAAIE,GAAG,GAAGF,OAAO;EACjB,OAAOE,GAAG,EAAE;IACVF,OAAO,GAAGE,GAAG;IACbA,GAAG,GAAGW,iBAAK,CAACO,GAAG,CAAC,IAAI,EAAExF,EAAE,CAAC6F,GAAG,CAAC,cAAc,CAAC,EAAEzB,OAAO,EAAEA,OAAO,CAACpC,GAAG,EAAE,CAAC;EACvE;EACA,OAAOoC,OAAO;AAChB;AAEO,SAASwB,iBAAiBA,CAAExB,OAAO,EAAE;EAC1C,IAAIE,GAAG,GAAGF,OAAO;EACjB,OAAOE,GAAG,EAAE;IACVF,OAAO,GAAGE,GAAG;IACbA,GAAG,GAAGW,iBAAK,CAACO,GAAG,CAACpB,OAAO,EAAEpE,EAAE,CAAC6F,GAAG,CAAC,cAAc,CAAC,EAAE,IAAI,EAAEzB,OAAO,CAACpC,GAAG,EAAE,CAAC;EACvE;EACA,OAAOoC,OAAO;AAChB;AAEO,SAASsD,SAASA,CAAEtD,OAAO,EAAE;EAClC,OAAOa,iBAAK,CAAC0C,KAAK,CAACvD,OAAO,EAAEpE,EAAE,CAAC8F,MAAM,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE1B,OAAO,CAACpC,GAAG,EAAE,CAAC;AAC5E;AAEO,SAAS4F,UAAUA,CAAExD,OAAO,EAAE;EACnC,OAAOa,iBAAK,CAAC0C,KAAK,CAACvD,OAAO,EAAEpE,EAAE,CAAC6F,GAAG,CAAC,cAAc,CAAC,EAAE,IAAI,EAAEzB,OAAO,CAACpC,GAAG,EAAE,CAAC;AAC1E;AAEO,SAAS6F,QAAQA,CAAEzD,OAAO,EAAE;EACjC,OAAO,IAAI,CAACsD,SAAS,CAACtD,OAAO,CAAC,IAAI,IAAI,CAACwD,UAAU,CAACxD,OAAO,CAAC;AAC5D;;AAEA;;AAEO,SAAS0D,IAAIA,CAAEC,MAAM,EAAE;EAC5B,IAAMC,CAAC,GAAG/C,iBAAK,CAACO,GAAG,CAACuC,MAAM,EAAE/H,EAAE,CAACyF,IAAI,CAAC,MAAM,CAAC,CAAC;EAC5C,IAAIuC,CAAC,EAAE,OAAO,EAAE,GAAGA,CAAC,CAAC3F,KAAK;EAC1B,OAAO,EAAE,GAAGnC,KAAK,CAAC+H,KAAK,CAACF,MAAM,CAAC;AACjC;AAAC,SAEqBG,kBAAkBA,CAAAC,GAAA;EAAA,OAAAC,mBAAA,CAAA9E,KAAA,OAAAC,SAAA;AAAA,EA+BxC;AAAA,SAAA6E,oBAAA;EAAAA,mBAAA,OAAA7F,kBAAA,aA/BO,UAAmCP,GAAG;IAAA,IAAEqG,WAAW,GAAA9E,SAAA,CAAAI,MAAA,QAAAJ,SAAA,QAAAK,SAAA,GAAAL,SAAA,MAAG,aAAa;IAAA,IAAE+E,IAAI,GAAA/E,SAAA,CAAAI,MAAA,QAAAJ,SAAA,QAAAK,SAAA,GAAAL,SAAA,MAAG,EAAE;IAAA,oBAAAf,YAAA,YAAAC,IAAA,UAAA8F,SAAA;MAAA,IAAAC,QAAA;MAAA,OAAAhG,YAAA,YAAAI,IAAA,UAAA6F,UAAAC,SAAA;QAAA,kBAAAA,SAAA,CAAA3F,IAAA,GAAA2F,SAAA,CAAA1F,IAAA;UAAA;YAAA0F,SAAA,CAAA3F,IAAA;YAAA2F,SAAA,CAAA1F,IAAA;YAAA,OAGhEiC,iBAAK,CAAC0D,OAAO,CAACC,IAAI,CAAC5G,GAAG,CAAC;UAAA;YAAxCwG,QAAQ,GAAAE,SAAA,CAAAhC,IAAA;YAAAgC,SAAA,CAAA1F,IAAA;YAAA;UAAA;YAAA0F,SAAA,CAAA3F,IAAA;YAAA2F,SAAA,CAAA1B,EAAA,GAAA0B,SAAA;YAAA,MAEJA,SAAA,CAAA1B,EAAA,CAAIwB,QAAQ,CAACK,MAAM,KAAK,GAAG;cAAAH,SAAA,CAAA1F,IAAA;cAAA;YAAA;YAC7BrD,KAAK,CAACmJ,GAAG,CACP,wDAAwD,GAAG9G,GAAG,CAC/D;YAAA0G,SAAA,CAAA3F,IAAA;YAAA2F,SAAA,CAAA1F,IAAA;YAAA,OAEkBiC,iBAAK,CAAC0D,OAAO,CAACI,YAAY,CAAC,KAAK,EAAE/G,GAAG,CAACmD,GAAG,EAAE;cAC1DmD,IAAI,EAAJA,IAAI;cACJD,WAAW,EAAXA;YACF,CAAC,CAAC;UAAA;YAHFG,QAAQ,GAAAE,SAAA,CAAAhC,IAAA;YAAAgC,SAAA,CAAA1F,IAAA;YAAA;UAAA;YAAA0F,SAAA,CAAA3F,IAAA;YAAA2F,SAAA,CAAAM,EAAA,GAAAN,SAAA;YAKR/I,KAAK,CAACmJ,GAAG,CAAC,gCAAgC,GAAG9G,GAAG,GAAG,IAAI,GAAA0G,SAAA,CAAAM,EAAM,CAAC;YAAA,MAAAN,SAAA,CAAAM,EAAA;UAAA;YAGhE,OAAO/D,iBAAK,CAAC0D,OAAO,CAACM,SAAS,CAACjH,GAAG,CAACmD,GAAG,CAAC,EAAC;YACxC;YAAA,OAAAuD,SAAA,CAAAzF,MAAA,WACOuF,QAAQ;UAAA;YAEf7I,KAAK,CAACmJ,GAAG,CACP,6CAA6C,GAAG9G,GAAG,GAAG,IAAI,GAAA0G,SAAA,CAAA1B,EAAM,CACjE;YAAA,MAAA0B,SAAA,CAAA1B,EAAA;UAAA;YAAA,OAAA0B,SAAA,CAAAzF,MAAA,WAKEuF,QAAQ;UAAA;UAAA;YAAA,OAAAE,SAAA,CAAAvF,IAAA;QAAA;MAAA,GAAAoF,QAAA;IAAA;EAAA,CAChB;EAAA,OAAAH,mBAAA,CAAA9E,KAAA,OAAAC,SAAA;AAAA"}
+{"version":3,"file":"chatLogic.js","names":["debug","_interopRequireWildcard","require","_dateFolder","_solidLogic","ns","$rdf","utils","_signature","_keys","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ChatChannel","channel","options","_classCallCheck2","channelRoot","doc","dateFolder","DateFolder","div","_createClass2","value","_createMessage","_asyncToGenerator2","_regenerator","mark","_callee","text","wrap","_callee$","_context","prev","next","abrupt","updateMessage","stop","createMessage","_x","apply","arguments","_updateMessage","_this","oldMsg","length","undefined","deleteIt","_callee2","sts","now","timestamp","dateStamp","chatDocument","message","me","msg","oldMsgMaker","errMsg","privateKey","pubKey","sig","_errMsg","_callee2$","_context2","Date","getTime","term","leafDocumentFromDate","store","sym","uri","authn","currentUser","getBlankMsg","id","any","foaf","push","st","mostRecentVersion","dct","schema","warn","alert","Error","wf","sioc","literal","content","created","maker","getPrivateKey","sent","getPublicKey","signMsg","concat","SEC","lit","updater","update","t0","_x2","_deleteMessage","_callee3","_callee3$","_context3","deleteMessage","_x3","exports","originalVersion","isDeleted","holds","isReplaced","isHidden","nick","person","s","label","_createIfNotExists","_x4","_createIfNotExists2","contentType","data","_callee4","response","_callee4$","_context4","fetcher","load","status","log","webOperation","t1","requested"],"sources":["../../src/chat/chatLogic.js"],"sourcesContent":["/**\n * Contains the [[ChatChannel]] class and logic for Solid Chat\n * @packageDocumentation\n */\n\nimport * as debug from '../debug'\nimport { DateFolder } from './dateFolder'\nimport { store, authn } from 'solid-logic'\nimport * as ns from '../ns'\nimport * as $rdf from 'rdflib' // pull in first avoid cross-refs\nimport * as utils from '../utils'\nimport { getBlankMsg, signMsg, SEC, verifySignature } from './signature'\nimport { getPrivateKey, getPublicKey } from './keys'\n\n/* The Solid logic for a 'LongChat'\n*/\n/**\n * Common code for a chat (discussion area of messages about something)\n * This version runs over a series of files for different time periods\n *\n * Parameters for the whole chat like its title are stored on\n * index.ttl#this and the chats messages are stored in YYYY/MM/DD/chat.ttl\n *\n */\n\nexport class ChatChannel {\n  constructor (channel, options) {\n    this.channel = channel\n    this.channelRoot = channel.doc()\n    this.options = options\n    this.dateFolder = new DateFolder(this.channelRoot, 'chat.ttl')\n    this.div = null // : HTMLElement\n  }\n\n  /* Store a new message in the web,\n  */\n  async createMessage (text) {\n    return this.updateMessage(text)\n  }\n\n  /* Store a new message in the web,\n    as a replacement for an existing one.\n    The old one iis left, and the two are linked\n  */\n  async updateMessage (text, oldMsg = null, deleteIt) {\n    const sts = []\n    const now = new Date()\n    const timestamp = '' + now.getTime()\n    const dateStamp = $rdf.term(now)\n    const chatDocument = oldMsg ? oldMsg.doc() : this.dateFolder.leafDocumentFromDate(now)\n    const message = store.sym(chatDocument.uri + '#' + 'Msg' + timestamp)\n    // const content = store.literal(text)\n\n    const me = authn.currentUser() // If already logged on\n\n    const msg = getBlankMsg()\n    msg.id = message.uri\n    if (oldMsg) { // edit message replaces old one\n      const oldMsgMaker = store.any(oldMsg, ns.foaf('maker')) // may not be needed here, but needed on READ\n      if (oldMsgMaker.uri === me.uri) {\n        sts.push($rdf.st(mostRecentVersion(oldMsg), ns.dct('isReplacedBy'), message, chatDocument))\n        if (deleteIt) { // we need to add a specific signature, else anyone can delete a msg ?\n          sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument))\n          // msg.dateDeleted = dateStamp\n        }\n      } else {\n        const errMsg = 'Error you cannot delete/edit a message from someone else : \\n' + oldMsgMaker.uri\n        debug.warn(errMsg)\n        alert(errMsg)\n        throw new Error(errMsg)\n      }\n    } else { // link new message to channel\n      sts.push($rdf.st(this.channel, ns.wf('message'), message, chatDocument))\n    }\n    sts.push(\n      $rdf.st(message, ns.sioc('content'), store.literal(text), chatDocument)\n    )\n    msg.content = text\n\n    sts.push(\n      $rdf.st(message, ns.dct('created'), dateStamp, chatDocument)\n    )\n    msg.created = dateStamp.value\n    if (me) {\n      sts.push($rdf.st(message, ns.foaf('maker'), me, chatDocument))\n      msg.maker = me.uri\n      // privateKey the cached private key of me, cached in store\n      const privateKey = await getPrivateKey(me.uri)\n      // const privateKey0 = 'a11bc5d2eee6cdb3b37f5473a712cad905ccfb13fb2ccdbf1be0a1ac4fdc7d2a'\n      // const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'\n      const pubKey = getPublicKey(me.uri)\n\n      const sig = signMsg(msg, privateKey)\n      /* const verify = verifySignature(sig, msg, pubKey) // alain to remove\n      debug.warn('sig ' + sig)\n      debug.warn('verifySign ' + verify)\n      debug.warn(msg) */\n      sts.push($rdf.st(message, $rdf.sym(`${SEC}Proof`), $rdf.lit(sig), chatDocument))\n    }\n    try {\n      await store.updater.update([], sts)\n    } catch (err) {\n      const errMsg = 'Error saving chat message: ' + err\n      debug.warn(errMsg)\n      alert(errMsg)\n      throw new Error(errMsg)\n    }\n    return message\n  }\n\n  /* Mark a message as deleted\n  * Wee add a new version of the message,m witha deletion flag (deletion date)\n  * so that the deletion can be revoked by adding another non-deleted update\n  */\n  async deleteMessage (message) {\n    return this.updateMessage('(message deleted)', message, true)\n  }\n} // class ChatChannel\n\nexport function originalVersion (message) {\n  let msg = message\n  while (msg) {\n    message = msg\n    msg = store.any(null, ns.dct('isReplacedBy'), message, message.doc())\n  }\n  return message\n}\n\nexport function mostRecentVersion (message) {\n  let msg = message\n  while (msg) {\n    message = msg\n    msg = store.any(message, ns.dct('isReplacedBy'), null, message.doc())\n  }\n  return message\n}\n\nexport function isDeleted (message) {\n  return store.holds(message, ns.schema('dateDeleted'), null, message.doc())\n}\n\nexport function isReplaced (message) {\n  return store.holds(message, ns.dct('isReplacedBy'), null, message.doc())\n}\n\nexport function isHidden (message) {\n  return this.isDeleted(message) || this.isReplaced(message)\n}\n\n// A Nickname for a person\n\nexport function nick (person) {\n  const s = store.any(person, ns.foaf('nick'))\n  if (s) return '' + s.value\n  return '' + utils.label(person)\n}\n\nexport async function _createIfNotExists (doc, contentType = 'text/turtle', data = '') {\n  let response\n  try {\n    response = await store.fetcher.load(doc)\n  } catch (err) {\n    if (err.response.status === 404) {\n      debug.log(\n        'createIfNotExists: doc does NOT exist, will create... ' + doc\n      )\n      try {\n        response = await store.fetcher.webOperation('PUT', doc.uri, {\n          data,\n          contentType\n        })\n      } catch (err) {\n        debug.log('createIfNotExists doc FAILED: ' + doc + ': ' + err)\n        throw err\n      }\n      delete store.fetcher.requested[doc.uri] // delete cached 404 error\n      // debug.log('createIfNotExists doc created ok ' + doc)\n      return response\n    } else {\n      debug.log(\n        'createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err\n      )\n      throw err\n    }\n  }\n  // debug.log('createIfNotExists: doc exists, all good: ' + doc)\n  return response\n}\n// ends\n"],"mappings":"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"}

package/lib/chat/keys.d.ts

@@ -1,5 +1,5 @@
 export declare function generatePrivateKey(): string;
 export declare function generatePublicKey(privateKey: string): string;
-export declare function getPublicKey(webId: any): any;
+export declare function getPublicKey(webId: any): Promise<string | undefined>;
 export declare function getPrivateKey(webId: string): Promise<string>;
 //# sourceMappingURL=keys.d.ts.map

package/lib/chat/keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/chat/keys.ts"],"names":[],"mappings":"AAQA,wBAAgB,kBAAkB,IAAK,MAAM,CAE5C;AAED,wBAAgB,iBAAiB,CAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,YAAY,CAAE,KAAK,KAAA,OAGlC;AAyCD,wBAAsB,aAAa,CAAE,KAAK,EAAE,MAAM,mBAsBjD"}
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/chat/keys.ts"],"names":[],"mappings":"AAQA,wBAAgB,kBAAkB,IAAK,MAAM,CAE5C;AAED,wBAAgB,iBAAiB,CAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,YAAY,CAAE,KAAK,KAAA,+BAGlC;AA4DD,wBAAsB,aAAa,CAAE,KAAK,EAAE,MAAM,mBAqCjD"}

package/lib/chat/keys.js

@@ -27,107 +27,156 @@ function generatePublicKey(privateKey) {
 }
 function getPublicKey(webId) {
   var publicKey = publicKeyExists(webId);
-  return publicKey === null || publicKey === void 0 ? void 0 : publicKey.uri;
+  return publicKey;
 }
-function publicKeyExists(webId) {
-  // find publickey
+var pubKeyUrl = function pubKeyUrl(webId) {
   var url = new URL(webId);
-  url.hash = '';
-  _solidLogic.store.fetcher.load(url.href);
-  var publicKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'publicKey'));
-  return publicKey;
+  var publicKeyUrl = url.origin + '/profile/keys/publicKey.ttl';
+  return publicKeyUrl;
+};
+function publicKeyExists(_x) {
+  return _publicKeyExists.apply(this, arguments);
 }
-function privateKeyExists(_x) {
+function _publicKeyExists() {
+  _publicKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+    var publicKey;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return _solidLogic.store.fetcher.load(pubKeyUrl(webId));
+        case 2:
+          // url.href)
+          publicKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
+          return _context.abrupt("return", publicKey === null || publicKey === void 0 ? void 0 : publicKey.value);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _publicKeyExists.apply(this, arguments);
+}
+var privKeyUrl = function privKeyUrl(webId) {
+  var url = new URL(webId);
+  var privateKeyUrl = url.origin + '/profile/keys/privateKey.ttl';
+  return privateKeyUrl;
+};
+function privateKeyExists(_x2) {
   return _privateKeyExists.apply(this, arguments);
 }
 function _privateKeyExists() {
-  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var url, privateKeyUrl, privateKey, _err$response, data, contentType, response;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
+    var privateKeyUrl, privateKey, _err$response, data, contentType, response;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = new URL(webId);
-          privateKeyUrl = url.hostname + '/profile/privateKey.ttl';
-          _context.prev = 2;
-          _solidLogic.store.fetcher.load(privateKeyUrl);
-          privateKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'privateKey'));
-          return _context.abrupt("return", privateKey);
+          /* const url = new URL(webId)
+          const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
+          privateKeyUrl = privKeyUrl(webId);
+          /* debug.warn('Alain privateKeyExists')
+          debug.warn(webId)
+          debug.warn(privateKeyUrl) */
+          _context2.prev = 1;
+          _context2.next = 4;
+          return _solidLogic.store.fetcher.load(privateKeyUrl);
+        case 4:
+          privateKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PrivateKey'));
+          return _context2.abrupt("return", privateKey === null || privateKey === void 0 ? void 0 : privateKey.value);
         case 8:
-          _context.prev = 8;
-          _context.t0 = _context["catch"](2);
-          if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : (_err$response = _context.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
-            _context.next = 25;
+          _context2.prev = 8;
+          _context2.t0 = _context2["catch"](1);
+          if (!((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : (_err$response = _context2.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
+            _context2.next = 25;
             break;
           }
-          _context.prev = 11;
+          _context2.prev = 11;
           // create privateKey resource
           data = '';
           contentType = 'text/ttl';
-          _context.next = 16;
+          _context2.next = 16;
           return _solidLogic.store.fetcher.webOperation('PUT', privateKeyUrl, {
             data: data,
             contentType: contentType
           });
         case 16:
-          response = _context.sent;
-          _context.next = 23;
+          response = _context2.sent;
+          _context2.next = 23;
           break;
         case 19:
-          _context.prev = 19;
-          _context.t1 = _context["catch"](11);
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context.t1);
-          throw _context.t1;
+          _context2.prev = 19;
+          _context2.t1 = _context2["catch"](11);
+          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context2.t1);
+          throw _context2.t1;
         case 23:
           delete _solidLogic.store.fetcher.requested[privateKeyUrl]; // delete cached 404 error
-          return _context.abrupt("return", undefined);
+          return _context2.abrupt("return", undefined);
         case 25:
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context.t0);
-          throw _context.t0;
+          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context2.t0);
+          throw _context2.t0;
         case 27:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[2, 8], [11, 19]]);
+    }, _callee2, null, [[1, 8], [11, 19]]);
   }));
   return _privateKeyExists.apply(this, arguments);
 }
-function getPrivateKey(_x2) {
+function getPrivateKey(_x3) {
   return _getPrivateKey.apply(this, arguments);
 }
 function _getPrivateKey() {
-  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
-    var url, privateKeyUrl, publicKey, privateKey, del, add;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId) {
+    var publicKeyUrl, privateKeyUrl, publicKey, privateKey, del, add;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          url = new URL(webId);
-          privateKeyUrl = url.hostname + '/profile/privateKey.ttl'; // find publickey
-          publicKey = publicKeyExists(webId); // find privateKey
-          _context2.next = 5;
+          /* const url = new URL(webId)
+          url.hash = '' */
+          /* const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
+          publicKeyUrl = pubKeyUrl(webId);
+          privateKeyUrl = privKeyUrl(webId); // find publickey
+          _context3.next = 4;
+          return publicKeyExists(webId);
+        case 4:
+          publicKey = _context3.sent;
+          _context3.next = 7;
           return privateKeyExists(webId);
-        case 5:
-          privateKey = _context2.sent;
+        case 7:
+          privateKey = _context3.sent;
+          // debug.warn('privateKey ' + privateKey)
+          if (privateKey && publicKey !== generatePublicKey(privateKey)) debug.warn('publicKey is not valid');
+
+          // simulate new key pair
+          /* const newPrivateKey = generatePrivateKey()
+          const newPublicKey = generatePublicKey(newPrivateKey)
+          debug.log('newPrivateKey ' + newPrivateKey)
+          debug.log('newPublicKey ' + newPublicKey) */
+
+          // create key pair
           if (!(!privateKey || !publicKey)) {
-            _context2.next = 17;
+            _context3.next = 20;
             break;
           }
           del = [];
           add = [];
-          if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'privateKey'), privateKey, $rdf.sym(privateKeyUrl)));
-          if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'publicKey'), publicKey, $rdf.sym(url.href)));
-          privateKey = _solidLogic.store.sym(generatePrivateKey());
-          publicKey = _solidLogic.store.sym(generatePublicKey(privateKey.uri));
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'privateKey'), $rdf.literal(privateKey.uri), $rdf.sym(privateKeyUrl)));
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'publicKey'), $rdf.literal(publicKey.uri), $rdf.sym(url.href)));
-          _context2.next = 17;
+          if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyUrl)));
+          if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyUrl)));
+          privateKey = generatePrivateKey();
+          publicKey = generatePublicKey(privateKey);
+          /* debug.log('newPrivateKey-1 ' + privateKey)
+          debug.log('newPublicKey-1 ' + publicKey) */
+          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyUrl)));
+          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(publicKeyUrl)));
+          _context3.next = 20;
           return _solidLogic.store.updater.updateMany(del, add);
-        case 17:
-          return _context2.abrupt("return", privateKey.uri);
-        case 18:
+        case 20:
+          return _context3.abrupt("return", privateKey);
+        case 21:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _getPrivateKey.apply(this, arguments);
 }

package/lib/chat/keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"keys.js","names":["debug","_interopRequireWildcard","require","_secp256k","_utils","_signature","_solidLogic","$rdf","_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","webId","publicKey","publicKeyExists","uri","url","URL","hash","store","fetcher","load","href","any","sym","CERT","privateKeyExists","_x","_privateKeyExists","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","privateKeyUrl","_err$response","data","contentType","response","wrap","_callee$","_context","prev","next","hostname","abrupt","t0","status","webOperation","sent","t1","log","requested","undefined","stop","getPrivateKey","_x2","_getPrivateKey","_callee2","del","add","_callee2$","_context2","push","st","literal","updater","updateMany"],"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 * as $rdf from 'rdflib'\r\nimport { NamedNode, literal } from 'rdflib'\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 function getPublicKey (webId) {\r\n  const publicKey = publicKeyExists(webId)\r\n  return publicKey?.uri as any\r\n}\r\n\r\nfunction publicKeyExists (webId: string): NamedNode {\r\n  // find publickey\r\n  const url = new URL(webId)\r\n  url.hash = ''\r\n  store.fetcher.load(url.href)\r\n  const publicKey = store.any(store.sym(webId), store.sym(CERT + 'publicKey'))\r\n  return publicKey as NamedNode\r\n}\r\n\r\nasync function privateKeyExists (webId: string) {\r\n  const url = new URL(webId)\r\n  const privateKeyUrl = url.hostname + '/profile/privateKey.ttl'\r\n  try {\r\n    store.fetcher.load(privateKeyUrl)\r\n    const privateKey = store.any(store.sym(webId), store.sym(CERT + 'privateKey'))\r\n    return privateKey as NamedNode\r\n  } catch (err) {\r\n    if (err?.response?.status === 404) {\r\n      try {\r\n        // create privateKey resource\r\n        const data = ''\r\n        const contentType = 'text/ttl'\r\n        const response = await store.fetcher.webOperation('PUT', privateKeyUrl, {\r\n          data,\r\n          contentType\r\n        })\r\n        // create ACL resource\r\n      } catch (err) {\r\n        debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + err)\r\n        throw err\r\n      }\r\n      delete store.fetcher.requested[privateKeyUrl] // delete cached 404 error\r\n      return undefined\r\n    }\r\n    debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + err)\r\n    throw err\r\n  }\r\n}\r\n\r\nexport async function getPrivateKey (webId: string) {\r\n  const url = new URL(webId)\r\n  const privateKeyUrl = url.hostname + '/profile/privateKey.ttl'\r\n  // find publickey\r\n  let publicKey = publicKeyExists(webId)\r\n  // find privateKey\r\n  let privateKey = await privateKeyExists(webId)\r\n  // create key pair\r\n  if (!privateKey || !publicKey) {\r\n    const del: any[] = []\r\n    const add: any[] = []\r\n    if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'privateKey'), privateKey, $rdf.sym(privateKeyUrl)))\r\n    if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'publicKey'), publicKey, $rdf.sym(url.href)))\r\n\r\n    privateKey = store.sym(generatePrivateKey())\r\n    publicKey = store.sym(generatePublicKey(privateKey.uri))\r\n\r\n    add.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'privateKey'), $rdf.literal(privateKey.uri), $rdf.sym(privateKeyUrl)))\r\n    add.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'publicKey'), $rdf.literal(publicKey.uri), $rdf.sym(url.href)))\r\n    await store.updater.updateMany(del, add)\r\n  }\r\n  return privateKey.uri as string\r\n}\r\n"],"mappings":"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"}
+{"version":3,"file":"keys.js","names":["debug","_interopRequireWildcard","require","_secp256k","_utils","_signature","_solidLogic","$rdf","_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","webId","publicKey","publicKeyExists","pubKeyUrl","url","URL","publicKeyUrl","origin","_x","_publicKeyExists","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","wrap","_callee$","_context","prev","next","store","fetcher","load","any","sym","CERT","abrupt","value","stop","privKeyUrl","privateKeyUrl","privateKeyExists","_x2","_privateKeyExists","_callee2","_err$response","data","contentType","response","_callee2$","_context2","t0","status","webOperation","sent","t1","log","requested","undefined","getPrivateKey","_x3","_getPrivateKey","_callee3","del","add","_callee3$","_context3","warn","push","st","lit","literal","updater","updateMany"],"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 * as $rdf from 'rdflib'\r\nimport { NamedNode, literal } from 'rdflib'\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 function getPublicKey (webId) {\r\n  const publicKey = publicKeyExists(webId)\r\n  return publicKey\r\n}\r\n\r\nconst pubKeyUrl = (webId: string) => {\r\n  const url = new URL(webId)\r\n  const publicKeyUrl = url.origin + '/profile/keys/publicKey.ttl'\r\n  return publicKeyUrl\r\n}\r\n\r\nasync function publicKeyExists (webId: string) {\r\n  // find publickey\r\n  /* const url = new URL(webId)\r\n  url.hash = '' */\r\n  /* debug.warn('Alain publicKeyExists')\r\n  debug.warn(webId)\r\n  debug.warn(url.href) */\r\n  await store.fetcher.load(pubKeyUrl(webId)) // url.href)\r\n  const publicKey = store.any(store.sym(webId), store.sym(CERT + 'PublicKey'))\r\n  return publicKey?.value // as NamedNode\r\n}\r\n\r\nconst privKeyUrl = (webId: string) => {\r\n  const url = new URL(webId)\r\n  const privateKeyUrl = url.origin + '/profile/keys/privateKey.ttl'\r\n  return privateKeyUrl\r\n}\r\n\r\nasync function privateKeyExists (webId: string) {\r\n  /* const url = new URL(webId)\r\n  const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */\r\n  const privateKeyUrl = privKeyUrl(webId)\r\n  /* debug.warn('Alain privateKeyExists')\r\n  debug.warn(webId)\r\n  debug.warn(privateKeyUrl) */\r\n  try {\r\n    await store.fetcher.load(privateKeyUrl)\r\n    const privateKey = store.any(store.sym(webId), store.sym(CERT + 'PrivateKey'))\r\n    return privateKey?.value // as NamedNode\r\n  } catch (err) {\r\n    if (err?.response?.status === 404) {\r\n      try {\r\n        // create privateKey resource\r\n        const data = ''\r\n        const contentType = 'text/ttl'\r\n        const response = await store.fetcher.webOperation('PUT', privateKeyUrl, {\r\n          data,\r\n          contentType\r\n        })\r\n        // create ACL resource\r\n      } catch (err) {\r\n        debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + err)\r\n        throw err\r\n      }\r\n      delete store.fetcher.requested[privateKeyUrl] // delete cached 404 error\r\n      return undefined\r\n    }\r\n    debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + err)\r\n    throw err\r\n  }\r\n}\r\n\r\nexport async function getPrivateKey (webId: string) {\r\n  /* const url = new URL(webId)\r\n  url.hash = '' */\r\n  /* const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */\r\n  const publicKeyUrl = pubKeyUrl(webId)\r\n  const privateKeyUrl = privKeyUrl(webId)\r\n\r\n  // find publickey\r\n  let publicKey = await publicKeyExists(webId)\r\n  // debug.warn('publicKey ' + publicKey)\r\n  // find privateKey\r\n  let privateKey = await privateKeyExists(webId)\r\n  // debug.warn('privateKey ' + privateKey)\r\n  if (privateKey && (publicKey !== generatePublicKey(privateKey as string))) debug.warn('publicKey is not valid')\r\n\r\n  // simulate new key pair\r\n  /* const newPrivateKey = generatePrivateKey()\r\n  const newPublicKey = generatePublicKey(newPrivateKey)\r\n  debug.log('newPrivateKey ' + newPrivateKey)\r\n  debug.log('newPublicKey ' + newPublicKey) */\r\n\r\n  // create key pair\r\n  if (!privateKey || !publicKey) {\r\n    const del: any[] = []\r\n    const add: any[] = []\r\n    if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyUrl)))\r\n    if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyUrl)))\r\n\r\n    privateKey = generatePrivateKey()\r\n    publicKey = generatePublicKey(privateKey)\r\n    /* debug.log('newPrivateKey-1 ' + privateKey)\r\n    debug.log('newPublicKey-1 ' + publicKey) */\r\n    add.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyUrl)))\r\n    add.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(publicKeyUrl)))\r\n    await store.updater.updateMany(del, add)\r\n  }\r\n  return privateKey as string\r\n}\r\n"],"mappings":"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"}

package/lib/chat/message.js

@@ -115,21 +115,46 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   var creator = _solidLogic.store.any(message, ns.foaf('maker'));
   var date = _solidLogic.store.any(message, ns.dct('created'));
   var latestVersion = (0, _chatLogic.mostRecentVersion)(message);
-  var content = _solidLogic.store.any(latestVersion, ns.sioc('content'));
-  var signature = _solidLogic.store.any(message, $rdf.sym("".concat(_signature.SEC, "Proof")));
+  var latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker'));
+  // use latest content if same owner, else use original
+  var msgId = creator.uri === latestVersionCreator.uri ? latestVersion : message;
+  var content = _solidLogic.store.any(msgId, ns.sioc('content'));
+  var signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "Proof")));
+  debug.log('alain ' + (signature === null || signature === void 0 ? void 0 : signature.value));
 
   // verify signature
   var msg = (0, _signature.getBlankMsg)();
-  msg.id = message;
-  msg.created = date;
-  // this is not correct.
-  // If the message has been edited/deleted we must verify the latest message and may be the intermediate ones
-  msg.content = content;
-  msg.maker = creator;
-
-  // pubKey could be store in a cache for all makers
-  var pubKey = (0, _keys.getPublicKey)(creator); // alain no
-  if (!(0, _signature.verifySignature)(signature, msg, pubKey)) throw new Error();
+  msg.id = msgId.uri;
+  msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
+  msg.content = content.value;
+  msg.maker = creator.uri;
+  try {
+    var publicKey = function publicKey(webId) {
+      var pubKey;
+      (0, _keys.getPublicKey)(webId).then(function (publicKey) {
+        debug.log('alain publicKey ' + publicKey);
+        pubKey = publicKey;
+      });
+      return pubKey;
+    };
+    var pubKey = publicKey(creator.uri); // await getPublicKey(creator.uri)
+    debug.log('alain pubKey ' + pubKey);
+    debug.log(creator.uri);
+  } catch (err) {
+    debug.warn(err);
+  }
+  try {
+    // pubKey could be store in a cache for all makers
+    /* const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
+    debug.warn('publicKeys\n' + pubKey0 + '\n' + pubKey)
+    const privKey0 = getPrivateKey(creator.uri) // alain to remove
+    // unsigned messages should be signaled as unsecured
+    debug.warn(msg)
+    debug.warn(signature?.value) */
+    if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature.value, msg, pubKey)) throw new Error('invalid signature');
+  } catch (err) {
+    debug.log(err);
+  }
   var originalMessage = (0, _chatLogic.originalVersion)(message);
   var edited = !message.sameTerm(originalMessage);
   var sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()); // In message