.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "1.3.27"
+current_version = "1.3.26"
 commit = true
 tag = true
 tag_name = "{new_version}"

VERSION

@@ -1 +1 @@
-1.3.27
+1.3.26

templates/base.html

@@ -74,13 +74,12 @@
         }
 
         function subscribeUser(registration) {
-            fetch('/vapid-public-key')
+            let baseUrl = '{{ config.BASE_URL }}'.replace(/\/$/, ""); // Remove trailing slash if present
-                .then(response => {
+            if (window.location.protocol === 'https:') {
-                    if (!response.ok) {
+                baseUrl = baseUrl.replace(/^http:/, 'https:');
-                        throw new Error('Failed to fetch VAPID public key');
+            }
-                    }
+            fetch(`${baseUrl}/vapid-public-key`)
-                    return response.json();
+                .then(response => response.json())
-                })
                 .then(data => {
                     const applicationServerKey = urlB64ToUint8Array(data.public_key);
                     registration.pushManager.subscribe({
@@ -93,12 +92,16 @@
                         console.log('Failed to subscribe the user: ', err);
                     });
                 }).catch(function(err) {
-                    console.error('Error during subscription process:', err);
+                    console.error('Failed to fetch vapid key:', err);
                 });
         }
 
         function saveSubscription(subscription) {
-            fetch('/save-subscription', {
+            let baseUrl = '{{ config.BASE_URL }}'.replace(/\/$/, ""); // Remove trailing slash if present
+            if (window.location.protocol === 'https:') {
+                baseUrl = baseUrl.replace(/^http:/, 'https:');
+            }
+            fetch(`${baseUrl}/save-subscription`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',