From a9c4ef7e5d44a71eb37a7b71b2fcdbf6aaf388fc Mon Sep 17 00:00:00 2001 From: Kevin Brubeck Unhammer Date: Mon, 12 Jun 2023 07:17:43 +0200 Subject: [PATCH] Remove login requirement Fix https://github.com/divvun/divvun-webdemo/issues/17 --- lib/app.js | 12 ++++++++++-- src/app.js | 15 +++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/app.js b/lib/app.js index 4ff9413..83edb0a 100644 --- a/lib/app.js +++ b/lib/app.js @@ -351,6 +351,8 @@ $(document).ready(function () { } }); +var requireLogin = false; + var hideLogin = function hideLogin() { $("#serverfault").hide(); $("#loginform").hide(); @@ -360,6 +362,10 @@ var hideLogin = function hideLogin() { }; var showLogin = function showLogin() { + if (!requireLogin) { + hideLogin(); + return; + } $("#loginform").show(); $("#content").addClass("blur"); $("#login-wrapper").addClass("block-view"); @@ -413,7 +419,9 @@ var servercheck = function servercheck(userpass, text, off, cb, mode) { console.log(url, data); return $.ajax(url, { beforeSend: function beforeSend(xhr) { - xhr.setRequestHeader("Authorization", basicAuthHeader(userpass)); + if (requireLogin) { + xhr.setRequestHeader("Authorization", basicAuthHeader(userpass)); + } }, type: "POST", data: data, @@ -649,7 +657,7 @@ var _check = function _check() { window.localStorage["text"] = JSON.stringify(quill.getContents()); var userpass = safeGetItem("userpass", readLoginFormStoring()); - if (userpass == null) { + if (requireLogin && userpass == null) { showLogin(); } else { while (checkXHR.length > 0) { diff --git a/src/app.js b/src/app.js index 3c902e8..098194e 100644 --- a/src/app.js +++ b/src/app.js @@ -408,6 +408,8 @@ $(document).ready(function() { } }); +const requireLogin = false; + var hideLogin = function () { $("#serverfault").hide(); $("#loginform").hide(); @@ -416,8 +418,11 @@ var hideLogin = function () { $("#logout").show(); }; -var showLogin = function () { - // caller decides whether to show #serverfault +var showLogin = function showLogin() { + if(!requireLogin) { + hideLogin(); + return; + } $("#loginform").show(); $("#content").addClass("blur"); $("#login-wrapper").addClass("block-view"); @@ -484,7 +489,9 @@ var servercheck = function(userpass/*:userpass*/, console.log(url, data); return $.ajax(url, { beforeSend: function(xhr) { - xhr.setRequestHeader("Authorization", basicAuthHeader(userpass)); + if(requireLogin) { + xhr.setRequestHeader("Authorization", basicAuthHeader(userpass)); + } }, type: "POST", data: data, @@ -753,7 +760,7 @@ var check = function() { let userpass = safeGetItem("userpass", readLoginFormStoring()); - if(userpass == null) { + if (requireLogin && userpass == null) { showLogin(); } else {