From cf421e414cbe215279ce68b8a7cd44207039d5a7 Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Fri, 14 Jan 2022 08:43:41 -0500 Subject: [PATCH] remove config ntg token from code --- broker/ntgvision.go | 14 ++++++++++---- config.json | 3 +-- config/config.go | 1 - 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/broker/ntgvision.go b/broker/ntgvision.go index 6f98658..3e4b8b1 100644 --- a/broker/ntgvision.go +++ b/broker/ntgvision.go @@ -188,14 +188,19 @@ func (ntg NTGVision) Search(states []config.State) ([]Job, error) { return jobs, err } +func getNTGTokenKey() string { + return "brokers_ntg_token" +} + func getNTGToken() string { - return config.Get().Brokers.NTG.Token + db := config.Get().DB() + b, _ := db.Get(getNTGTokenKey()) + return string(b) } func setNTGToken(token string) { - conf := config.Get() - conf.Brokers.NTG.Token = token - config.Set(*conf) + db := config.Get().DB() + db.Set(getNTGTokenKey(), []byte(token)) } func (ntg NTGVision) search(states []config.State) (io.ReadCloser, error) { @@ -215,6 +220,7 @@ func (ntg NTGVision) search(states []config.State) (io.ReadCloser, error) { } func (ntg NTGVision) refreshAuth() error { + log.Printf("refreshing ntg auth...") b, _ := json.Marshal(map[string]string{ "username": config.Get().Brokers.NTG.Username, "password": config.Get().Brokers.NTG.Password, diff --git a/config.json b/config.json index 67ead14..29afc8f 100644 --- a/config.json +++ b/config.json @@ -62,7 +62,7 @@ "Matrix": { "ReceiveEnabled": true, "Mock": false, - "Continuation": "1386", + "Continuation": "1420", "Homeserver": "https://m.bltrucks.top", "Username": "@bot.m.bltrucks.top", "Token": "mvDWB96KXMF8XhOam8EC5XVdQvSEw0CDeClcSWocBcYkwZX3FPNWZ5uOnQk2EmT1cjpzfeuD7gDYPPjOuyZlI3bE9TE35UjNOlZgi0Tugm25s91iVsbIF6kMZsCIhVMSmEf6w3jxX6wQYOWvmDZ4mu6f5c8wr221EMDcOpEzQV09d1zuBSWgKLBgjqAkYHJZ5dTRIWpEDpPgujhOFZa2ld1HiAOxrJKlIrlfDBN0CUsTlGOGplujDAr4VtpFzNRS", @@ -76,7 +76,6 @@ "JobInfo": true, "Mock": false, "LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d", - "Token": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIzMTAyOSIsInVuaXF1ZV9uYW1lIjoibm9lYXN5cnVuc3RydWNraW5nQGdtYWlsLmNvbSIsImp0aSI6IjM4M2NiOWMzLTY4ZTMtNGNkZC04NWM4LTYwOGI2YmY3YTdiNiIsImlhdCI6IjEvMTQvMjAyMiAxOjMzOjMzIFBNIiwibnRndlJvbGUiOiJDYXJyaWVyQXBwcm92ZWQiLCJ1c2VyQ2FycmllcnMiOiIxNTM0MjMiLCJvdHJVc2VyIjoiRmFsc2UiLCJuYmYiOjE2NDIxNjcyMTMsImV4cCI6MTY0MjI1MDAxMywiaXNzIjoiTlRHIFNlY3VyaXR5IFRva2VuIFNlcnZpY2UiLCJhdWQiOiJOVEcifQ.XkTAeJCEgh0vL5C3n7djv_bMZ9boXTQGaYIosm_eehTbCobxPpma1eTYTh3A9NNJlwrrAGX3UsjfcuhicjC4uFXHzt0Da1oJBHMXEU6hDbsXN7KKWzLJG3OXQIoDLyCM1TsoUia2YAqDYrDjgoJpc7750WB4AFi2e39cBcQqGE4mm3PwstVbIq-Br5ec06nlODAb36FJ0ai_l1K7SlBbmcq_-v71v4VU8Cy64JpZFNPJgSrCA3Ixo6BmqsssAu7PVSFmIKrfYtHw0JjazDqBME2pvvX58qnSsZnLRxw456V-iEDlMK-Xr4899MHVfhEazS7zTycg0-tTNCd3ffjq9Q", "Username": "noeasyrunstrucking@gmail.com", "Password": "thumper123" } diff --git a/config/config.go b/config/config.go index 3cddaf8..31c3019 100644 --- a/config/config.go +++ b/config/config.go @@ -55,7 +55,6 @@ type Config struct { JobInfo bool Mock bool LoadPageURIFormat string - Token string Username string Password string }