Merge pull request #189 from VictorAvelar/bug/test-mode-on-api-tokens

fix issue with testmode query parameter
VictorAvelar · Jun 5, 2022 · dc34c55 · dc34c55
2 parents 24340b2 + e295788
commit dc34c55
Show file tree

Hide file tree

Showing 16 changed files with 94 additions and 118 deletions.
diff --git a/mollie/miscellaneous_test.go b/mollie/miscellaneous_test.go
@@ -44,7 +44,6 @@ func (ms *miscellaneousServiceSuite) TestMiscellaneousService_ApplePaymentSessio
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ms.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ms.T(), r, "POST")
-				testQuery(ms.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)

diff --git a/mollie/mollie.go b/mollie/mollie.go
@@ -161,7 +161,7 @@ func (c *Client) NewAPIRequest(ctx context.Context, method string, uri string, b
 		return nil, fmt.Errorf("url_parsing_error: %w", err)
 	}
 
-	if c.config.testing {
+	if c.config.testing && c.HasAccessToken() {
 		qp := url.Query()
 		qp.Add("testmode", "true")
 		url.RawQuery = qp.Encode()

diff --git a/mollie/mollie_test.go b/mollie/mollie_test.go
@@ -50,7 +50,9 @@ func TestNewClient(t *testing.T) {
 
 func TestNewClientWithEnvVars(t *testing.T) {
 	setEnv()
+	setup()
 	defer unsetEnv()
+	defer teardown()
 
 	var c = http.DefaultClient
 	{
@@ -106,7 +108,7 @@ func TestClient_NewAPIRequest(t *testing.T) {
 				body:   []string{"hello", "world"},
 			},
 			`["hello","world"]` + "\n",
-			"/test?testmode=true",
+			"/test",
 			false,
 		},
 		{
@@ -118,7 +120,7 @@ func TestClient_NewAPIRequest(t *testing.T) {
 				body:   "some simple string",
 			},
 			"\"some simple string\"\n",
-			"/test?testmode=true",
+			"/test",
 			true,
 		},
 	}
@@ -458,7 +460,7 @@ func teardown() {
 
 func setEnv() {
 	_ = os.Setenv(APITokenEnv, "token_X12b31ggg23")
-	_ = os.Setenv(OrgTokenEnv, "ey1923n23123n1k3b123jv12g312h31v32g13")
+	_ = os.Setenv(OrgTokenEnv, "access_ey1923n23123n1k3b123jv12g312h31v32g13")
 }
 
 func unsetEnv() {

diff --git a/mollie/onboarding_test.go b/mollie/onboarding_test.go
@@ -32,7 +32,6 @@ func (os *onboardingServiceSuite) TestOnboardingService_GetOnboardingStatus() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -102,7 +101,6 @@ func (os *onboardingServiceSuite) TestOnboardingService_SubmitOnboardingData() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "POST")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)

diff --git a/mollie/orders_test.go b/mollie/orders_test.go
@@ -45,7 +45,7 @@ func (os *ordersServiceSuite) TestOrdersService_Get() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "profileId=pfl_1236h213bv1&testmode=true")
+				testQuery(os.T(), r, "profileId=pfl_1236h213bv1")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -141,7 +141,7 @@ func (os *ordersServiceSuite) TestOrdersService_List() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "profileId=pfl_1236h213bv1&testmode=true")
+				testQuery(os.T(), r, "profileId=pfl_1236h213bv1")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -237,7 +237,6 @@ func (os *ordersServiceSuite) TestOrdersService_Create() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "POST")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -262,7 +261,6 @@ func (os *ordersServiceSuite) TestOrdersService_Create() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "POST")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -365,7 +363,6 @@ func (os *ordersServiceSuite) TestOrdersService_Update() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "PATCH")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -390,7 +387,6 @@ func (os *ordersServiceSuite) TestOrdersService_Update() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "PATCH")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -493,7 +489,6 @@ func (os *ordersServiceSuite) TestOrdersService_Cancel() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "DELETE")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -518,7 +513,6 @@ func (os *ordersServiceSuite) TestOrdersService_Cancel() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "DELETE")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -621,7 +615,6 @@ func (os *ordersServiceSuite) TestOrdersService_UpdateOrderLine() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "PATCH")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -647,7 +640,6 @@ func (os *ordersServiceSuite) TestOrdersService_UpdateOrderLine() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "PATCH")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -753,7 +745,6 @@ func (os *ordersServiceSuite) TestOrdersService_CancelOrderLine() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "DELETE")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -779,7 +770,6 @@ func (os *ordersServiceSuite) TestOrdersService_CancelOrderLine() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "DELETE")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -873,7 +863,6 @@ func (os *ordersServiceSuite) TestOrdersService_CreateOrderPayment() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "POST")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -899,7 +888,6 @@ func (os *ordersServiceSuite) TestOrdersService_CreateOrderPayment() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "POST")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -991,7 +979,6 @@ func (os *ordersServiceSuite) TestOrdersService_CreateOrderRefund() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "POST")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -1013,7 +1000,6 @@ func (os *ordersServiceSuite) TestOrdersService_CreateOrderRefund() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "POST")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -1104,7 +1090,7 @@ func (os *ordersServiceSuite) TestOrdersService_ListOrderRefund() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "limit=100&testmode=true")
+				testQuery(os.T(), r, "limit=100")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -1127,7 +1113,6 @@ func (os *ordersServiceSuite) TestOrdersService_ListOrderRefund() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer access_token_test")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)

