libves 3.0.0 → 3.0.2

package/libVES.node.js

@@ -27,7 +27,7 @@
  *
  * @title libVES
  * @dev A JavaScript end-to-end encryption interface to VESvault REST API
- * @version 3.00
+ * @version 3.02
  *
  * @dev Official source code: https://github.com/vesvault/libVES
  *
@@ -63,7 +63,7 @@ libVES.prototype = {
     keyOptions: {namedCurve: 'P-521'},
     textCipher: 'AES256GCMp',
     defaultHash: 'SHA256',
-    propagators: [],
+    propagators: null,
     request: function(method,uri,body,optns) {
 	var self = this;
 	if (!optns) optns = {};
@@ -266,6 +266,7 @@ libVES.prototype = {
 	for (var kid in this.unlockedKeys) lock.push(this.unlockedKeys[kid].then(function(k) {
 	    return k.lock();
 	}).catch(function() {}));
+        this.propagators = null;
 	return Promise.all(lock).then(function() {
 	    return true;
 	});
@@ -425,6 +426,20 @@ libVES.prototype = {
 	    });
 	});
     },
+    getPropagators: function() {
+        if (!this.propagators) {
+            let xid = (this.externalId ?? this.email);
+            this.propagators = (xid?.match(/^[^\!]+\@\w/) ? Promise.resolve(xid.replace(/\!.*/, '')) : this.me().then((me) => me.getEmail())).then((xid) => {
+                if (!xid) return [];
+                let prop = new libVES.VaultKey({externals: {domain: '.propagate', externalId: xid.toLowerCase()}}, this);
+                return prop.getId().then(() => [prop]);
+            }).catch((er) => {
+                if (er?.code == 'NotFound' || er?.code == 'Unauthorized') return [];
+                throw er;
+            });
+        }
+        return Promise.resolve(this.propagators);
+    },
     getUserKeys: function(usr) {
 	var self = this;
 	return usr.getActiveVaultKeys().catch(function(e) {
@@ -459,8 +474,7 @@ libVES.prototype = {
 		}).catch(function(e) {
 		    if (e.code != 'NotFound') throw e;
 		    var sh = self.type == 'secondary' ? [self.me(), self.getVaultKey()] : [self.me()];
-		    if (self.propagators) for (var i = 0; i < self.propagators.length; i++) sh.push(self.propagators[i]);
-		    return sh;
+                    return self.getPropagators().then((props) => sh.concat(props)).catch((er) => sh);
 		}).then(function(sh) {
 		    return Promise.all(sh);
 		}).then(function(sh) {
@@ -875,11 +889,20 @@ libVES.prototype = {
 					return vkey.rekey(optns);
 				    });
 				    else return vkey.getVaultItems().then(function(vis) {
-					return self.elevateAuth().then(function(optns) {
-					    return Promise.all(vis.map(function(vi, i) {
-						return vi.reshareWith([user], undefined, optns);
-					    }));
-					});
+                                        return Promise.all([user.getActiveVaultKeys(), vkey.getExternals().then((exts) => {
+                                            let ckey = new libVES.VaultKey({externals: exts}, self);
+                                            return ckey.getType().then(() => [ckey]).catch((er) => {
+                                                if (er?.code != 'NotFound') throw er;
+                                                return [];
+                                            });
+                                        })]).then((klists) => {
+                                            let ks = (klists[0] ?? []).concat(klists[1]);
+                                            return Promise.all(ks.map((k) => k.getType())).then((ktypes) => ks.filter((k, i) => ktypes[i] != 'temp'));
+                                        }).then((ks) => self.elevateAuth().then(function(optns) {
+                                            return Promise.all(vis.map(function(vi, i) {
+                                                return vi.reshareWith(ks, undefined, optns);
+                                            }));
+                                        }));
 				    });
 				});
 			    });
