Commitef4f795

committed

make webpush endpoints 404 if experiment not enabled

1 parent26a075b commitef4f795Copy full SHA for ef4f795

File tree

+21

-1

lines changed

+21

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -790,6 +790,8 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`790`	`790`	`options.WebpushDispatcher=webpusher`
`791`	`791`	`}else {`
`792`	`792`	`options.WebpushDispatcher=&webpush.NoopWebpusher{`
	`793`	`+// Users will likely not see this message as the endpoints return 404`
	`794`	`+// if not enabled. Just in case...`
`793`	`795`	`Msg:"Web Push notifications are an experimental feature and are disabled by default. Enable the 'web-push' experiment to use this feature.",`
`794`	`796`	`}`
`795`	`797`	`}`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,10 @@ func (api API) putUserNotificationPreferences(rw http.ResponseWriter, r http.R`
`337`	`337`	`func (apiAPI)postUserWebpushSubscription(rw http.ResponseWriter,rhttp.Request) {`
`338`	`338`	`ctx:=r.Context()`
`339`	`339`	`user:=httpmw.UserParam(r)`
	`340`	`+if!api.Experiments.Enabled(codersdk.ExperimentWebPush) {`
	`341`	`+httpapi.ResourceNotFound(rw)`
	`342`	`+return`
	`343`	`+}`
`340`	`344`
`341`	`345`	`varreq codersdk.WebpushSubscription`
`342`	`346`	`if!httpapi.Read(ctx,rw,r,&req) {`
`@@ -382,6 +386,11 @@ func (api API) deleteUserWebpushSubscription(rw http.ResponseWriter, r http.Re`
`382`	`386`	`ctx:=r.Context()`
`383`	`387`	`user:=httpmw.UserParam(r)`
`384`	`388`
	`389`	`+if!api.Experiments.Enabled(codersdk.ExperimentWebPush) {`
	`390`	`+httpapi.ResourceNotFound(rw)`
	`391`	`+return`
	`392`	`+}`
	`393`	`+`
`385`	`394`	`varreq codersdk.DeleteWebpushSubscription`
`386`	`395`	`if!httpapi.Read(ctx,rw,r,&req) {`
`387`	`396`	`return`
`@@ -414,6 +423,11 @@ func (api API) postUserPushNotificationTest(rw http.ResponseWriter, r http.Req`
`414`	`423`	`ctx:=r.Context()`
`415`	`424`	`user:=httpmw.UserParam(r)`
`416`	`425`
	`426`	`+if!api.Experiments.Enabled(codersdk.ExperimentWebPush) {`
	`427`	`+httpapi.ResourceNotFound(rw)`
	`428`	`+return`
	`429`	`+}`
	`430`	`+`
`417`	`431`	`iferr:=api.WebpushDispatcher.Dispatch(ctx,user.ID, codersdk.WebpushMessage{`
`418`	`432`	`Title:"It's working!",`
`419`	`433`	`Body:"You've subscribed to push notifications.",`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,11 @@ func TestWebpushSubscribeUnsubscribe(t *testing.T) {`
`390`	`390`
`391`	`391`	`ctx:=testutil.Context(t,testutil.WaitShort)`
`392`	`392`
`393`		`-client:=coderdtest.New(t,nil)`
	`393`	`+dv:=coderdtest.DeploymentValues(t)`
	`394`	`+dv.Experiments= []string{string(codersdk.ExperimentWebPush)}`
	`395`	`+client:=coderdtest.New(t,&coderdtest.Options{`
	`396`	`+DeploymentValues:dv,`
	`397`	`+})`
`394`	`398`	`owner:=coderdtest.CreateFirstUser(t,client)`
`395`	`399`	`memberClient,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)`
`396`	`400`

Comments

(0)