diff --git a/background.js b/background.js index ae13cc6..09c7c60 100755 --- a/background.js +++ b/background.js @@ -123,10 +123,8 @@ function setDefaultOptions() { } function check_sites_updated() { - let url = 'https://gitlab.com/magnolia1234/bypass-paywalls-' + url_loc + '-clean/-/raw/master/sites_updated.json'; - //let url = 'https://bitbucket.org/magnolia1234/bypass-paywalls-firefox-clean/raw/master/sites_updated.json'; - let proxyurl = 'https://bpc2-cors-anywhere.herokuapp.com/'; - fetch(proxyurl + url, {headers: {"Content-Type": "text/plain", "X-Requested-With": "XMLHttpRequest"} }) + let sites_updated_json = 'https://gitlab.com/magnolia1234/bypass-paywalls-' + url_loc + '-clean/-/raw/master/sites_updated.json'; + fetch(sites_updated_json) .then(response => { if (response.ok) { response.json().then(json => { @@ -1131,10 +1129,8 @@ function updateBadge(activeTab) { var ext_version_new; function check_update() { - let url = 'https://gitlab.com/magnolia1234/bypass-paywalls-' + url_loc + '-clean/raw/master/manifest.json'; - //let url = 'https://bitbucket.org/magnolia1234/bypass-paywalls-firefox-clean/raw/master/manifest.json'; - let proxyurl = 'https://bpc2-cors-anywhere.herokuapp.com/'; - fetch(proxyurl + url, {headers: {"Content-Type": "text/plain", "X-Requested-With": "XMLHttpRequest"} }) + let manifest_new = 'https://gitlab.com/magnolia1234/bypass-paywalls-' + url_loc + '-clean/raw/master/manifest.json'; + fetch(manifest_new) .then(response => { if (response.ok) { response.json().then(json => { diff --git a/changelog.txt b/changelog.txt index b07c861..1a7d906 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Changelog Bypass Paywalls Clean - Chrome Post-release +Fix update check (GitLab CORS issue or BitBucket http error 429) * v2.5.7.0 (2022-02-20) Remove Ruhr Nachrichten (fix obsolete) diff --git a/custom/manifest.json b/custom/manifest.json index 9be00f1..8aa4f7e 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -39,5 +39,5 @@ "webRequestBlocking", "" ], - "version": "2.5.7.0" + "version": "2.5.7.1" } diff --git a/manifest.json b/manifest.json index e57ac20..6eebb6c 100755 --- a/manifest.json +++ b/manifest.json @@ -591,6 +591,7 @@ "*://*.epimg.net/*", "*://*.flip-pay.com/*", "*://*.gannett-cdn.com/*", + "*://*.gitlab.com/magnolia1234/*", "*://*.hearstnp.com/*", "*://*.jsdelivr.net/*", "*://*.lightboxcdn.com/*", @@ -607,5 +608,5 @@ "*://*.wallkit.net/*", "*://*.wsj.net/*" ], - "version": "2.5.7.0" + "version": "2.5.7.1" } diff --git a/options/version.js b/options/version.js index ba2b055..d8330f1 100644 --- a/options/version.js +++ b/options/version.js @@ -44,9 +44,7 @@ function show_update(ext_version_new, check = true) { function check_version_update(ext_version_new, popup) { if (!popup) { let manifest_new = 'https://gitlab.com/magnolia1234/bypass-paywalls-' + url_loc + '-clean/raw/master/manifest.json'; - //let manifest_new = 'https://bitbucket.org/magnolia1234/bypass-paywalls-firefox-clean/raw/master/manifest.json'; - let proxyurl = 'https://bpc2-cors-anywhere.herokuapp.com/'; - fetch(proxyurl + manifest_new, {headers: {"Content-Type": "text/plain", "X-Requested-With": "XMLHttpRequest"} }) + fetch(manifest_new) .then(response => { if (response.ok) { response.json().then(json => {