summaryrefslogtreecommitdiff
path: root/internal/server
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2024-06-17 11:01:20 +0300
committerPaul Buetow <paul@buetow.org>2024-06-17 11:01:20 +0300
commitfd005e1b770b071eaa137877d9fe7a5845670de9 (patch)
treeebd68d99e035504520e04cde83f313892f61df51 /internal/server
parent2f353f6d9aee9d9a989d11757289c11679752789 (diff)
add EDITOR client config, plus a bit refactor of the config env handling
Diffstat (limited to 'internal/server')
-rw-r--r--internal/server/handler/handler.go4
-rw-r--r--internal/server/server.go2
2 files changed, 3 insertions, 3 deletions
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