From 40a3b5839caba6aa29f251a56bd733347a1685ab Mon Sep 17 00:00:00 2001 From: fimtitzgerald Date: Mon, 23 Jul 2018 18:49:44 -0700 Subject: [PATCH] Made username a config parameter instead of ENV --- zendesk/client.go | 5 +++-- zendesk/tickets.go | 3 --- zendesk/widget.go | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/zendesk/client.go b/zendesk/client.go index 04a6ebda..e450fb7b 100644 --- a/zendesk/client.go +++ b/zendesk/client.go @@ -7,16 +7,16 @@ import ( "log" "net/http" "os" + + "github.com/senorprogrammer/wtf/wtf" ) type Resource struct { - //Headers http.Header Response interface{} Raw string } var a = os.Getenv("ZENDESK_API") -var username = os.Getenv("ZENDESK_USERNAME") var subdomain = os.Getenv("ZENDESK_SUBDOMAIN") var baseURL = fmt.Sprintf("https://%v.zendesk.com/api/v2", subdomain) @@ -48,6 +48,7 @@ func api(key string, meth string, path string, params string) (*Resource, error) req.Header.Add("Content-Type", "application/json") + username := wtf.Config.UString("wtf.mods.zendesk.username") apiUser := fmt.Sprintf("%v/token", username) req.SetBasicAuth(apiUser, key) diff --git a/zendesk/tickets.go b/zendesk/tickets.go index 26fff92d..e66de775 100644 --- a/zendesk/tickets.go +++ b/zendesk/tickets.go @@ -2,7 +2,6 @@ package zendesk import ( "encoding/json" - //"fmt" "log" ) @@ -50,8 +49,6 @@ type Ticket struct { Fields interface{} `json:"fields"` } -//var a = os.Getenv("ZENDESK_API") - func listTickets(pag ...string) (*TicketArray, error) { TicketStruct := &TicketArray{} diff --git a/zendesk/widget.go b/zendesk/widget.go index 64861928..eef67cc2 100644 --- a/zendesk/widget.go +++ b/zendesk/widget.go @@ -41,8 +41,6 @@ func (widget *Widget) textContent(items []Ticket) string { str := "" for _, data := range items { - //str = items[i] - //str = fmt.Sprintf(data.Id) str = str + widget.format(data) }