From 5e561e30bd70251e2d13d0e6abb31d9942d92d36 Mon Sep 17 00:00:00 2001
From: AlteredCoder <64792091+AlteredCoder@users.noreply.github.com>
Date: Wed, 29 Jul 2020 15:15:33 +0200
Subject: [PATCH] fix cwapi bug with new sling usage (#157)

* fix sling usage

Co-authored-by: AlteredCoder <AlteredCoder>
---
 pkg/cwapi/auth.go   | 7 ++++---
 pkg/cwapi/enroll.go | 2 +-
 pkg/cwapi/pull.go   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/cwapi/auth.go b/pkg/cwapi/auth.go
index df450245a..5071b7ea8 100644
--- a/pkg/cwapi/auth.go
+++ b/pkg/cwapi/auth.go
@@ -142,7 +142,7 @@ func (ctx *ApiCtx) Signin() error {
 	}
 	jsonResp := &ApiResp{}
 
-	resp, err := ctx.Http.Post(ctx.SigninPath).BodyJSON(ctx.Creds).ReceiveSuccess(jsonResp)
+	resp, err := ctx.Http.New().Post(ctx.SigninPath).BodyJSON(ctx.Creds).ReceiveSuccess(jsonResp)
 	if err != nil {
 		return fmt.Errorf("api signin: HTTP request creation failed: %s", err)
 	}
@@ -155,6 +155,7 @@ func (ctx *ApiCtx) Signin() error {
 	}
 
 	ctx.Http = ctx.Http.Set("Authorization", jsonResp.Message)
+
 	log.Printf("api signin: signed in successfuly")
 	return nil
 }
@@ -164,7 +165,7 @@ func (ctx *ApiCtx) RegisterMachine(machineID string, password string) error {
 	ctx.Creds.Password = password
 	jsonResp := &ApiResp{}
 
-	resp, err := ctx.Http.Post(ctx.RegisterPath).BodyJSON(ctx.Creds).ReceiveSuccess(jsonResp)
+	resp, err := ctx.Http.New().Post(ctx.RegisterPath).BodyJSON(ctx.Creds).ReceiveSuccess(jsonResp)
 	if err != nil {
 		return fmt.Errorf("api register machine: HTTP request creation failed: %s", err)
 	}
@@ -185,7 +186,7 @@ func (ctx *ApiCtx) ResetPassword(machineID string, password string) error {
 	jsonResp := &ApiResp{}
 
 	data := map[string]string{"machine_id": ctx.Creds.User, "password": ctx.Creds.Password}
-	resp, err := ctx.Http.Post(ctx.ResetPwdPath).BodyJSON(data).ReceiveSuccess(jsonResp)
+	resp, err := ctx.Http.New().Post(ctx.ResetPwdPath).BodyJSON(data).ReceiveSuccess(jsonResp)
 	if err != nil {
 		return fmt.Errorf("api reset password: HTTP request creation failed: %s", err)
 	}
diff --git a/pkg/cwapi/enroll.go b/pkg/cwapi/enroll.go
index a59d58dc3..a541e46c5 100644
--- a/pkg/cwapi/enroll.go
+++ b/pkg/cwapi/enroll.go
@@ -10,7 +10,7 @@ func (ctx *ApiCtx) Enroll(userID string) error {
 	toPush := map[string]string{"user_id": userID}
 	jsonResp := &ApiResp{}
 
-	resp, err := ctx.Http.Post(ctx.EnrollPath).BodyJSON(&toPush).ReceiveSuccess(jsonResp)
+	resp, err := ctx.Http.New().Post(ctx.EnrollPath).BodyJSON(&toPush).ReceiveSuccess(jsonResp)
 	if err != nil {
 		return fmt.Errorf("api enroll: HTTP request creation failed: %s", err)
 	}
diff --git a/pkg/cwapi/pull.go b/pkg/cwapi/pull.go
index df91c15bd..ace1f68d4 100644
--- a/pkg/cwapi/pull.go
+++ b/pkg/cwapi/pull.go
@@ -8,7 +8,7 @@ import (
 
 func (ctx *ApiCtx) PullTop() ([]map[string]string, error) {
 	top := &PullResp{}
-	resp, err := ctx.Http.Get(ctx.PullPath).ReceiveSuccess(top)
+	resp, err := ctx.Http.New().Get(ctx.PullPath).ReceiveSuccess(top)
 	if err != nil {
 		return nil, fmt.Errorf("api pull: HTTP request creation failed: %s", err)
 	}