taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from fimtitzgerald/param_uname

Browse Source 
Made username a config parameter instead of ENV
This commit is contained in:
Tim Fitzgerald 2018-07-23 18:51:18 -07:00 committed by GitHub
commit fa4b6384a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zendesk/client.go
View File

@ -7,16 +7,16 @@ import (
"log" "log"
"net/http" "net/http"
"os" "os"
"github.com/senorprogrammer/wtf/wtf"
) )
type Resource struct { type Resource struct {
//Headers http.Header
Response interface{} Response interface{}
Raw string Raw string
} }
var a = os.Getenv("ZENDESK_API") var a = os.Getenv("ZENDESK_API")
var username = os.Getenv("ZENDESK_USERNAME")
var subdomain = os.Getenv("ZENDESK_SUBDOMAIN") var subdomain = os.Getenv("ZENDESK_SUBDOMAIN")
var baseURL = fmt.Sprintf("https://%v.zendesk.com/api/v2", 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") req.Header.Add("Content-Type", "application/json")
username := wtf.Config.UString("wtf.mods.zendesk.username")
apiUser := fmt.Sprintf("%v/token", username) apiUser := fmt.Sprintf("%v/token", username)
req.SetBasicAuth(apiUser, key) req.SetBasicAuth(apiUser, key)

3
zendesk/tickets.go
View File

@ -2,7 +2,6 @@ package zendesk
import ( import (
"encoding/json" "encoding/json"
//"fmt"
"log" "log"
) )
@ -50,8 +49,6 @@ type Ticket struct {
Fields interface{} `json:"fields"` Fields interface{} `json:"fields"`
} }
//var a = os.Getenv("ZENDESK_API")
func listTickets(pag ...string) (*TicketArray, error) { func listTickets(pag ...string) (*TicketArray, error) {
TicketStruct := &TicketArray{} TicketStruct := &TicketArray{}

2
zendesk/widget.go
View File

@ -41,8 +41,6 @@ func (widget *Widget) textContent(items []Ticket) string {
str := "" str := ""
for _, data := range items { for _, data := range items {
//str = items[i]
//str = fmt.Sprintf(data.Id)
str = str + widget.format(data) str = str + widget.format(data)
} }