From 464b20f0d42af473d2b8d7aa6c0d7867a7042ad2 Mon Sep 17 00:00:00 2001 From: Romain de Laage Date: Mon, 22 Mar 2021 09:09:21 +0100 Subject: [PATCH] For parameter is now in request header with env var config --- assos.go | 12 ++++++++++-- main.go | 3 ++- util.go | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/assos.go b/assos.go index 25be26f..941ed80 100644 --- a/assos.go +++ b/assos.go @@ -25,8 +25,16 @@ import ( "encoding/json" ) -func getArticles(endpoint string) []Article { - resp, err := http.Get(endpoint) +func getArticles(endpoint, forB64 string) []Article { + req, err := http.NewRequest("GET", endpoint, nil) + if err != nil { + log.Fatalln(err) + } + + req.Header.Set("For", forB64) + + client := &http.Client{} + resp, err := client.Do(req) if err != nil { log.Fatalln(err) } diff --git a/main.go b/main.go index 6b4e921..3142deb 100644 --- a/main.go +++ b/main.go @@ -57,11 +57,12 @@ type Config struct { ApiEndpointMM string ApiEndpointAssos string DbPath string + ForB64 string } func main() { config := getConfig() - articles := getArticles(config.ApiEndpointAssos) + articles := getArticles(config.ApiEndpointAssos, config.ForB64) entries := openDb(config.DbPath) for _, article := range articles { diff --git a/util.go b/util.go index 6137911..4d80af7 100644 --- a/util.go +++ b/util.go @@ -31,9 +31,10 @@ func getConfig() Config { config.ApiEndpointMM = os.Getenv("MM_ASSOS_ENDPOINTMM") config.ApiEndpointAssos = os.Getenv("MM_ASSOS_ENDPOINTASSOS") config.DbPath = os.Getenv("MM_ASSOS_DBPATH") + config.ForB64 = os.Getenv("MM_ASSOS_FORB64") - if config.ChannelId == "" || config.ApiToken == "" || config.ApiEndpointMM == "" || config.ApiEndpointAssos == "" || config.DbPath == "" { - log.Fatalln("MM_ASSOS_CHANNEL, MM_ASSOS_ENDPOINTMM, MM_ASSOS_ENDPOINTASSOS, MM_ASSOS_DBPATH or MM_ASSOS_TOKEN not defined") + if config.ChannelId == "" || config.ApiToken == "" || config.ApiEndpointMM == "" || config.ApiEndpointAssos == "" || config.DbPath == "" || config.ForB64 == "" { + log.Fatalln("MM_ASSOS_CHANNEL, MM_ASSOS_ENDPOINTMM, MM_ASSOS_ENDPOINTASSOS, MM_ASSOS_DBPATH, MM_ASSOS_TOKEN or MM_ASSOS_FORB64 not defined or empty string") } return config