@@ -55,7 +63,7 @@ export const NavbarView: FC = ({ -

{proxyContextValue && (

@@ -71,6 +79,18 @@ export const NavbarView: FC = ({ />

+ {enabled ? ( + subscribed ? ( + + ) : ( + + ) + ) : null} + { + return chunkInfo.name === "serviceWorker" + ? "[name].js" + : "assets/[name]-[hash].js"; + }, + }, + }, }, define: { "process.env": { @@ -89,6 +103,10 @@ export default defineConfig({ target: process.env.CODER_HOST || "http://localhost:3000", secure: process.env.NODE_ENV === "production", }, + "/serviceWorker.js": { + target: process.env.CODER_HOST || "http://localhost:3000", + secure: process.env.NODE_ENV === "production", + }, }, allowedHosts: true, }, From f729332a1218de68d78c2b53fb4cf79ec17a24a3 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 27 Mar 2025 12:02:58 +0000 Subject: [PATCH 2/8] chore(coderd/webpush): add test helpers --- coderd/webpush/webpush_test.go | 99 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/coderd/webpush/webpush_test.go b/coderd/webpush/webpush_test.go index 2566e0edb348d..7e584dedf4633 100644 --- a/coderd/webpush/webpush_test.go +++ b/coderd/webpush/webpush_test.go @@ -2,6 +2,8 @@ package webpush_test import ( "context" + "encoding/json" + "io" "net/http" "net/http/httptest" "testing" @@ -32,7 +34,9 @@ func TestPush(t *testing.T) { t.Run("SuccessfulDelivery", func(t *testing.T) { t.Parallel() ctx := testutil.Context(t, testutil.WaitShort) - manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, _ *http.Request) { + msg := randomWebpushMessage(t) + manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, r *http.Request) { + assertWebpushPayload(t, r) w.WriteHeader(http.StatusOK) }) user := dbgen.User(t, store, database.User{}) @@ -45,16 +49,7 @@ func TestPush(t *testing.T) { }) require.NoError(t, err) - notification := codersdk.WebpushMessage{ - Title: "Test Title", - Body: "Test Body", - Actions: []codersdk.WebpushMessageAction{ - {Label: "View", URL: "https://coder.com/view"}, - }, - Icon: "workspace", - } - - err = manager.Dispatch(ctx, user.ID, notification) + err = manager.Dispatch(ctx, user.ID, msg) require.NoError(t, err) subscriptions, err := store.GetWebpushSubscriptionsByUserID(ctx, user.ID) @@ -66,7 +61,8 @@ func TestPush(t *testing.T) { t.Run("ExpiredSubscription", func(t *testing.T) { t.Parallel() ctx := testutil.Context(t, testutil.WaitShort) - manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, _ *http.Request) { + manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, r *http.Request) { + assertWebpushPayload(t, r) w.WriteHeader(http.StatusGone) }) user := dbgen.User(t, store, database.User{}) @@ -79,12 +75,8 @@ func TestPush(t *testing.T) { }) require.NoError(t, err) - notification := codersdk.WebpushMessage{ - Title: "Test Title", - Body: "Test Body", - } - - err = manager.Dispatch(ctx, user.ID, notification) + msg := randomWebpushMessage(t) + err = manager.Dispatch(ctx, user.ID, msg) require.NoError(t, err) subscriptions, err := store.GetWebpushSubscriptionsByUserID(ctx, user.ID) @@ -95,7 +87,8 @@ func TestPush(t *testing.T) { t.Run("FailedDelivery", func(t *testing.T) { t.Parallel() ctx := testutil.Context(t, testutil.WaitShort) - manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, _ *http.Request) { + manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, r *http.Request) { + assertWebpushPayload(t, r) w.WriteHeader(http.StatusBadRequest) w.Write([]byte("Invalid request")) }) @@ -110,12 +103,8 @@ func TestPush(t *testing.T) { }) require.NoError(t, err) - notification := codersdk.WebpushMessage{ - Title: "Test Title", - Body: "Test Body", - } - - err = manager.Dispatch(ctx, user.ID, notification) + msg := randomWebpushMessage(t) + err = manager.Dispatch(ctx, user.ID, msg) require.Error(t, err) assert.Contains(t, err.Error(), "Invalid request") @@ -130,13 +119,15 @@ func TestPush(t *testing.T) { ctx := testutil.Context(t, testutil.WaitShort) var okEndpointCalled bool var goneEndpointCalled bool - manager, store, serverOKURL := setupPushTest(ctx, t, func(w http.ResponseWriter, _ *http.Request) { + manager, store, serverOKURL := setupPushTest(ctx, t, func(w http.ResponseWriter, r *http.Request) { okEndpointCalled = true + assertWebpushPayload(t, r) w.WriteHeader(http.StatusOK) }) - serverGone := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + serverGone := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { goneEndpointCalled = true + assertWebpushPayload(t, r) w.WriteHeader(http.StatusGone) })) defer serverGone.Close() @@ -163,15 +154,8 @@ func TestPush(t *testing.T) { }) require.NoError(t, err) - notification := codersdk.WebpushMessage{ - Title: "Test Title", - Body: "Test Body", - Actions: []codersdk.WebpushMessageAction{ - {Label: "View", URL: "https://coder.com/view"}, - }, - } - - err = manager.Dispatch(ctx, user.ID, notification) + msg := randomWebpushMessage(t) + err = manager.Dispatch(ctx, user.ID, msg) require.NoError(t, err) assert.True(t, okEndpointCalled, "The valid endpoint should be called") assert.True(t, goneEndpointCalled, "The expired endpoint should be called") @@ -189,8 +173,9 @@ func TestPush(t *testing.T) { ctx := testutil.Context(t, testutil.WaitShort) var requestReceived bool - manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, _ *http.Request) { + manager, store, serverURL := setupPushTest(ctx, t, func(w http.ResponseWriter, r *http.Request) { requestReceived = true + assertWebpushPayload(t, r) w.WriteHeader(http.StatusOK) }) @@ -205,17 +190,8 @@ func TestPush(t *testing.T) { }) require.NoError(t, err, "Failed to insert push subscription") - notification := codersdk.WebpushMessage{ - Title: "Test Notification", - Body: "This is a test notification body", - Actions: []codersdk.WebpushMessageAction{ - {Label: "View Workspace", URL: "https://coder.com/workspace/123"}, - {Label: "Cancel", URL: "https://coder.com/cancel"}, - }, - Icon: "workspace-icon", - } - - err = manager.Dispatch(ctx, user.ID, notification) + msg := randomWebpushMessage(t) + err = manager.Dispatch(ctx, user.ID, msg) require.NoError(t, err, "The push notification should be dispatched successfully") require.True(t, requestReceived, "The push notification request should have been received by the server") }) @@ -242,8 +218,35 @@ func TestPush(t *testing.T) { }) } +func randomWebpushMessage(t testing.TB) codersdk.WebpushMessage { + t.Helper() + return codersdk.WebpushMessage{ + Title: testutil.GetRandomName(t), + Body: testutil.GetRandomName(t), + + Actions: []codersdk.WebpushMessageAction{ + {Label: "A", URL: "https://example.com/a"}, + {Label: "B", URL: "https://example.com/b"}, + }, + Icon: "https://example.com/icon.png", + } +} + +func assertWebpushPayload(t testing.TB, r *http.Request) { + t.Helper() + assert.Equal(t, http.MethodPost, r.Method) + assert.Equal(t, "application/octet-stream", r.Header.Get("Content-Type")) + assert.Equal(t, r.Header.Get("content-encoding"), "aes128gcm") + assert.Contains(t, r.Header.Get("Authorization"), "vapid") + + // Attempting to decode the request body as JSON should fail as it is + // encrypted. + assert.Error(t, json.NewDecoder(r.Body).Decode(io.Discard)) +} + // setupPushTest creates a common test setup for webpush notification tests func setupPushTest(ctx context.Context, t *testing.T, handlerFunc func(w http.ResponseWriter, r *http.Request)) (webpush.Dispatcher, database.Store, string) { + t.Helper() logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug) db, _ := dbtestutil.NewDB(t) From f04786999e7072da746d47524ae4559e4c2427d0 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 27 Mar 2025 12:05:39 +0000 Subject: [PATCH 3/8] re-add context and sw after rebase --- site/src/contexts/useWebpushNotifications.ts | 110 +++++++++++++++++++ site/src/serviceWorker.ts | 36 ++++++ 2 files changed, 146 insertions(+) create mode 100644 site/src/contexts/useWebpushNotifications.ts create mode 100644 site/src/serviceWorker.ts diff --git a/site/src/contexts/useWebpushNotifications.ts b/site/src/contexts/useWebpushNotifications.ts new file mode 100644 index 0000000000000..21c033d975255 --- /dev/null +++ b/site/src/contexts/useWebpushNotifications.ts @@ -0,0 +1,110 @@ +import { API } from "api/api"; +import { buildInfo } from "api/queries/buildInfo"; +import { experiments } from "api/queries/experiments"; +import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata"; +import { useEffect, useState } from "react"; +import { useQuery } from "react-query"; + +interface WebpushNotifications { + readonly enabled: boolean; + readonly subscribed: boolean; + readonly loading: boolean; + + subscribe(): Promise; + unsubscribe(): Promise; +} + +export const useWebpushNotifications = (): WebpushNotifications => { + const { metadata } = useEmbeddedMetadata(); + const buildInfoQuery = useQuery(buildInfo(metadata["build-info"])); + const enabledExperimentsQuery = useQuery(experiments(metadata.experiments)); + + const [subscribed, setSubscribed] = useState(false); + const [loading, setLoading] = useState(true); + const [enabled, setEnabled] = useState(false); + + useEffect(() => { + // Check if the experiment is enabled. + if (enabledExperimentsQuery.data?.includes("web-push")) { + setEnabled(true); + } + + // Check if browser supports push notifications + if (!("Notification" in window) || !("serviceWorker" in navigator)) { + setSubscribed(false); + setLoading(false); + return; + } + + const checkSubscription = async () => { + try { + const registration = await navigator.serviceWorker.ready; + const subscription = await registration.pushManager.getSubscription(); + setSubscribed(!!subscription); + } catch (error) { + console.error("Error checking push subscription:", error); + setSubscribed(false); + } finally { + setLoading(false); + } + }; + + checkSubscription(); + }, [enabledExperimentsQuery.data]); + + const subscribe = async (): Promise => { + try { + setLoading(true); + const registration = await navigator.serviceWorker.ready; + const vapidPublicKey = buildInfoQuery.data?.webpush_public_key; + + const subscription = await registration.pushManager.subscribe({ + userVisibleOnly: true, + applicationServerKey: vapidPublicKey, + }); + const json = subscription.toJSON(); + if (!json.keys || !json.endpoint) { + throw new Error("No keys or endpoint found"); + } + + await API.createNotificationPushSubscription("me", { + endpoint: json.endpoint, + auth_key: json.keys.auth, + p256dh_key: json.keys.p256dh, + }); + + setSubscribed(true); + } catch (error) { + console.error("Subscription failed:", error); + throw error; + } finally { + setLoading(false); + } + }; + + const unsubscribe = async (): Promise => { + try { + setLoading(true); + const registration = await navigator.serviceWorker.ready; + const subscription = await registration.pushManager.getSubscription(); + + if (subscription) { + await subscription.unsubscribe(); + setSubscribed(false); + } + } catch (error) { + console.error("Unsubscription failed:", error); + throw error; + } finally { + setLoading(false); + } + }; + + return { + subscribed, + enabled, + loading: loading || buildInfoQuery.isLoading, + subscribe, + unsubscribe, + }; +}; diff --git a/site/src/serviceWorker.ts b/site/src/serviceWorker.ts new file mode 100644 index 0000000000000..cdaa3dc0ac2e4 --- /dev/null +++ b/site/src/serviceWorker.ts @@ -0,0 +1,36 @@ +/// + +import type { WebpushMessage } from "api/typesGenerated"; + +// @ts-ignore +declare const self: ServiceWorkerGlobalScope; + +self.addEventListener("install", (event) => { + self.skipWaiting(); +}); + +self.addEventListener("activate", (event) => { + event.waitUntil(self.clients.claim()); +}); + +self.addEventListener("push", (event) => { + let payload: WebpushMessage; + try { + payload = event.data?.json(); + } catch (e) { + console.error("Error parsing push payload:", e); + return; + } + + event.waitUntil( + self.registration.showNotification(payload.title, { + body: payload.body || "", + icon: payload.icon || "/favicon.ico", + }), + ); +}); + +// Handle notification click +self.addEventListener("notificationclick", (event) => { + event.notification.close(); +}); From 403c942b697eaeabfa1a6b1f99382150e67f8fa5 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 27 Mar 2025 12:06:11 +0000 Subject: [PATCH 4/8] ignore empty events --- site/src/serviceWorker.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/src/serviceWorker.ts b/site/src/serviceWorker.ts index cdaa3dc0ac2e4..bc99983e02a6c 100644 --- a/site/src/serviceWorker.ts +++ b/site/src/serviceWorker.ts @@ -14,6 +14,10 @@ self.addEventListener("activate", (event) => { }); self.addEventListener("push", (event) => { + if (!event.data) { + return; + } + let payload: WebpushMessage; try { payload = event.data?.json(); From 58430aeb4feeaaf9021e2001fdc452b25c58f6e8 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 27 Mar 2025 12:11:33 +0000 Subject: [PATCH 5/8] rename --- site/src/api/api.ts | 4 ++-- site/src/contexts/useWebpushNotifications.ts | 2 +- site/src/modules/dashboard/Navbar/NavbarView.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/src/api/api.ts b/site/src/api/api.ts index 734be6607c3bf..85953bbce736f 100644 --- a/site/src/api/api.ts +++ b/site/src/api/api.ts @@ -2371,7 +2371,7 @@ class ApiMethods { await this.axios.post("/api/v2/notifications/test"); }; - createNotificationPushSubscription = async ( + createWebPushSubscription = async ( userId: string, req: TypesGen.WebpushSubscription, ) => { @@ -2381,7 +2381,7 @@ class ApiMethods { ); }; - deleteNotificationPushSubscription = async ( + deleteWebPushSubscription = async ( userId: string, req: TypesGen.DeleteWebpushSubscription, ) => { diff --git a/site/src/contexts/useWebpushNotifications.ts b/site/src/contexts/useWebpushNotifications.ts index 21c033d975255..0f3949135c287 100644 --- a/site/src/contexts/useWebpushNotifications.ts +++ b/site/src/contexts/useWebpushNotifications.ts @@ -67,7 +67,7 @@ export const useWebpushNotifications = (): WebpushNotifications => { throw new Error("No keys or endpoint found"); } - await API.createNotificationPushSubscription("me", { + await API.createWebPushSubscription("me", { endpoint: json.endpoint, auth_key: json.keys.auth, p256dh_key: json.keys.p256dh, diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx index 470470b571cb1..a581e2b2434f7 100644 --- a/site/src/modules/dashboard/Navbar/NavbarView.tsx +++ b/site/src/modules/dashboard/Navbar/NavbarView.tsx @@ -63,7 +63,7 @@ export const NavbarView: FC = ({ -

{proxyContextValue && (

From 0c4e54bc9c88888ebdb505fe36bcc8e981fb41b7 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 27 Mar 2025 15:14:10 +0000 Subject: [PATCH 6/8] fix(webpush): set vapid sub in webpush payload --- cli/server.go | 5 ++++- coderd/coderdtest/coderdtest.go | 2 +- coderd/webpush/webpush.go | 17 ++++++++++++++--- coderd/webpush/webpush_test.go | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/cli/server.go b/cli/server.go index a2574593b18b6..d9dfd497ac16d 100644 --- a/cli/server.go +++ b/cli/server.go @@ -779,7 +779,10 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd. // Manage push notifications. experiments := coderd.ReadExperiments(options.Logger, options.DeploymentValues.Experiments.Value()) if experiments.Enabled(codersdk.ExperimentWebPush) { - webpusher, err := webpush.New(ctx, &options.Logger, options.Database) + if !strings.HasPrefix(options.AccessURL.String(), "https://") { + options.Logger.Warn(ctx, "access URL is not HTTPS, so web push notifications may not work on some browsers", slog.F("access_url", options.AccessURL.String())) + } + webpusher, err := webpush.New(ctx, options.Logger.Named("webpush"), options.Database, options.AccessURL.String()) if err != nil { options.Logger.Error(ctx, "failed to create web push dispatcher", slog.Error(err)) options.Logger.Warn(ctx, "web push notifications will not work until the VAPID keys are regenerated") diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index ca0bc25e29647..bd162299365a0 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -284,7 +284,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can if options.WebpushDispatcher == nil { // nolint:gocritic // Gets/sets VAPID keys. - pushNotifier, err := webpush.New(dbauthz.AsNotifier(context.Background()), options.Logger, options.Database) + pushNotifier, err := webpush.New(dbauthz.AsNotifier(context.Background()), *options.Logger, options.Database, options.AccessURL.String()) if err != nil { panic(xerrors.Errorf("failed to create web push notifier: %w", err)) } diff --git a/coderd/webpush/webpush.go b/coderd/webpush/webpush.go index a6c0790d2dce1..af64b242e5b98 100644 --- a/coderd/webpush/webpush.go +++ b/coderd/webpush/webpush.go @@ -41,13 +41,14 @@ type Dispatcher interface { // for updates inside of a workspace, which we want to be immediate. // // See: https://github.com/coder/internal/issues/528 -func New(ctx context.Context, log *slog.Logger, db database.Store) (Dispatcher, error) { +func New(ctx context.Context, log slog.Logger, db database.Store, vapidSub string) (Dispatcher, error) { keys, err := db.GetWebpushVAPIDKeys(ctx) if err != nil { if !errors.Is(err, sql.ErrNoRows) { return nil, xerrors.Errorf("get notification vapid keys: %w", err) } } + if keys.VapidPublicKey == "" || keys.VapidPrivateKey == "" { // Generate new VAPID keys. This also deletes all existing push // subscriptions as part of the transaction, as they are no longer @@ -62,6 +63,7 @@ func New(ctx context.Context, log *slog.Logger, db database.Store) (Dispatcher, } return &Webpusher{ + vapidSub: vapidSub, store: db, log: log, VAPIDPublicKey: keys.VapidPublicKey, @@ -71,8 +73,14 @@ func New(ctx context.Context, log *slog.Logger, db database.Store) (Dispatcher, type Webpusher struct { store database.Store - log *slog.Logger - + log slog.Logger + // VAPID allows us to identify the sender of the message. + // This must be a https:// URL or an email address. + // Some push services (such as Apple's) require this to be set. + vapidSub string + + // public and private keys for VAPID. These are used to sign and encrypt + // the message payload. VAPIDPublicKey string VAPIDPrivateKey string } @@ -148,10 +156,13 @@ func (n *Webpusher) webpushSend(ctx context.Context, msg []byte, endpoint string Endpoint: endpoint, Keys: keys, }, &webpush.Options{ + Subscriber: n.vapidSub, VAPIDPublicKey: n.VAPIDPublicKey, VAPIDPrivateKey: n.VAPIDPrivateKey, }) if err != nil { + n.log.Error(ctx, "failed to send webpush notification", slog.Error(err), slog.F("endpoint", endpoint)) + n.log.Debug(ctx, "webpush notification payload", slog.F("payload", string(cpy))) return -1, nil, xerrors.Errorf("send webpush notification: %w", err) } defer resp.Body.Close() diff --git a/coderd/webpush/webpush_test.go b/coderd/webpush/webpush_test.go index 7e584dedf4633..1e4cae913baa9 100644 --- a/coderd/webpush/webpush_test.go +++ b/coderd/webpush/webpush_test.go @@ -253,7 +253,7 @@ func setupPushTest(ctx context.Context, t *testing.T, handlerFunc func(w http.Re server := httptest.NewServer(http.HandlerFunc(handlerFunc)) t.Cleanup(server.Close) - manager, err := webpush.New(ctx, &logger, db) + manager, err := webpush.New(ctx, logger, db, "http://example.com") require.NoError(t, err, "Failed to create webpush manager") return manager, db, server.URL From 17b3f1c8c40321366ec36960d2f7b8229446b77e Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 27 Mar 2025 15:40:38 +0000 Subject: [PATCH 7/8] whoops --- cli/server.go | 3 ++- coderd/coderdtest/coderdtest.go | 2 +- coderd/webpush/webpush.go | 4 ++-- coderd/webpush/webpush_test.go | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cli/server.go b/cli/server.go index d9dfd497ac16d..c0d7d6fcee13e 100644 --- a/cli/server.go +++ b/cli/server.go @@ -95,6 +95,7 @@ import ( "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/coderd/unhanger" "github.com/coder/coder/v2/coderd/updatecheck" + "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/coderd/util/slice" stringutil "github.com/coder/coder/v2/coderd/util/strings" "github.com/coder/coder/v2/coderd/workspaceapps/appurl" @@ -782,7 +783,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd. if !strings.HasPrefix(options.AccessURL.String(), "https://") { options.Logger.Warn(ctx, "access URL is not HTTPS, so web push notifications may not work on some browsers", slog.F("access_url", options.AccessURL.String())) } - webpusher, err := webpush.New(ctx, options.Logger.Named("webpush"), options.Database, options.AccessURL.String()) + webpusher, err := webpush.New(ctx, ptr.Ref(options.Logger.Named("webpush")), options.Database, options.AccessURL.String()) if err != nil { options.Logger.Error(ctx, "failed to create web push dispatcher", slog.Error(err)) options.Logger.Warn(ctx, "web push notifications will not work until the VAPID keys are regenerated") diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index bd162299365a0..b9097863a5f67 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -284,7 +284,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can if options.WebpushDispatcher == nil { // nolint:gocritic // Gets/sets VAPID keys. - pushNotifier, err := webpush.New(dbauthz.AsNotifier(context.Background()), *options.Logger, options.Database, options.AccessURL.String()) + pushNotifier, err := webpush.New(dbauthz.AsNotifier(context.Background()), options.Logger, options.Database, "http://example.com") if err != nil { panic(xerrors.Errorf("failed to create web push notifier: %w", err)) } diff --git a/coderd/webpush/webpush.go b/coderd/webpush/webpush.go index af64b242e5b98..0caace54a373d 100644 --- a/coderd/webpush/webpush.go +++ b/coderd/webpush/webpush.go @@ -41,7 +41,7 @@ type Dispatcher interface { // for updates inside of a workspace, which we want to be immediate. // // See: https://github.com/coder/internal/issues/528 -func New(ctx context.Context, log slog.Logger, db database.Store, vapidSub string) (Dispatcher, error) { +func New(ctx context.Context, log *slog.Logger, db database.Store, vapidSub string) (Dispatcher, error) { keys, err := db.GetWebpushVAPIDKeys(ctx) if err != nil { if !errors.Is(err, sql.ErrNoRows) { @@ -73,7 +73,7 @@ func New(ctx context.Context, log slog.Logger, db database.Store, vapidSub strin type Webpusher struct { store database.Store - log slog.Logger + log *slog.Logger // VAPID allows us to identify the sender of the message. // This must be a https:// URL or an email address. // Some push services (such as Apple's) require this to be set. diff --git a/coderd/webpush/webpush_test.go b/coderd/webpush/webpush_test.go index 1e4cae913baa9..0c01c55fca86b 100644 --- a/coderd/webpush/webpush_test.go +++ b/coderd/webpush/webpush_test.go @@ -253,7 +253,7 @@ func setupPushTest(ctx context.Context, t *testing.T, handlerFunc func(w http.Re server := httptest.NewServer(http.HandlerFunc(handlerFunc)) t.Cleanup(server.Close) - manager, err := webpush.New(ctx, logger, db, "http://example.com") + manager, err := webpush.New(ctx, &logger, db, "http://example.com") require.NoError(t, err, "Failed to create webpush manager") return manager, db, server.URL From 56721885879826c2961127877eb2b31048d2150c Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 27 Mar 2025 15:45:37 +0000 Subject: [PATCH 8/8] remove debug msg --- coderd/webpush/webpush.go | 1 - 1 file changed, 1 deletion(-) diff --git a/coderd/webpush/webpush.go b/coderd/webpush/webpush.go index 0caace54a373d..eb35685402c21 100644 --- a/coderd/webpush/webpush.go +++ b/coderd/webpush/webpush.go @@ -162,7 +162,6 @@ func (n *Webpusher) webpushSend(ctx context.Context, msg []byte, endpoint string }) if err != nil { n.log.Error(ctx, "failed to send webpush notification", slog.Error(err), slog.F("endpoint", endpoint)) - n.log.Debug(ctx, "webpush notification payload", slog.F("payload", string(cpy))) return -1, nil, xerrors.Errorf("send webpush notification: %w", err) } defer resp.Body.Close() pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies: