User v2

client.go

@@ -9,6 +9,8 @@ import (
 	"io"
 	"log"
 	"net/http"
+	"net/url"
+	"strings"
 )
 
 const (
@@ -27,10 +29,24 @@ var (
 	ErrBadRequest = errors.New("error: bad request")
 )
 
+// Error API Response. Contains the error message as well as the type of error
+type Error struct {
+	Message string `json:"message"`
+	Type    string `json:"type"`
+}
+
 //URLBuilder is the interface for building URLs
 //go:generate mockery --name URLBuilder
 type URLBuilder interface {
 	SearchDocumentURL(vaultID string) string
+	GetUserURL(userId []string) string
+	CreateUserURL() string
+	ListUserURL(queryParams url.Values) string
+	UpdateUserURL(userId string) string
+	UpdateUserPasswordURL(userId string) string
+	DeleteUserURL(userId string) string
+	CreateAccessTokenURL(userId string) string
+	CreateApiKeyURL(userId string) string
 }
 
 //DefaultURLBuilder implements URLBuilder interface
@@ -41,6 +57,50 @@ func (t *DefaultURLBuilder) SearchDocumentURL(vaultID string) string {
 	return fmt.Sprintf("https://api.truevault.com/v1/vaults/%s/search", vaultID)
 }
 
+// GetUserURL returns the TrueVault `Get User` route for the specified user id(s)
+func (t *DefaultURLBuilder) GetUserURL(userId []string) string {
+	return fmt.Sprintf("https://api.truevault.com/v2/users/"+strings.Join(userId, ","))
+}
+
+// CreateUserURL returns the TrueVault `Create User` route
+func (t *DefaultURLBuilder) CreateUserURL() string {
+	return "https://api.truevault.com/v1/users"
+}
+
+// UpdateUserURL returns the TrueVault `Update User` route
+func (t *DefaultURLBuilder) UpdateUserURL(userId string) string {
+	return "https://api.truevault.com/v1/users/" + userId
+}
+
+// UpdateUserPasswordURL returns the TrueVault `Update User Password` route
+func (t *DefaultURLBuilder) UpdateUserPasswordURL(userId string) string {
+	return "https://api.truevault.com/v1/users/" + userId
+}
+
+// DeleteUserURL returns the TrueVault `Delete User` route
+func (t *DefaultURLBuilder) DeleteUserURL(userId string) string {
+	return "https://api.truevault.com/v1/users/" + userId
+}
+
+// CreateAccessTokenURL returns the TrueVault `Create Access Token` route
+func (t *DefaultURLBuilder) CreateAccessTokenURL(userId string) string {
+	return "https://api.truevault.com/v1/users/" + userId
+}
+
+// CreateApiKeyURL returns the TrueVault `Create API Key` route
+func (t *DefaultURLBuilder) CreateApiKeyURL(userId string) string {
+	return "https://api.truevault.com/v1/users/" + userId + "/api_key"
+}
+
+// ListUserURL returns the TrueVault `List User` route
+func (t *DefaultURLBuilder) ListUserURL(queryParams url.Values) string {
+	params := "?"
+	if queryParams != nil {
+		params += queryParams.Encode()
+	}
+	return fmt.Sprintf("https://api.truevault.com/v2/users/?%s", params)
+}
+
 //Client contains the base http requirements to make requests to TrueVault
 type Client struct {
 	URLBuilder    URLBuilder
@@ -53,7 +113,7 @@ func New(h *http.Client, ub URLBuilder, accessTokenOrKey string) Client {
 	return Client{
 		httpClient:    h,
 		URLBuilder:    ub,
-		authorization: buildAuthorizationValue(accessTokenOrKey),
+		authorization: "Basic " + base64.StdEncoding.EncodeToString([]byte(accessTokenOrKey+":")),
 	}
 }
 
@@ -67,10 +127,6 @@ func (c *Client) WithNewAccessTokenOrKey(accessTokenOrKey string) Client {
 	return New(c.httpClient, c.URLBuilder, accessTokenOrKey)
 }
 
-func buildAuthorizationValue(key string) string {
-	return "Basic " + base64.StdEncoding.EncodeToString([]byte(key+":"))
-}
-
 // NewRequest builds an http.Request that contains the Authorization and Content-Type header
 func (c *Client) NewRequest(ctx context.Context, method, path, contentType string, body io.Reader) (*http.Request, error) {
 	req, err := http.NewRequestWithContext(ctx, method, path, body)

document/document.go

@@ -67,21 +67,17 @@ func New(client gotruevault.Client) Document {
 
 // SearchDocument https://docs.truevault.com/documentsearch#search-documents
 func (r *TrueVaultDocument) SearchDocument(ctx context.Context, vaultID string, filter gotruevault.SearchOption) (SearchDocumentResult, error) {
-	var result SearchDocumentResult
 	buf := new(bytes.Buffer)
 	if err := json.NewEncoder(buf).Encode(filter); err != nil {
 		return SearchDocumentResult{}, err
 	}
 
 	path := r.URLBuilder.SearchDocumentURL(vaultID)
-
 	req, err := r.NewRequest(ctx, http.MethodPost, path, gotruevault.ContentTypeApplicationJSON, buf)
-
 	if err != nil {
 		return SearchDocumentResult{}, err
 	}
 
-	err = r.Do(req, &result)
-
-	return result, err
+	var result SearchDocumentResult
+	return result, r.Do(req, &result)
 }