From 83705ae058df28ddb07c661bed46c94bc2ee901c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Sep 2016 18:22:40 +0200
Subject: [PATCH] Improve the UI in read-only mode

---
 customize.dist/translations/messages.fr.js |  7 ++---
 customize.dist/translations/messages.js    |  7 ++---
 www/code/main.js                           | 34 ++++++++++++----------
 www/common/cryptpad-common.js              |  7 +++--
 www/pad/main.js                            | 34 ++++++++++++----------
 5 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 9fd72124a..d289fbfc3 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -65,10 +65,9 @@ define(function () {
 
     out.commitButton = 'VALIDER';
 
-    out.linksButton = 'LIENS';
-    out.linksButtonTitle = 'Obtenir les liens disponibles pour accéder à ce document';
-    out.readonlyUrl = 'Lien de lecture seule';
-    out.editUrl = "Lien d'édition";
+    out.getViewButton = 'LECTURE SEULE';
+    out.getViewButtonTitle = "Obtenir l'adresse d'accès à ce document en lecture seule";
+    out.readonlyUrl = 'URL de lecture seule';
 
     out.disconnectAlert = 'Perte de la connexion au réseau !';
 
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index eda389589..06df24f26 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -64,11 +64,10 @@ define(function () {
     out.presentSuccess = 'Hit ESC to exit presentation mode';
 
     out.commitButton = 'COMMIT';
-    
-    out.linksButton = 'LINKS';
-    out.linksButtonTitle = 'Get the available links for this document';
+
+    out.getViewButton = 'READ-ONLY URL';
+    out.getViewButtonTitle = 'Get the read-only URL for this document';
     out.readonlyUrl = 'Read only URL';
-    out.editUrl = 'Edit URL';
 
     out.disconnectAlert = 'Network connection lost!';
 
diff --git a/www/code/main.js b/www/code/main.js
index 491de8e43..e8e7958a6 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -39,7 +39,10 @@ define([
             toolbar;
 
         var secret = Cryptpad.getSecrets();
-        var readOnly = !secret.keys.editKeyStr;
+        var readOnly = secret.keys && !secret.keys.editKeyStr;
+        if (!secret.keys) {
+            secret.keys = secret.key;
+        }
 
         var andThen = function (CMeditor) {
             var CodeMirror = module.CodeMirror = CMeditor;
@@ -398,21 +401,20 @@ define([
                     });
                 $rightside.append($forgetPad);
 
-                /* add a 'links' button */
-                var $links = $('<button>', {
-                    title: Messages.linksButtonTitle
-                })
-                    .text(Messages.linksButton)
-                    .addClass('rightside-button')
-                    .click(function () {
-                        var baseUrl = window.location.origin + window.location.pathname + '#';
-                        var content = '<b>' + Messages.readonlyUrl + '</b> : <a target="_blank">' + baseUrl + viewHash + '</a>';
-                        if (!readOnly) {
-                            content += '<br><b>' + Messages.editUrl + '</b> : <a target="_blank">' + baseUrl + editHash + '</a>';
-                        }
-                        Cryptpad.alert(content);
-                    });
-                $rightside.append($links);
+                if (!readOnly && viewHash) {
+                    /* add a 'links' button */
+                    var $links = $('<button>', {
+                        title: Messages.getViewButtonTitle
+                    })
+                        .text(Messages.getViewButton)
+                        .addClass('rightside-button')
+                        .click(function () {
+                            var baseUrl = window.location.origin + window.location.pathname + '#';
+                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a target="_blank">' + baseUrl + viewHash + '</a><br>';
+                            Cryptpad.alert(content);
+                        });
+                    $rightside.append($links);
+                }
 
                 var configureLanguage = function (cb) {
                     // FIXME this is async so make it happen as early as possible
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 76685717d..c28ed33ae 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -139,11 +139,14 @@ define([
 
     var getEditHashFromKeys = common.getEditHashFromKeys = function (chanKey, keys) {
         if (typeof keys === 'string') {
-            return chanKey + Crypto.b64RemoveSlashes(keys);
+            return chanKey + keys;
         }
         return '/1/edit/' + hexToBase64(chanKey) + '/' + Crypto.b64RemoveSlashes(keys.editKeyStr);
     };
     var getViewHashFromKeys = common.getViewHashFromKeys = function (chanKey, keys) {
+        if (typeof keys === 'string') {
+            return;
+        }
         return '/1/view/' + hexToBase64(chanKey) + '/' + Crypto.b64RemoveSlashes(keys.viewKeyStr);
     };
     var getHashFromKeys = common.getHashFromKeys = getEditHashFromKeys;
@@ -178,7 +181,7 @@ define([
                 var version = hashArray[1];
                 /*if (version === "1") {
                     secret.channel = base64ToHex(hashArray[2]);
-                    secret.key = hashArray[3].replace(/-/g, '/'); //TODO replace / by -
+                    secret.key = hashArray[3].replace(/-/g, '/');
                     if (secret.channel.length !== 32 || secret.key.length !== 24) {
                         common.alert("The channel key and/or the encryption key is invalid");
                         throw new Error("The channel key and/or the encryption key is invalid");
diff --git a/www/pad/main.js b/www/pad/main.js
index 9aa22a0ec..91c710f66 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -65,7 +65,10 @@ define([
 
     var andThen = function (Ckeditor) {
         var secret = Cryptpad.getSecrets();
-        var readOnly = !secret.keys.editKeyStr;
+        var readOnly = secret.keys && !secret.keys.editKeyStr;
+        if (!secret.keys) {
+            secret.keys = secret.key;
+        }
 
         var fixThings = false;
 
@@ -566,21 +569,20 @@ define([
                     });
                 $rightside.append($forgetPad);
 
-                /* add a 'links' button */
-                var $links = $('<button>', {
-                    title: Messages.linksButtonTitle
-                })
-                    .text(Messages.linksButton)
-                    .addClass('rightside-button')
-                    .click(function () {
-                        var baseUrl = window.location.origin + window.location.pathname + '#';
-                        var content = '<b>' + Messages.readonlyUrl + '</b> : <a target="_blank">' + baseUrl + viewHash + '</a>';
-                        if (!readOnly) {
-                            content += '<br><b>' + Messages.editUrl + '</b> : <a target="_blank">' + baseUrl + editHash + '</a>';
-                        }
-                        Cryptpad.alert(content);
-                    });
-                $rightside.append($links);
+                if (!readOnly && viewHash) {
+                    /* add a 'links' button */
+                    var $links = $('<button>', {
+                        title: Messages.getViewButtonTitle
+                    })
+                        .text(Messages.getViewButton)
+                        .addClass('rightside-button')
+                        .click(function () {
+                            var baseUrl = window.location.origin + window.location.pathname + '#';
+                            var content = '<b>' + Messages.readonlyUrl + '</b><br><a target="_blank">' + baseUrl + viewHash + '</a><br>';
+                            Cryptpad.alert(content);
+                        });
+                    $rightside.append($links);
+                }
 
                 // set the hash
                 if (!readOnly) {