From bd0615b7bc47ba88291d53a73c2153e4c2c17548 Mon Sep 17 00:00:00 2001 From: Martyn Ranyard Date: Tue, 30 Jun 2020 20:44:05 +0200 Subject: [PATCH] more oath Signed-off-by: Martyn Ranyard --- internal/webserver/webserver.go | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/internal/webserver/webserver.go b/internal/webserver/webserver.go index b3af57e..2720137 100755 --- a/internal/webserver/webserver.go +++ b/internal/webserver/webserver.go @@ -208,23 +208,14 @@ func TwitchAdminHandler(response http.ResponseWriter, request *http.Request) { vars := mux.Vars(request) if vars["code"] != "" { response.Header().Add("Content-type", "text/plain") - form := url.Values{ - "client_id": {ircBot.AppCredentials.ClientID}, - "client_secret": {ircBot.AppCredentials.Password}, - "code": {vars["code"]}, - "grant_type": {"authorization_code"}, - "redirect_uri": {"https://" + ircBot.Config.ExternalUrl + "/twitchadmin"}} - req, err := http.NewRequest("POST", "https://id.twitch.tv/oauth2/token", strings.NewReader(form.Encode())) - if err != nil { - response.WriteHeader(500) - response.Header().Add("Content-type", "text/plain") - fmt.Fprint(response, "ERROR: "+err.Error()) - return - } - req.Header.Add("Client-ID", ircBot.AppCredentials.ClientID) - req.Header.Add("Authorization", "Bearer "+ircBot.AppCredentials.Password) - req.Header.Set("Content-Type", "application/json") - resp, err := http.DefaultClient.Do(req) + resp, err := http.PostForm( + "https://id.twitch.tv/oauth2/token", + url.Values{ + "client_id": {ircBot.AppCredentials.ClientID}, + "client_secret": {ircBot.AppCredentials.Password}, + "code": {vars["code"]}, + "grant_type": {"authorization_code"}, + "redirect_uri": {"https://" + ircBot.Config.ExternalUrl + "/twitchadmin"}}) if err != nil { response.WriteHeader(500) response.Header().Add("Content-type", "text/plain")