Skip to content

Commit

Permalink
Merge pull request #124 from Neur0toxine/allow-trailing-slash-url
Browse files Browse the repository at this point in the history
allow trailing slash in MG URL
  • Loading branch information
Neur0toxine authored Nov 29, 2024
2 parents 919fa8b + 83fa996 commit 0312ddc
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
3 changes: 2 additions & 1 deletion v1/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"net/http"
"net/url"
"strconv"
"strings"
"time"

"github.com/google/go-querystring/query"
Expand All @@ -23,7 +24,7 @@ func New(url string, token string) *MgClient {
// NewWithClient initializes the MgClient with specified *http.Client.
func NewWithClient(url string, token string, client *http.Client) *MgClient {
return &MgClient{
URL: url,
URL: strings.TrimRight(url, "/"),
Token: token,
httpClient: client,
}
Expand Down
17 changes: 17 additions & 0 deletions v1/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,23 @@ func (t *MGClientTest) transportURL(path string) string {
return "/api/transport/v1/" + strings.TrimLeft(path, "/")
}

func (t *MGClientTest) Test_URLWithTrailingSlash() {
c := New("https://mg-test.retailcrm.pro/", "mg_token")
c.Debug = true

defer gock.Off()
t.gock().
Get(t.transportURL("channels")).
Reply(http.StatusOK).
JSON([]ChannelListItem{{ID: 1}})

data, status, err := c.TransportChannels(Channels{Active: true})
t.Require().NoError(err)
t.Assert().Equal(http.StatusOK, status)

t.Assert().Len(data, 1)
}

func (t *MGClientTest) Test_TransportChannels() {
c := t.client()
chName := "WhatsApp Channel"
Expand Down

0 comments on commit 0312ddc

Please sign in to comment.