Moving ClientCredentials type to auth package (#55)

mtlynch · Oct 6, 2016 · 976000f · 976000f
1 parent 54ad198
commit 976000f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/prosper/auth/authenticator.go b/prosper/auth/authenticator.go
@@ -8,8 +8,6 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
-
-	"github.com/mtlynch/gofn-prosper/types"
 )
 
 const baseProsperURL = "https://api.prosper.com/v1"
@@ -22,12 +20,12 @@ type ProsperAuthenticator interface {
 
 type authenticator struct {
 	baseURL string
-	creds   types.ClientCredentials
+	creds   ClientCredentials
 }
 
 // NewAuthenticator creates a new, unauthenticated Prosper API client with the
 // given Prosper credentials.
-func NewAuthenticator(creds types.ClientCredentials) ProsperAuthenticator {
+func NewAuthenticator(creds ClientCredentials) ProsperAuthenticator {
 	return &authenticator{
 		baseURL: baseProsperURL,
 		creds:   creds,

diff --git a/prosper/auth/authenticator_test.go b/prosper/auth/authenticator_test.go
@@ -5,15 +5,13 @@ import (
 	"net/http"
 	"reflect"
 	"testing"
-
-	"github.com/mtlynch/gofn-prosper/types"
 )
 
 func TestAuthenticateSuccessfulResponse(t *testing.T) {
 	setUp()
 	defer tearDown()
 
-	creds := types.ClientCredentials{
+	creds := ClientCredentials{
 		ClientID:     "mock client id",
 		ClientSecret: "mock client secret",
 		Username:     "mock username",
@@ -64,7 +62,7 @@ func TestAuthenticateStatusOKButResponseIsMalformed(t *testing.T) {
 	setUp()
 	defer tearDown()
 
-	creds := types.ClientCredentials{
+	creds := ClientCredentials{
 		ClientID:     "mock client id",
 		ClientSecret: "mock client secret",
 		Username:     "mock username",
@@ -101,7 +99,7 @@ func TestAuthenticateHttpError(t *testing.T) {
 	setUp()
 	defer tearDown()
 
-	creds := types.ClientCredentials{
+	creds := ClientCredentials{
 		ClientID:     "mock client id",
 		ClientSecret: "mock client secret",
 		Username:     "mock username",
@@ -122,7 +120,7 @@ func TestAuthenticateFailedResponse(t *testing.T) {
 	setUp()
 	defer tearDown()
 
-	creds := types.ClientCredentials{
+	creds := ClientCredentials{
 		ClientID:     "mock client id",
 		ClientSecret: "mock client secret",
 		Username:     "mock username",

diff --git a/types/client_credentials.go → prosper/auth/client_credentials.go b/types/client_credentials.go → prosper/auth/client_credentials.go
@@ -1,4 +1,4 @@
-package types
+package auth
 
 // ClientCredentials represents the user's secret credentials used to
 // authenticate to the Prosper API.

diff --git a/prosper/client.go b/prosper/client.go
@@ -4,7 +4,6 @@ package prosper
 import (
 	"github.com/mtlynch/gofn-prosper/prosper/auth"
 	"github.com/mtlynch/gofn-prosper/prosper/thin"
-	"github.com/mtlynch/gofn-prosper/types"
 )
 
 // Client is a Prosper client that communicates with the Prosper HTTP endpoints.
@@ -17,7 +16,7 @@ type Client struct {
 }
 
 // NewClient creates a new Client with the given Prosper credentials.
-func NewClient(creds types.ClientCredentials) Client {
+func NewClient(creds auth.ClientCredentials) Client {
 	tokenMgr := auth.NewTokenManager(auth.NewAuthenticator(creds))
 	return Client{
 		rawClient:     thin.NewClient(tokenMgr),