Using the new internal.HTTPClient APIs in auth (#272)

* Auth package migrated to DoAndUnmarshal

* Updated tests

* Rebased to dev

Author: hiranya911

auth/auth.go

@@ -82,7 +82,7 @@ func NewClient(ctx context.Context, conf *internal.AuthConfig) (*Client, error)
 		}
 	}
 
-	hc, _, err := internal.NewHTTPClient(ctx, conf.Opts...)
+	userMgt, err := newUserManagementClient(ctx, conf)
 	if err != nil {
 		return nil, err
 	}
@@ -97,18 +97,12 @@ func NewClient(ctx context.Context, conf *internal.AuthConfig) (*Client, error)
 		return nil, err
 	}
 
-	version := "Go/Admin/" + conf.Version
 	return &Client{
-		userManagementClient: userManagementClient{
-			baseURL:    idToolkitEndpoint,
-			projectID:  conf.ProjectID,
-			version:    version,
-			httpClient: hc,
-		},
-		idTokenVerifier: idTokenVerifier,
-		cookieVerifier:  cookieVerifier,
-		signer:          signer,
-		clock:           internal.SystemClock,
+		userManagementClient: *userMgt,
+		idTokenVerifier:      idTokenVerifier,
+		cookieVerifier:       cookieVerifier,
+		signer:               signer,
+		clock:                internal.SystemClock,
 	}, nil
 }
 

auth/auth_test.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"net/http"
 	"os"
 	"strings"
 	"testing"
@@ -32,6 +33,11 @@ import (
 	"google.golang.org/api/transport"
 )
 
+const (
+	testProjectID = "mock-project-id"
+	testVersion   = "test-version"
+)
+
 var (
 	testGetUserResponse []byte
 	testIDToken         string
@@ -48,31 +54,22 @@ var (
 			AccessToken: "test.token",
 		}),
 	}
