aboutsummaryrefslogtreecommitdiff
path: root/keyserver/inthttp
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-06-15 14:27:07 +0100
committerGitHub <noreply@github.com>2022-06-15 14:27:07 +0100
commit7120eb6bc943af6f725b0c61cfd110330f04064a (patch)
treea7e278689e44b36eeefe01cd7b8ecb247119c940 /keyserver/inthttp
parent1b90cc95367947fa00616b4426d0c894b33c9862 (diff)
Add `InputDeviceListUpdate` to the keyserver, remove old input API (#2536)
* Add `InputDeviceListUpdate` to the keyserver, remove old input API * Fix copyright * Log more information when a device list update fails
Diffstat (limited to 'keyserver/inthttp')
-rw-r--r--keyserver/inthttp/client.go14
-rw-r--r--keyserver/inthttp/server.go11
2 files changed, 0 insertions, 25 deletions
diff --git a/keyserver/inthttp/client.go b/keyserver/inthttp/client.go
index abce8158..dac61d1e 100644
--- a/keyserver/inthttp/client.go
+++ b/keyserver/inthttp/client.go
@@ -63,20 +63,6 @@ type httpKeyInternalAPI struct {
func (h *httpKeyInternalAPI) SetUserAPI(i userapi.KeyserverUserAPI) {
// no-op: doesn't need it
}
-func (h *httpKeyInternalAPI) InputDeviceListUpdate(
- ctx context.Context, req *api.InputDeviceListUpdateRequest, res *api.InputDeviceListUpdateResponse,
-) {
- span, ctx := opentracing.StartSpanFromContext(ctx, "InputDeviceListUpdate")
- defer span.Finish()
-
- apiURL := h.apiURL + InputDeviceListUpdatePath
- err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, req, res)
- if err != nil {
- res.Error = &api.KeyError{
- Err: err.Error(),
- }
- }
-}
func (h *httpKeyInternalAPI) PerformClaimKeys(
ctx context.Context,
diff --git a/keyserver/inthttp/server.go b/keyserver/inthttp/server.go
index 8d557a76..5bf5976a 100644
--- a/keyserver/inthttp/server.go
+++ b/keyserver/inthttp/server.go
@@ -25,17 +25,6 @@ import (
)
func AddRoutes(internalAPIMux *mux.Router, s api.KeyInternalAPI) {
- internalAPIMux.Handle(InputDeviceListUpdatePath,
- httputil.MakeInternalAPI("inputDeviceListUpdate", func(req *http.Request) util.JSONResponse {
- request := api.InputDeviceListUpdateRequest{}
- response := api.InputDeviceListUpdateResponse{}
- if err := json.NewDecoder(req.Body).Decode(&request); err != nil {
- return util.MessageResponse(http.StatusBadRequest, err.Error())
- }
- s.InputDeviceListUpdate(req.Context(), &request, &response)
- return util.JSONResponse{Code: http.StatusOK, JSON: &response}
- }),
- )
internalAPIMux.Handle(PerformClaimKeysPath,
httputil.MakeInternalAPI("performClaimKeys", func(req *http.Request) util.JSONResponse {
request := api.PerformClaimKeysRequest{}