From 61cc5cab6cf83b388d4397fa043c0d22305151ee Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 21 Apr 2021 16:11:23 +0200
Subject: [PATCH 1/4] Remove logs

---
 www/report/main.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/www/report/main.js b/www/report/main.js
index 367d457a0..44d15b222 100644
--- a/www/report/main.js
+++ b/www/report/main.js
@@ -82,7 +82,6 @@ define([
             }
         }), { network: network, onCacheReady: onCacheReady});
     }).nThen(function (waitFor) {
-        console.log(proxy);
         var drive = proxy.drive || {};
         if (!proxy.drive) {
             addReport('ERROR: no drive');
@@ -184,7 +183,6 @@ define([
                         return;
                     }
                     addReport('Roster channel: ' + d.channel);
-                    console.warn(rosterKeys);
                     checkCache(d.channel, function () {
                         var crypto = Crypto.Team.createEncryptor(rosterKeys);
                         var m = 0;
@@ -233,7 +231,6 @@ define([
                                     _obj.href = cryptor.decrypt(_obj.href);
                                 }
                                 var parsed = Hash.parsePadUrl(_obj.href || _obj.roHref);
-                                console.log(parsed.hash, _obj);
                                 Crypt.get(parsed.hash, function (err, val, errorObj) {
                                     if (err) {
                                         addReport('ERROR: ' + err);

From 5b091ca753437916ba34656e53664f540a291938 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 21 Apr 2021 16:13:32 +0200
Subject: [PATCH 2/4] Add a line at the beginning of the report

---
 www/report/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/report/main.js b/www/report/main.js
index 44d15b222..5717f7120 100644
--- a/www/report/main.js
+++ b/www/report/main.js
@@ -63,6 +63,7 @@ define([
             network = _network;
         }));
     }).nThen(function (waitFor) {
+        addReport('BEGIN REPORT');
         var secret = Hash.getSecrets('drive', hash);
         addReport('Load drive. ID: ' + secret.channel);
         checkCache(secret.channel, waitFor());

From bb454f22b18c2d309b3f76413345d75769c740de Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 21 Apr 2021 16:20:38 +0200
Subject: [PATCH 3/4] Hide 'open link' option from settings temporarily

---
 www/settings/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index f10e5046c..bfe55385b 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -84,7 +84,7 @@ define([
             'cp-settings-pad-width',
             'cp-settings-pad-spellcheck',
             'cp-settings-pad-notif',
-            'cp-settings-pad-openlink',
+            //'cp-settings-pad-openlink', // XXX test, translate and re-enable
         ],
         'code': [ // Msg.settings_cat_code
             'cp-settings-code-indent-unit',

From 12718d4bde6280dc84faa78c7b0e43f81466a5bf Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 21 Apr 2021 17:21:04 +0200
Subject: [PATCH 4/4] Fix infinite loading screen (maybe)

---
 www/common/outer/async-store.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 0dd2b0613..bf5359833 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1656,7 +1656,9 @@ define([
             } else if (teams.some(function (teamId) {
                 // We're not allowed: check our teams
                 var ed = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPublic']);
+                var edPrivate = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPrivate']);
                 if (allowed.indexOf(ed) === -1) { return false; }
+                if (!edPrivate) { return false; } // XXX: Only editors can authenticate...
                 // This team is allowed: use its rpc
                 var t = teamModule.getTeam(teamId);
                 _store = t;