@@ -4601,7 +4624,7 @@ libVES.Vault = class extends libVES.EventTarget {
         fields ||= {};
         if (ref.externalId) fields.externals = [{domain: (this.domain = String(ref.domain)), externalId: (this.externalId = String(ref.externalId))}];
         this.email = ref.email || '';
-        if (ref.email) fields.email = this.email;
+        if (ref.email) fields.user = {email: this.email};
         if (ref.version) this.version = fields.id = Number(ref.version);
         if (!fields.id) fields.type = this.externalId ? 'secondary' : 'current';
         this.vaultKey = new libVES.VaultKey(fields, ves);
@@ -4650,22 +4673,30 @@ libVES.Vault = class extends libVES.EventTarget {
         return this.objects(optns).then((objs) => objs.filter((obj) => (obj instanceof libVES.Vault)));
     }
 
+    reauth() {
+        clearTimeout(this.refreshTmout);
+        return this.vaultKey.loadFields({encSessionToken: true}, true, {token: ''}).then((flds) => this.vaultKey.setFields(flds)).then(() => this.vaultKey.getSessionToken()).then((tk) => {
+            this.vaultKey.VES.token = tk;
+            return this;
+        });
+    }
+
     _setunlock(reauth) {
         this.current = true;
-        this.owner = this.externalId[0] != '!';
+        this.owner = this.externalId?.[0] != '!';
         this.lock(600);
         let rf;
-        if (reauth !== false) (rf = (tmout) => {
+        if (reauth !== false  && this.externalId) (rf = (tmout) => {
             this.refreshTmout = setTimeout(() => {
-                this.vaultKey.loadFields({encSessionToken: true}, true, {token: ''}).then((flds) => this.vaultKey.setFields(flds)).then(() => this.vaultKey.getSessionToken()).then((tk) => {
-                    this.vaultKey.VES.token = tk;
-                    rf();
-                }).catch((er) => {
+                this.reauth().then(() => rf()).catch((er) => {
                     console.log(er);
                     rf(60000);
                 });
             }, (tmout || 14400000));
         })();
+        if (this.appUrl === undefined) try {
+            this.appUrl = document.location.origin;
+        } catch(er) {}
         return this;
     }
 
@@ -4759,8 +4790,9 @@ libVES.Vault = class extends libVES.EventTarget {
         if (!(refs instanceof Array)) refs = [refs];
         refs = refs.map((ref) => libVES.Vault.toRef(ref, ves)).filter((ref) => ref);
         if (owner) {
-            if (!ves.externalId) throw new libVES.Error.Unauthorized('The vault is locked');
-            refs.push({domain: ves.domain, externalId: ves.externalId});
+            if (ves.externalId) refs.push({domain: ves.domain, externalId: ves.externalId});
+            else if (ves.user) refs.push({email: ves.user});
+            else throw new libVES.Error.Unauthorized('The vault is locked');
         }
         return refs;
     }
@@ -4837,6 +4869,14 @@ libVES.Vault = class extends libVES.EventTarget {
         return new libVES.EventTracker(this);
     }
 
+    toAppRefs(refs, ves, owner) {
+        let shares = libVES.Vault.toRefs(refs, ves, owner);
+        if (this.appUrl !== undefined) shares.map((share) => {
+            if (share.appUrl === undefined) share.appUrl = this.appUrl;
+        });
+        return shares;
+    }
+
     toString() {
         return 'libVES.Vault(' + (this.uri() ?? '[pending]') + ')';
     }
@@ -4925,7 +4965,8 @@ libVES.EventTracker = class {
                 case 'vaultItem.created':
                     return itemfn('create');
                 case 'vaultItem.listening':
-                    return itemfn('change');
+                case 'vaultKey.listening':
+                    return itemfn('change', attn !== false);
                 case 'session.created':
                     return e.getFields({session: {id: true, remote: true, userAgent: true, vaultKey: {id: true}, user: {id: true}}}).then((flds) => {
                         if (!flds?.session) return null;
@@ -5005,7 +5046,7 @@ libVES.Item = class extends libVES.EventTarget {
     put(value, shares) {
         if (value == null) return Promise.reject(new libVES.Error.InvalidValue('The item value cannot be empty'));
         let prref;
-        return (shares ? Promise.resolve(libVES.Vault.toRefs(shares, this.vaultItem.VES, true)) : this.share().then((shares) => {
+        return (shares ? Promise.resolve(this.vault.toAppRefs(shares, this.vaultItem.VES, true)) : this.share().then((shares) => {
             let owner = shares.reduce((cur, sh) => (cur || ((sh.owner && sh.externalId?.match(/@/)) ? sh : null)), null);
             if (owner && owner.uri() != this.vault.uri()) shares.push(this.vault.vault({domain: '.admin', externalId: owner.externalId}));
             return shares;
@@ -5067,7 +5108,7 @@ libVES.Item = class extends libVES.EventTarget {
             let sh = new libVES.Vault((flds?.externals?.[0] ?? flds?.user?.email), this.vaultItem.VES, flds);
             if (sh) return sh.verify();
         }))))).then((shares) => shares.filter((sh) => sh)).then((shares) => {
-            this.provisional.share = this.provisional.share.concat(shares);
+            this.provisional.share = this.provisional.share.concat(this.vault.toAppRefs(shares));
             if (del) {
                 let uris = {};
                 shares.map((sh) => uris[sh.uri()] = sh);
@@ -5083,7 +5124,7 @@ libVES.Item = class extends libVES.EventTarget {
             if (shares) return this._provShare(shares, true);
             return Promise.resolve(this.provisional.share);
         }
-        return (shares ? (this._reset(), this.vaultItem.shareWith(libVES.Vault.toRefs(shares, this.vaultItem.VES, true))) : Promise.resolve(null)).then(() => {
+        return (shares ? (this._reset(), this.vaultItem.shareWith(this.vault.toAppRefs(shares, this.vaultItem.VES, true))) : Promise.resolve(null)).then(() => {
             let result = [];
             let found = {};
             let admins = {};
@@ -5121,7 +5162,7 @@ libVES.Item = class extends libVES.EventTarget {
         return this._entries().then(() => this.vaultItem.getShareVaultKeys()).then((vkeys) => {
             if (!vkeys) throw new libVES.Error.InvalidKey('Not authorized to share this item');
             if (!shares) return true;
-            libVES.Vault.toRefs(shares, this.vaultItem.VES).map((share) => vkeys.push(share));
+            this.vault.toAppRefs(shares, this.vaultItem.VES).map((share) => vkeys.push(share));
             this._reset();
             return this.vaultItem.shareWith(vkeys);
         }).then(() => true);
@@ -5145,7 +5186,7 @@ libVES.Item = class extends libVES.EventTarget {
 
     delete() {
         this._reset();
-        return this.vaultItem.delete();
+        return this.vaultItem.delete().then(() => true);
     }
 
     badauth() {
@@ -5270,6 +5311,6 @@ libVES.ItemCipher = class {
         return this.item?.uri();
     }
 };
-libVES.version = '3.00';
+libVES.version = '3.02';
 
 module.exports = libVES;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libves",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Simple, safe and secure end-to-end encryption at-rest",
   "main": "libVES.node.js",
   "scripts": {