Merge pull request 'changed registerPush method logic in push.js' (#138) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
Reviewed-on: #138
This commit was merged in pull request #138.
This commit is contained in:
@@ -1,3 +1,53 @@
|
||||
// async function registerPush() {
|
||||
// try {
|
||||
// console.log("Registering for push notifications");
|
||||
|
||||
// if (!('serviceWorker' in navigator)) {
|
||||
// console.error("ServiceWorker not supported");
|
||||
// return;
|
||||
// }
|
||||
|
||||
// const permission = await Notification.requestPermission();
|
||||
// console.log("Permission:", permission);
|
||||
|
||||
// if (permission !== 'granted') {
|
||||
// console.warn("Notification permission denied");
|
||||
// return;
|
||||
// }
|
||||
|
||||
// const registration = await navigator.serviceWorker.register('/sw.js');
|
||||
// console.log("SW registered:", registration);
|
||||
|
||||
// // const subscription = await registration.pushManager.subscribe({
|
||||
// // userVisibleOnly: true,
|
||||
// // applicationServerKey: vapidKey
|
||||
// // });
|
||||
// const subscription = await registration.pushManager.subscribe({
|
||||
// userVisibleOnly: true,
|
||||
// applicationServerKey: urlBase64ToUint8Array(vapidKey),
|
||||
// });
|
||||
|
||||
// console.log('VAPID key:', vapidKey);
|
||||
|
||||
// console.log("Subscription created:", subscription);
|
||||
|
||||
// const res = await fetch('/push/subscribe', {
|
||||
// method: 'POST',
|
||||
// headers: {
|
||||
// 'Content-Type': 'application/json',
|
||||
// 'X-CSRF-TOKEN': csrfToken
|
||||
// },
|
||||
// body: JSON.stringify(subscription)
|
||||
// });
|
||||
|
||||
// console.log("Server response:", await res.text());
|
||||
|
||||
// alert("Push enabled ✅");
|
||||
// } catch (e) {
|
||||
// console.error("Push registration failed ❌", e);
|
||||
// }
|
||||
// }
|
||||
|
||||
async function registerPush() {
|
||||
try {
|
||||
console.log("Registering for push notifications");
|
||||
@@ -8,30 +58,29 @@ async function registerPush() {
|
||||
}
|
||||
|
||||
const permission = await Notification.requestPermission();
|
||||
console.log("Permission:", permission);
|
||||
|
||||
if (permission !== 'granted') {
|
||||
console.warn("Notification permission denied");
|
||||
return;
|
||||
}
|
||||
|
||||
const registration = await navigator.serviceWorker.register('/sw.js');
|
||||
console.log("SW registered:", registration);
|
||||
|
||||
// const subscription = await registration.pushManager.subscribe({
|
||||
// userVisibleOnly: true,
|
||||
// applicationServerKey: vapidKey
|
||||
// });
|
||||
const subscription = await registration.pushManager.subscribe({
|
||||
// ✅ GET first
|
||||
let subscription = await registration.pushManager.getSubscription();
|
||||
|
||||
// ✅ CREATE only if not exists
|
||||
if (!subscription) {
|
||||
subscription = await registration.pushManager.subscribe({
|
||||
userVisibleOnly: true,
|
||||
applicationServerKey: urlBase64ToUint8Array(vapidKey),
|
||||
});
|
||||
console.log("New subscription created");
|
||||
} else {
|
||||
console.log("Existing subscription reused");
|
||||
}
|
||||
|
||||
console.log('VAPID key:', vapidKey);
|
||||
|
||||
console.log("Subscription created:", subscription);
|
||||
|
||||
const res = await fetch('/push/subscribe', {
|
||||
// 🔥 ALWAYS send to backend
|
||||
await fetch('/push/subscribe', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
@@ -40,14 +89,13 @@ async function registerPush() {
|
||||
body: JSON.stringify(subscription)
|
||||
});
|
||||
|
||||
console.log("Server response:", await res.text());
|
||||
|
||||
alert("Push enabled ✅");
|
||||
} catch (e) {
|
||||
console.error("Push registration failed ❌", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function urlBase64ToUint8Array(base64String) {
|
||||
const padding = '='.repeat((4 - base64String.length % 4) % 4);
|
||||
const base64 = (base64String + padding)
|
||||
|
||||
Reference in New Issue
Block a user