Merge pull request 'ranjith-dev' (#164) from ranjith-dev into master

Reviewed-on: #164

resources/views/filament/pages/notification-settings.blade.php

@@ -42,7 +42,7 @@
 
     <script>
         const vapidKey = "{{ config('webpush.vapid.public_key') }}";
-        // const csrfToken = "{{ csrf_token() }}";
+        const csrfToken = "{{ csrf_token() }}";
 
         async function registerPush() {
             if (!('serviceWorker' in navigator)) return;
@@ -57,11 +57,11 @@
                 applicationServerKey: vapidKey
             });
 
-            await fetch('/api/push/subscribe', {
+            await fetch('/push/subscribe', {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
-                    // 'X-CSRF-TOKEN': csrfToken
+                    'X-CSRF-TOKEN': csrfToken
                 },
                 body: JSON.stringify(subscription)
             });

routes/web.php

@@ -58,30 +58,30 @@ use App\Http\Livewire\CustomLogin;
         'keys.auth' => 'required|string',
     ]);
 
-    // WebPushSubscription::updateOrCreate(
-    //     ['endpoint' => $request->endpoint],
-    //     [
-    //         'subscribable_type' => get_class($user),
-    //         'subscribable_id'   => $user->id,
-    //         'public_key'        => $request->keys['p256dh'],
-    //         'auth_token'        => $request->keys['auth'],
-    //         'content_encoding'  => $request->contentEncoding ?? 'aesgcm',
-    //     ]
-    // );
-
     WebPushSubscription::updateOrCreate(
+        ['endpoint' => $request->endpoint],
         [
-            'endpoint'          => $request->endpoint,
             'subscribable_type' => get_class($user),
             'subscribable_id'   => $user->id,
-        ],
-        [
-            'public_key'       => $request->keys['p256dh'],
-            'auth_token'       => $request->keys['auth'],
-            'content_encoding' => $request->contentEncoding ?? 'aesgcm',
+            'public_key'        => $request->keys['p256dh'],
+            'auth_token'        => $request->keys['auth'],
+            'content_encoding'  => $request->contentEncoding ?? 'aesgcm',
         ]
     );
 
+    // WebPushSubscription::updateOrCreate(
+    //     [
+    //         'endpoint'          => $request->endpoint,
+    //         'subscribable_type' => get_class($user),
+    //         'subscribable_id'   => $user->id,
+    //     ],
+    //     [
+    //         'public_key'       => $request->keys['p256dh'],
+    //         'auth_token'       => $request->keys['auth'],
+    //         'content_encoding' => $request->contentEncoding ?? 'aesgcm',
+    //     ]
+    // );
+
 
     return response()->json(['success' => true]);
 });