From fd005e1b770b071eaa137877d9fe7a5845670de9 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 17 Jun 2024 11:01:20 +0300 Subject: add EDITOR client config, plus a bit refactor of the config env handling --- internal/server/handler/handler.go | 4 ++-- internal/server/server.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/server') diff --git a/internal/server/handler/handler.go b/internal/server/handler/handler.go index 0a9e34f..80494dd 100644 --- a/internal/server/handler/handler.go +++ b/internal/server/handler/handler.go @@ -96,7 +96,7 @@ func (h Handler) mergeFromPartner(partner string) error { pairs []repository.EntryPair ) - if err := easyhttp.GetData(uri, h.conf.ApiKey, &pairs); err != nil { + if err := easyhttp.GetData(uri, h.conf.APIKey, &pairs); err != nil { return err } @@ -110,7 +110,7 @@ func (h Handler) mergeFromPartner(partner string) error { uri = fmt.Sprintf("%s/get?id=%s", partner, pair.ID) ) - if err := easyhttp.GetData(uri, h.conf.ApiKey, &entry); err != nil { + if err := easyhttp.GetData(uri, h.conf.APIKey, &entry); err != nil { errs = append(errs, err) continue } diff --git a/internal/server/server.go b/internal/server/server.go index 010b5b7..3c5cd27 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -35,7 +35,7 @@ func (serv Server) Handle(name string, handler HandlerFuncWithError) { log.Println("Someone requested", handlerName) // The health endpoint doesn't require an API key - if handlerName != HealthHandlerName && r.Header.Get("X-API-KEY") != serv.Conf.ApiKey { + if handlerName != HealthHandlerName && r.Header.Get("X-API-KEY") != serv.Conf.APIKey { http.Error(w, "Invalid API key", http.StatusUnauthorized) log.Println("Unauthorized access attempt to", handlerName) return -- cgit v1.2.3