updated package authentication_utils -> utils

Mastercard · Oct 2, 2019 · d6f717a · d6f717a
1 parent b4622b4
commit d6f717a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
@@ -1,8 +1,8 @@
 package crypto_test
 
 import (
-	"github.com/mastercard/oauth1-signer-go/authentication_utils"
 	"github.com/mastercard/oauth1-signer-go/crypto"
+	"github.com/mastercard/oauth1-signer-go/utils"
 	"testing"
 )
 
@@ -22,7 +22,7 @@ func TestSHA256Hash(t *testing.T) {
 
 func TestRSASignature(t *testing.T) {
 
-	privateKey, _ := authentication_utils.LoadSigningKey("../testdata/test_key_container.p12", "Password1")
+	privateKey, _ := utils.LoadSigningKey("../testdata/test_key_container.p12", "Password1")
 	var signingData [10]byte
 	sign, err := crypto.Sign(signingData[:], privateKey)
 

diff --git a/interceptor/http_client_interceptor.go b/interceptor/http_client_interceptor.go
@@ -4,7 +4,7 @@ package interceptor
 
 import (
 	"github.com/mastercard/oauth1-signer-go"
-	"github.com/mastercard/oauth1-signer-go/authentication_utils"
+	"github.com/mastercard/oauth1-signer-go/utils"
 	"net/http"
 )
 
@@ -33,7 +33,7 @@ func (h *httpClientInterceptor) RoundTrip(req *http.Request) (*http.Response, er
 // filePath: a file path of a RSA private key in PKCS#12 format
 // password: a password to read the RSA private key from the given file path
 func GetHttpClient(consumerKey, filePath, password string) (*http.Client, error) {
-	signingKey, e := authentication_utils.LoadSigningKey(filePath, password)
+	signingKey, e := utils.LoadSigningKey(filePath, password)
 	if e != nil {
 		return nil, e
 	}

diff --git a/oauth_test.go b/oauth_test.go
@@ -2,7 +2,7 @@ package oauth
 
 import (
 	"crypto/rsa"
-	"github.com/mastercard/oauth1-signer-go/authentication_utils"
+	"github.com/mastercard/oauth1-signer-go/utils"
 	"net/url"
 	"reflect"
 	"testing"
@@ -289,7 +289,7 @@ func TestSignSignatureBaseString(t *testing.T) {
 }
 
 func getTestSigningKey() *rsa.PrivateKey {
-	signingKey, _ := authentication_utils.LoadSigningKey("testdata/test_key_container.p12", "Password1")
+	signingKey, _ := utils.LoadSigningKey("testdata/test_key_container.p12", "Password1")
 	return signingKey
 }
 

diff --git a/signer_test.go b/signer_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	oauth "github.com/mastercard/oauth1-signer-go"
-	"github.com/mastercard/oauth1-signer-go/authentication_utils"
+	"github.com/mastercard/oauth1-signer-go/utils"
 	"net/http"
 	"testing"
 )
@@ -14,7 +14,7 @@ const (
 )
 
 var (
-	signingKey, _ = authentication_utils.LoadSigningKey("testdata/test_key_container.p12", "Password1")
+	signingKey, _ = utils.LoadSigningKey("testdata/test_key_container.p12", "Password1")
 	jsonData      = map[string]string{"foo": "bår"}
 	jsonValue, _  = json.Marshal(jsonData)
 	request, _    = http.NewRequest("POST", "https://sandbox.api.mastercard.com/service", bytes.NewBuffer(jsonValue))

diff --git a/authentication_utils/authentication_utils.go → utils/authentication_utils.go b/authentication_utils/authentication_utils.go → utils/authentication_utils.go
@@ -1,5 +1,5 @@
-// Package authentication_utils handles loading of signing key.
-package authentication_utils
+// Package utils handles loading of signing key.
+package utils
 
 import (
 	"crypto/rsa"

diff --git a/...cation_utils/authentication_utils_test.go → utils/authentication_utils_test.go b/...cation_utils/authentication_utils_test.go → utils/authentication_utils_test.go
@@ -1,15 +1,15 @@
-package authentication_utils_test
+package utils_test
 
 import (
-	"github.com/mastercard/oauth1-signer-go/authentication_utils"
+	"github.com/mastercard/oauth1-signer-go/utils"
 	"testing"
 )
 
 func TestLoadSigningKey(t *testing.T) {
 
 	path := "../testdata/test_key_container.p12"
 	password := "Password1"
-	privateKey, err := authentication_utils.LoadSigningKey(path, password)
+	privateKey, err := utils.LoadSigningKey(path, password)
 
 	if err != nil || privateKey == nil {
 		t.Errorf("Expected to load RSA privateKey, but thrwon %v", err)
@@ -18,14 +18,14 @@ func TestLoadSigningKey(t *testing.T) {
 
 func TestLoadSigningKeyInvalidInput(t *testing.T) {
 
-	privateKey, err := authentication_utils.LoadSigningKey(
+	privateKey, err := utils.LoadSigningKey(
 		"../testdata/invalidFile.p12", "Password1")
 
 	if err == nil || privateKey != nil {
 		t.Errorf("Expected to throw error, but returned privateKey")
 	}
 
-	privateKey, err = authentication_utils.LoadSigningKey(
+	privateKey, err = utils.LoadSigningKey(
 		"../testdata/test_key_container.p12", "incorrect_password")
 
 	if err == nil || privateKey != nil {