From 94622fc34bc4e5488b0b6382e78536e3bbb7d2a1 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 23 Feb 2021 13:49:25 +0100 Subject: [PATCH] Fix mute access requests when the pad is not in your drive --- www/common/inner/access.js | 1 + www/common/sframe-common-outer.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www/common/inner/access.js b/www/common/inner/access.js index cea4544e2..3bbef91e9 100644 --- a/www/common/inner/access.js +++ b/www/common/inner/access.js @@ -1053,6 +1053,7 @@ define([ spinner.hide(); var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden : Messages.error; + console.error(err); return void UI.warn(text); } spinner.done(); diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js index fcc3d4274..459265aba 100644 --- a/www/common/sframe-common-outer.js +++ b/www/common/sframe-common-outer.js @@ -845,7 +845,7 @@ define([ var metadata = data.metadata; var add = data.add; var _secret = secret; - if (metadata && (metadata.href || metadata.roHref)) { + if (metadata && (metadata.href || metadata.roHref) && !metadata.fakeHref) { var _parsed = Utils.Hash.parsePadUrl(metadata.href || metadata.roHref); _secret = Utils.Hash.getSecrets(_parsed.type, _parsed.hash, metadata.password); } @@ -855,7 +855,8 @@ define([ var crypto = Crypto.createEncryptor(_secret.keys); nThen(function (waitFor) { // If we already have metadata, use it, otherwise, try to get it - if (metadata) { return; } + console.error(metadata); + if (metadata && metadata.owners) { return; } Cryptpad.getPadMetadata({ channel: secret.channel