diff --git a/mollie/organizations_test.go b/mollie/organizations_test.go
@@ -42,7 +42,6 @@ func (os *organizationsServiceSuite) TestOrganizationsService_Get() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -130,7 +129,6 @@ func (os *organizationsServiceSuite) TestOrganizationsService_GetCurrent() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -215,7 +213,6 @@ func (os *organizationsServiceSuite) TestOrganizationsService_GetPartnerStatus()
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)

diff --git a/mollie/partners_test.go b/mollie/partners_test.go
@@ -44,7 +44,6 @@ func (os *partnersServiceSuite) TestPartnerService_Get() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -67,7 +66,7 @@ func (os *partnersServiceSuite) TestPartnerService_Get() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "embed=organization&testmode=true")
+				testQuery(os.T(), r, "embed=organization")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -162,7 +161,6 @@ func (os *partnersServiceSuite) TestPartnerService_List() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -185,7 +183,7 @@ func (os *partnersServiceSuite) TestPartnerService_List() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(os.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(os.T(), r, "GET")
-				testQuery(os.T(), r, "testmode=true&year=2021")
+				testQuery(os.T(), r, "year=2021")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)

diff --git a/mollie/payment_links_test.go b/mollie/payment_links_test.go
@@ -44,7 +44,6 @@ func (ps *paymentLinksSuite) TestPaymentLinkService_Get() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ps.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ps.T(), r, "GET")
-				testQuery(ps.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -141,7 +140,7 @@ func (ps *paymentLinksSuite) TestPaymentLinkService_Create() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ps.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ps.T(), r, "POST")
-				testQuery(ps.T(), r, "profileId=prf_12312312&testmode=true")
+				testQuery(ps.T(), r, "profileId=prf_12312312")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -234,7 +233,6 @@ func (ps *paymentLinksSuite) TestPaymentLinkService_List() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ps.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ps.T(), r, "GET")
-				testQuery(ps.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -256,7 +254,7 @@ func (ps *paymentLinksSuite) TestPaymentLinkService_List() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ps.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ps.T(), r, "GET")
-				testQuery(ps.T(), r, "profileId=pfl_11211&testmode=true")
+				testQuery(ps.T(), r, "profileId=pfl_11211")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)

diff --git a/mollie/payment_methods_test.go b/mollie/payment_methods_test.go
@@ -42,7 +42,6 @@ func (ms *paymentMethodsServiceSuite) TestMethodsService_List() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ms.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ms.T(), r, "GET")
-				testQuery(ms.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -65,7 +64,7 @@ func (ms *paymentMethodsServiceSuite) TestMethodsService_List() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ms.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ms.T(), r, "GET")
-				testQuery(ms.T(), r, "amount%5Bcurrency%5D=EUR&amount%5Bvalue%5D=100.00&testmode=true")
+				testQuery(ms.T(), r, "amount%5Bcurrency%5D=EUR&amount%5Bvalue%5D=100.00")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -155,7 +154,6 @@ func (ms *paymentMethodsServiceSuite) TestMethodsService_All() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ms.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ms.T(), r, "GET")
-				testQuery(ms.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -178,7 +176,7 @@ func (ms *paymentMethodsServiceSuite) TestMethodsService_All() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ms.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ms.T(), r, "GET")
-				testQuery(ms.T(), r, "amount%5Bcurrency%5D=EUR&amount%5Bvalue%5D=100.00&testmode=true")
+				testQuery(ms.T(), r, "amount%5Bcurrency%5D=EUR&amount%5Bvalue%5D=100.00")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -270,7 +268,6 @@ func (ms *paymentMethodsServiceSuite) TestMethodsService_Get() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ms.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ms.T(), r, "GET")
-				testQuery(ms.T(), r, "testmode=true")
 
 				if _, ok := r.Header[AuthHeader]; !ok {
 					w.WriteHeader(http.StatusUnauthorized)
@@ -291,7 +288,7 @@ func (ms *paymentMethodsServiceSuite) TestMethodsService_Get() {
 			func(w http.ResponseWriter, r *http.Request) {
 				testHeader(ms.T(), r, AuthHeader, "Bearer token_X12b31ggg23")
 				testMethod(ms.T(), r, "GET")
-				testQuery(ms.T(), r, "locale=ca_ES&testmode=true")
+				testQuery(ms.T(), r, "locale=ca_ES")
 
 				fmt.Println(r.Context())