mirror of
https://github.com/christianselig/apollo-backend
synced 2024-11-21 19:37:41 +00:00
use request context
This commit is contained in:
parent
b001a51a30
commit
10d2e77c4f
5 changed files with 22 additions and 24 deletions
|
@ -21,6 +21,8 @@ type accountNotificationsRequest struct {
|
|||
}
|
||||
|
||||
func (a *api) notificationsAccountHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
anr := &accountNotificationsRequest{}
|
||||
if err := json.NewDecoder(r.Body).Decode(anr); err != nil {
|
||||
a.errorResponse(w, r, 500, err.Error())
|
||||
|
@ -31,8 +33,6 @@ func (a *api) notificationsAccountHandler(w http.ResponseWriter, r *http.Request
|
|||
apns := vars["apns"]
|
||||
rid := vars["redditID"]
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
dev, err := a.deviceRepo.GetByAPNSToken(ctx, apns)
|
||||
if err != nil {
|
||||
a.errorResponse(w, r, 500, err.Error())
|
||||
|
@ -54,12 +54,12 @@ func (a *api) notificationsAccountHandler(w http.ResponseWriter, r *http.Request
|
|||
}
|
||||
|
||||
func (a *api) getNotificationsAccountHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
apns := vars["apns"]
|
||||
rid := vars["redditID"]
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
dev, err := a.deviceRepo.GetByAPNSToken(ctx, apns)
|
||||
if err != nil {
|
||||
a.errorResponse(w, r, 500, err.Error())
|
||||
|
@ -85,12 +85,12 @@ func (a *api) getNotificationsAccountHandler(w http.ResponseWriter, r *http.Requ
|
|||
}
|
||||
|
||||
func (a *api) disassociateAccountHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
apns := vars["apns"]
|
||||
rid := vars["redditID"]
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
dev, err := a.deviceRepo.GetByAPNSToken(ctx, apns)
|
||||
if err != nil {
|
||||
a.errorResponse(w, r, 500, err.Error())
|
||||
|
@ -112,11 +112,11 @@ func (a *api) disassociateAccountHandler(w http.ResponseWriter, r *http.Request)
|
|||
}
|
||||
|
||||
func (a *api) upsertAccountsHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
apns := vars["apns"]
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
dev, err := a.deviceRepo.GetByAPNSToken(ctx, apns)
|
||||
if err != nil {
|
||||
a.errorResponse(w, r, 422, err.Error())
|
||||
|
@ -206,9 +206,10 @@ func (a *api) upsertAccountsHandler(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
func (a *api) upsertAccountHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
|
||||
ctx := context.Background()
|
||||
var acct domain.Account
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&acct); err != nil {
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
@ -20,7 +19,7 @@ import (
|
|||
const notificationTitle = "📣 Hello, is this thing on?"
|
||||
|
||||
func (a *api) upsertDeviceHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := context.Background()
|
||||
ctx := r.Context()
|
||||
|
||||
d := &domain.Device{}
|
||||
if err := json.NewDecoder(r.Body).Decode(d); err != nil {
|
||||
|
@ -40,9 +39,9 @@ func (a *api) upsertDeviceHandler(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
func (a *api) testDeviceHandler(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
ctx := r.Context()
|
||||
|
||||
ctx := context.Background()
|
||||
vars := mux.Vars(r)
|
||||
tok := vars["apns"]
|
||||
|
||||
d, err := a.deviceRepo.GetByAPNSToken(ctx, tok)
|
||||
|
@ -92,8 +91,9 @@ func (a *api) testDeviceHandler(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
func (a *api) deleteDeviceHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
ctx := context.Background()
|
||||
|
||||
dev, err := a.deviceRepo.GetByAPNSToken(ctx, vars["apns"])
|
||||
if err != nil {
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
|
@ -25,9 +24,9 @@ type notificationGenerator func(*payload.Payload)
|
|||
|
||||
func generateNotificationTester(a *api, fun notificationGenerator) func(w http.ResponseWriter, r *http.Request) {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
ctx := r.Context()
|
||||
|
||||
ctx := context.Background()
|
||||
vars := mux.Vars(r)
|
||||
tok := vars["apns"]
|
||||
|
||||
d, err := a.deviceRepo.GetByAPNSToken(ctx, tok)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
|
@ -15,7 +14,7 @@ import (
|
|||
)
|
||||
|
||||
func (a *api) checkReceiptHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := context.Background()
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
apns := vars["apns"]
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
@ -44,7 +43,7 @@ type watcherCreatedResponse struct {
|
|||
}
|
||||
|
||||
func (a *api) createWatcherHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := context.Background()
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
apns := vars["apns"]
|
||||
|
@ -175,7 +174,7 @@ func (a *api) createWatcherHandler(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
func (a *api) editWatcherHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := context.Background()
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
id, err := strconv.ParseInt(vars["watcherID"], 10, 64)
|
||||
|
@ -216,7 +215,7 @@ func (a *api) editWatcherHandler(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
func (a *api) deleteWatcherHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := context.Background()
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
id, err := strconv.ParseInt(vars["watcherID"], 10, 64)
|
||||
|
@ -250,7 +249,7 @@ type watcherItem struct {
|
|||
}
|
||||
|
||||
func (a *api) listWatchersHandler(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := context.Background()
|
||||
ctx := r.Context()
|
||||
|
||||
vars := mux.Vars(r)
|
||||
apns := vars["apns"]
|
||||
|
|
Loading…
Reference in a new issue