Adjust endpoints to match server expectationswip/push-notif

2 files changed, 5 insertions, 3 deletions

diff --git a/ui/lib/apiServer.js b/ui/lib/apiServer.js
index 295c99a..79fbd17 100644
--- a/ui/lib/apiServer.js
+++ b/ui/lib/apiServer.js
@@ -51,7 +51,7 @@ export async function acceptInvite(inviteId, name, password) {
 }
 
 export async function createPushSubscription(data) {
-  return await apiServer.post('/push', { data }).catch(responseError);
+  return await apiServer.post('/push/subscribe', { data }).catch(responseError);
 }
 
 export async function deletePushSubscription(data) {
diff --git a/ui/lib/components/NotificationSettings.svelte b/ui/lib/components/NotificationSettings.svelte
index 94acb37..99432c4 100644
--- a/ui/lib/components/NotificationSettings.svelte
+++ b/ui/lib/components/NotificationSettings.svelte
@@ -6,21 +6,23 @@
   let subscriptionJson = $state(null);
 
   function doSubscribe() {
+    let vapid;
     navigator.serviceWorker.ready
       .then(async (registration) => {
         // TODO: Get vapid key from remote.state instead:
         const response = await fetch('/api/vapid');
         // and if we fail to get it?
         const vapidPublicKey = await response.text();
-        const convertedVapidKey = vapidPublicKey;
+        vapid = vapidPublicKey;
         return registration.pushManager.subscribe({
           userVisibleOnly: true,
-          applicationServerKey: convertedVapidKey,
+          applicationServerKey: vapid,
         });
       })
       .then((subscription) => {
         const subJson = subscription.toJSON();
         subscriptionJson = {
+          vapid,
           endpoint: subJson.endpoint,
           p256dh: subJson.keys.p256dh,
           auth: subJson.keys.auth,