Merge branch 'feat/check-exists-ui-improved'

wallabagger/_locales/en/messages.json

@@ -123,6 +123,10 @@
         "message": "hour",
         "description": "Options"
     },
+    "Indicate_if_page_already_saved_into_wallabag_the_wallabagger_icon_is_green": {
+        "message": "Indicate if page already saved (the wallabagger icon is green)",
+        "description": "Options"
+    },
     "Indicate_if_page_already_saved_this_sends_URL_of_each_tab_to_wallabag_use_HTTPS_protocol_for_better_security": {
         "message": "Indicate if page already saved (this sends URL of each tab to wallabag, use HTTPS protocol for better security!)",
         "description": "Options"

wallabagger/_locales/fr/messages.json

@@ -119,6 +119,10 @@
         "message": "heure",
         "description": "Options"
     },
+    "Indicate_if_page_already_saved_into_wallabag_the_wallabagger_icon_is_green": {
+        "message": "Indique si la page est déjà sauvegardée (l'icône de wallabagger est verte)",
+        "description": "Options"
+    },
     "Indicate_if_page_already_saved_this_sends_URL_of_each_tab_to_wallabag_use_HTTPS_protocol_for_better_security": {
         "message": "Indique si la page est déjà sauvegardée (tout changement d'onglet entraîne l'envoie de l'URL en cours à wallabag, utilisez le protocole HTTPS pour une meilleure sécurité !)",
         "description": "Options"

wallabagger/js/options.js

@@ -22,6 +22,8 @@ const OptionsController = function () {
 
     this.allowSpaceCheck = document.getElementById('allow-space-checkbox');
     this.allowExistCheck = document.getElementById('allow-exist-checkbox');
+    this.allowExistInsecureText = document.getElementById('allow-exist-insecure-text');
+    this.allowExistSecureText = document.getElementById('allow-exist-secure-text');
     this.fetchLocallyByDefault = document.getElementById('fetch-locally-by-default-checkbox');
     this.archiveByDefault = document.getElementById('archive-by-default-checkbox');
     this.debugEl = document.getElementById('debug');
@@ -166,6 +168,7 @@ OptionsController.prototype = {
     },
 
     wallabagApiTokenGot: function () {
+        this.allowExistTextMessage();
         this._green(this.clientId_);
         this._green(this.clientSecret_);
         this._green(this.userLogin_);
@@ -300,6 +303,7 @@ OptionsController.prototype = {
 
     wallabagUrlChecked: function () {
         if (this.data.ApiVersion) {
+            this.allowExistTextMessage();
             this.versionLabel_.textContent = this.data.ApiVersion;
             if (this.data.ApiVersion.split('.')[0] === '2') {
                 this._textSuccess(this.checkedLabel_);
@@ -445,7 +449,9 @@ OptionsController.prototype = {
         }
 
         this.allowSpaceCheck.checked = this.data.AllowSpaceInTags;
+
         this.allowExistCheck.checked = this.data.AllowExistCheck;
+
         this.autoAddSingleTag.checked = this.data.AutoAddSingleTag;
         this.debugEl.checked = this.data.Debug;
 
@@ -458,6 +464,17 @@ OptionsController.prototype = {
         this.sitesToFetchLocallyInputEl.value = this.data.sitesToFetchLocally;
     },
 
+    allowExistTextMessage: function () {
+        const allowExistTextToShow = this.data.AllowExistSafe === false
+            ? this.allowExistInsecureText
+            : this.allowExistSecureText;
+        const allowExistTextToHide = this.data.AllowExistSafe === true
+            ? this.allowExistInsecureText
+            : this.allowExistSecureText;
+        this._hide(allowExistTextToHide);
+        this._show(allowExistTextToShow);
+    },
+
     messageListener: function (msg) {
         switch (msg.response) {
             case 'setup':
@@ -475,6 +492,7 @@ OptionsController.prototype = {
             case 'setup-gettoken':
                 Object.assign(this.data, msg.data);
                 if (msg.result) {
+                    this.wallabagUrlChecked();
                     this.wallabagApiTokenGot();
                 } else {
                     this.wallabagApiTokenNotGot();

wallabagger/js/wallabag-api.js

@@ -32,6 +32,7 @@ WallabagApi.prototype = {
         isFetchPermissionGranted: null,
         AllowSpaceInTags: false,
         AllowExistCheck: false,
+        AllowExistSafe: null,
         Debug: false,
         AutoAddSingleTag: false,
         ArchiveByDefault: false,
@@ -49,7 +50,10 @@ WallabagApi.prototype = {
         Object.assign(this.data, this.defaultValues);
         this.fetchApi = new FetchApi();
         return this.load().then(
-            result => Promise.resolve(result)
+            result => {
+                this.setAllowExistSafe();
+                return Promise.resolve(result);
+            }
         );
     },
 
@@ -125,13 +129,24 @@ WallabagApi.prototype = {
     CheckUrl: function () {
         const url_ = this.data.Url + '/api/version';
         return this.fetchApi.Get(url_, '')
-            .then(fetchData => { this.data.ApiVersion = fetchData; return fetchData; })
+            .then(fetchData => {
+                this.data.ApiVersion = fetchData;
+                this.setAllowExistSafe();
+                return fetchData;
+            })
             .catch(error => {
                 throw new Error(`Failed to get api version ${url_}
                 ${error.message}`);
             });
     },
 
+    setAllowExistSafe: async function () {
+        if (typeof (this.data.Url) !== 'string') {
+            return false;
+        }
+        this.data.AllowExistSafe = await this.SupportsHashedUrl();
+    },
+
     /**
      * @returns {Promise<[number, number, number]>}
      */
@@ -265,6 +280,7 @@ WallabagApi.prototype = {
     },
 
     GetAppToken: function (content) {
+        this.CheckUrl();
         const oauthurl = `${this.data.Url}/oauth/v2/token`;
         return this.fetchApi.Post(oauthurl, '', content)
             .then(data => {
@@ -302,9 +318,9 @@ WallabagApi.prototype = {
     EntryExists: function (url) {
         const existsUrl = `${this.data.Url}/api/entries/exists.json`;
 
-        return this.CheckToken().then(() => this.SupportsHashedUrl()).then(useHashedUrl => {
-            const paramAsync = useHashedUrl ? hashUrl(url) : Promise.resolve(url);
-            return paramAsync.then(param => `${existsUrl}?${useHashedUrl ? 'hashed_url' : 'url'}=${encodeURIComponent(param)}`);
+        return this.CheckToken().then(() => {
+            const paramAsync = this.data.AllowExistSafe ? hashUrl(url) : Promise.resolve(url);
+            return paramAsync.then(param => `${existsUrl}?${this.data.AllowExistSafe ? 'hashed_url' : 'url'}=${encodeURIComponent(param)}`);
         })
             .then(url => this.fetchApi.Get(url, this.data.ApiToken))
             .catch(error => {

wallabagger/options.html

@@ -249,7 +249,9 @@ <h3 data-i18n="Others">Others</h3>
                 <div class="form-group">
                     <label class="form-switch">
                         <input type="checkbox" id="allow-exist-checkbox"/>
-                        <i class="form-icon"></i><span data-i18n="Indicate_if_page_already_saved_this_sends_URL_of_each_tab_to_wallabag_use_HTTPS_protocol_for_better_security">Indicate if page already saved (this sends URL of each tab to wallabag, use HTTPS protocol for better security!)</span>
+                        <i class="form-icon"></i>
+                        <span id="allow-exist-secure-text" data-i18n="Indicate_if_page_already_saved_into_wallabag_the_wallabagger_icon_is_green">Indicate if page already saved (the wallabagger icon is green)</span>
+                        <span id="allow-exist-insecure-text" data-i18n="Indicate_if_page_already_saved_this_sends_URL_of_each_tab_to_wallabag_use_HTTPS_protocol_for_better_security">Indicate if page already saved (this sends URL of each tab to wallabag, use HTTPS protocol for better security!)</span>
                     </label>
                 </div>