-	testClock     = &internal.MockClock{Timestamp: time.Now()}
-	testProjectID = "mock-project-id"
+	testClock = &internal.MockClock{Timestamp: time.Now()}
 )
 
 func TestMain(m *testing.M) {
 	var err error
 	testSigner, err = signerForTests(context.Background())
-	if err != nil {
-		log.Fatalln(err)
-	}
+	logFatal(err)
 
 	testIDTokenVerifier, err = idTokenVerifierForTests(context.Background())
-	if err != nil {
-		log.Fatalln(err)
-	}
+	logFatal(err)
 
 	testCookieVerifier, err = cookieVerifierForTests(context.Background())
-	if err != nil {
-		log.Fatalln(err)
-	}
+	logFatal(err)
 
 	testGetUserResponse, err = ioutil.ReadFile("../testdata/get_user.json")
-	if err != nil {
-		log.Fatalln(err)
-	}
+	logFatal(err)
 
 	testIDToken = getIDToken(nil)
 	testSessionCookie = getSessionCookie(nil)
@@ -88,7 +85,7 @@ func TestNewClientWithServiceAccountCredentials(t *testing.T) {
 		Creds:     creds,
 		Opts:      optsWithServiceAcct,
 		ProjectID: creds.ProjectID,
-		Version:   "test-version",
+		Version:   testVersion,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -103,19 +100,18 @@ func TestNewClientWithServiceAccountCredentials(t *testing.T) {
 	if err := checkCookieVerifier(client.cookieVerifier, creds.ProjectID); err != nil {
 		t.Errorf("NewClient().cookieVerifier: %v", err)
 	}
+	if err := checkUserManagementClient(client, creds.ProjectID); err != nil {
+		t.Errorf("NewClient().userManagementClient: %v", err)
+	}
 	if client.clock != internal.SystemClock {
 		t.Errorf("NewClient().clock = %v; want = SystemClock", client.clock)
 	}
-	wantVersion := "Go/Admin/test-version"
-	if client.version != wantVersion {
-		t.Errorf("NewClient().version = %q; want = %q", client.version, wantVersion)
-	}
 }
 
 func TestNewClientWithoutCredentials(t *testing.T) {
 	conf := &internal.AuthConfig{
 		Opts:    optsWithTokenSource,
-		Version: "test-version",
+		Version: testVersion,
 	}
 	client, err := NewClient(context.Background(), conf)
 	if err != nil {
@@ -131,20 +127,19 @@ func TestNewClientWithoutCredentials(t *testing.T) {
 	if err := checkCookieVerifier(client.cookieVerifier, ""); err != nil {
 		t.Errorf("NewClient().cookieVerifier: %v", err)
 	}
+	if err := checkUserManagementClient(client, ""); err != nil {
+		t.Errorf("NewClient().userManagementClient: %v", err)
+	}
 	if client.clock != internal.SystemClock {
 		t.Errorf("NewClient().clock = %v; want = SystemClock", client.clock)
 	}
-	wantVersion := "Go/Admin/test-version"
-	if client.version != wantVersion {
-		t.Errorf("NewClient().version = %q; want = %q", client.version, wantVersion)
-	}
 }
 
 func TestNewClientWithServiceAccountID(t *testing.T) {
 	conf := &internal.AuthConfig{
 		Opts:             optsWithTokenSource,
 		ServiceAccountID: "explicit-service-account",
-		Version:          "test-version",
+		Version:          testVersion,
 	}
 	client, err := NewClient(context.Background(), conf)
 	if err != nil {
@@ -160,13 +155,12 @@ func TestNewClientWithServiceAccountID(t *testing.T) {
 	if err := checkCookieVerifier(client.cookieVerifier, ""); err != nil {
 		t.Errorf("NewClient().cookieVerifier: %v", err)
 	}
+	if err := checkUserManagementClient(client, ""); err != nil {
+		t.Errorf("NewClient().userManagementClient: %v", err)
+	}
 	if client.clock != internal.SystemClock {
 		t.Errorf("NewClient().clock = %v; want = SystemClock", client.clock)
 	}
-	wantVersion := "Go/Admin/test-version"
-	if client.version != wantVersion {
-		t.Errorf("NewClient().version = %q; want = %q", client.version, wantVersion)
-	}
 
 	email, err := client.signer.Email(context.Background())
 	if email != conf.ServiceAccountID || err != nil {
@@ -184,7 +178,7 @@ func TestNewClientWithUserCredentials(t *testing.T) {
 	conf := &internal.AuthConfig{
 		Creds:   creds,
 		Opts:    []option.ClientOption{option.WithCredentials(creds)},
-		Version: "test-version",
+		Version: testVersion,
 	}
 	client, err := NewClient(context.Background(), conf)
 	if err != nil {
@@ -200,13 +194,12 @@ func TestNewClientWithUserCredentials(t *testing.T) {
 	if err := checkCookieVerifier(client.cookieVerifier, ""); err != nil {
 		t.Errorf("NewClient().cookieVerifier: %v", err)
 	}
+	if err := checkUserManagementClient(client, ""); err != nil {
+		t.Errorf("NewClient().userManagementClient: %v", err)
+	}
 	if client.clock != internal.SystemClock {
 		t.Errorf("NewClient().clock = %v; want = SystemClock", client.clock)
 	}
-	wantVersion := "Go/Admin/test-version"
-	if client.version != wantVersion {
-		t.Errorf("NewClient().version = %q; want = %q", client.version, wantVersion)
-	}
 }
 
 func TestNewClientWithMalformedCredentials(t *testing.T) {
@@ -917,9 +910,7 @@ func getIDTokenWithKid(kid string, p mockIDTokenPayload) string {
 		payload: pCopy,
 	}
 	token, err := info.Token(context.Background(), testSigner)
-	if err != nil {
-		log.Fatalln(err)
-	}
+	logFatal(err)
 	return token
 }
 
@@ -949,6 +940,31 @@ func checkCookieVerifier(tv *tokenVerifier, projectID string) error {
 	return nil
 }
 
+func checkUserManagementClient(client *Client, wantProjectID string) error {
+	if client.baseURL != idToolkitV1Endpoint {
+		return fmt.Errorf("baseURL = %q; want = %q", client.baseURL, idToolkitV1Endpoint)
+	}
+	if client.projectID != wantProjectID {
+		return fmt.Errorf("projectID = %q; want = %q", client.projectID, wantProjectID)
+	}
+
+	req, err := http.NewRequest(http.MethodGet, "https://firebase.google.com", nil)
+	if err != nil {
+		return err
+	}
+
+	for _, opt := range client.httpClient.Opts {
+		opt(req)
+	}
+	version := req.Header.Get("X-Client-Version")
+	wantVersion := fmt.Sprintf("Go/Admin/%s", testVersion)
+	if version != wantVersion {
+		return fmt.Errorf("version = %q; want = %q", version, wantVersion)
+	}
+
+	return nil
+}
+
 func verifyCustomToken(ctx context.Context, token string, expected map[string]interface{}, t *testing.T) {
 	if err := testIDTokenVerifier.verifySignature(ctx, token); err != nil {
 		t.Fatal(err)
@@ -996,3 +1012,9 @@ func verifyCustomToken(ctx context.Context, token string, expected map[string]in
 		}
 	}
 }
+
+func logFatal(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}

auth/email_action_links.go

@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
 	"net/url"
 )
 
@@ -129,18 +128,9 @@ func (c *userManagementClient) generateEmailActionLink(
 		}
 	}
 
-	resp, err := c.post(ctx, "/accounts:sendOobCode", payload)
-	if err != nil {
-		return "", err
-	}
-
-	if resp.Status != http.StatusOK {
-		return "", handleHTTPError(resp)
-	}
-
 	var result struct {
 		OOBLink string `json:"oobLink"`
 	}
-	err = json.Unmarshal(resp.Body, &result)
+	_, err := c.post(ctx, "/accounts:sendOobCode", payload, &result)
 	return result.OOBLink, err
 }

auth/export_users.go

@@ -16,12 +16,12 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"
 	"strconv"
 
+	"firebase.google.com/go/internal"
 	"google.golang.org/api/iterator"
 )
 
@@ -79,25 +79,21 @@ func (it *UserIterator) fetch(pageSize int, pageToken string) (string, error) {
 		query.Set("nextPageToken", pageToken)
 	}
 
-	req, err := it.client.newRequest(http.MethodGet, fmt.Sprintf("/accounts:batchGet?%s", query.Encode()))
+	url, err := it.client.makeUserMgtURL(fmt.Sprintf("/accounts:batchGet?%s", query.Encode()))
 	if err != nil {
 		return "", err
 	}
 
-	resp, err := it.client.httpClient.Do(it.ctx, req)
-	if err != nil {
-		return "", err
-	}
-
-	if resp.Status != http.StatusOK {
-		return "", handleHTTPError(resp)
+	req := &internal.Request{
+		Method: http.MethodGet,
+		URL:    url,
 	}
-
 	var parsed struct {
 		Users         []userQueryResponse `json:"users"`
 		NextPageToken string              `json:"nextPageToken"`
 	}
-	if err := json.Unmarshal(resp.Body, &parsed); err != nil {
+	_, err = it.client.httpClient.DoAndUnmarshal(it.ctx, req, &parsed)
+	if err != nil {
 		return "", err
 	}
 

auth/import_users.go

@@ -17,10 +17,8 @@ package auth
 import (
 	"context"
 	"encoding/base64"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
 
 	"firebase.google.com/go/internal"
 )
@@ -89,22 +87,14 @@ func (c *userManagementClient) ImportUsers(
 		}
 	}
 
-	resp, err := c.post(ctx, "/accounts:batchCreate", req)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.Status != http.StatusOK {
-		return nil, handleHTTPError(resp)
-	}
-
 	var parsed struct {
 		Error []struct {
 			Index   int    `json:"index"`
 			Message string `json:"message"`
 		} `json:"error,omitempty"`
 	}
-	if err := json.Unmarshal(resp.Body, &parsed); err != nil {
+	_, err := c.post(ctx, "/accounts:batchCreate", req, &parsed)
+	if err != nil {
 		return nil, err
 	}
 

auth/token_generator.go

@@ -167,7 +167,7 @@ func newIAMSigner(ctx context.Context, config *internal.AuthConfig) (*iamSigner,
 		mutex:        &sync.Mutex{},
 		httpClient:   &internal.HTTPClient{Client: hc},
 		serviceAcct:  config.ServiceAccountID,
-		metadataHost: "http://metadata",
+		metadataHost: "http://metadata.google.internal",
 		iamHost:      "https://iam.googleapis.com",
 	}, nil
 }