Release 2.6.1

.travis.gofmt.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+if [[ ! -z "$(gofmt -l -s .)" ]]; then
+    echo "Go code is not formatted:"
+    gofmt -d -s .
+    exit 1
+fi

.travis.yml

@@ -1,6 +1,7 @@
 language: go
 
 go:
+  - 1.6.x
   - 1.7.x
   - 1.8.x
   - 1.9.x
@@ -26,5 +27,6 @@ install:
 
 script:
     - golint -set_exit_status $(go list ./...)
+    - ./.travis.gofmt.sh
     - go test -v -race -test.short ./...        # Run tests with the race detector.
     - go vet -v ./...                           # Run Go static analyzer.

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Unreleased
 
--
+# v2.6.1
+
+- [added] Added support for Go 1.6.
+- [changed] Fixed a bug in the
+  [`UnsubscribeFromTopic()`](https://godoc.org/firebase.google.com/go/messaging#Client.UnsubscribeFromTopic)
+  function.
+- [changed] Improved the error message returned by `GetUser()`,
+  `GetUserByEmail()` and `GetUserByPhoneNumber()` APIs in
+  [`auth`](https://godoc.org/firebase.google.com/go/auth) package.
 
 # v2.6.0
 

README.md

@@ -37,8 +37,13 @@ go get firebase.google.com/go
 
 Please refer to the [CONTRIBUTING page](./CONTRIBUTING.md) for more information
 about how you can contribute to this project. We welcome bug reports, feature
-requests, code review feedback, and also pull requests. 
+requests, code review feedback, and also pull requests.
 
+## Supported Go Versions
+
+We support Go v1.6 and higher.
+[Continuous integration](https://travis-ci.org/firebase/firebase-admin-go) system
+tests the code on Go v1.6 through v1.10.
 
 ## Documentation
 

auth/auth.go

@@ -16,7 +16,6 @@
 package auth
 
 import (
-	"context"
 	"crypto/rsa"
 	"crypto/x509"
 	"encoding/json"
@@ -25,6 +24,8 @@ import (
 	"fmt"
 	"strings"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/identitytoolkit/v3"
 	"google.golang.org/api/transport"
@@ -62,7 +63,6 @@ type Token struct {
 // Client facilitates generating custom JWT tokens for Firebase clients, and verifying ID tokens issued
 // by Firebase backend services.
 type Client struct {
-	hc        *internal.HTTPClient
 	is        *identitytoolkit.Service
 	ks        keySource
 	projectID string
@@ -123,7 +123,6 @@ func NewClient(ctx context.Context, c *internal.AuthConfig) (*Client, error) {
 	}
 
 	return &Client{
-		hc:        &internal.HTTPClient{Client: hc},
 		is:        is,
 		ks:        newHTTPKeySource(googleCertURL, hc),
 		projectID: c.ProjectID,

auth/auth_appengine.go

@@ -17,7 +17,7 @@
 package auth
 
 import (
-	"context"
+	"golang.org/x/net/context"
 
 	"google.golang.org/appengine"
 )

auth/auth_std.go

@@ -16,7 +16,7 @@
 
 package auth
 
-import "context"
+import "golang.org/x/net/context"
 
 func newSigner(ctx context.Context) (signer, error) {
 	return serviceAcctSigner{}, nil

auth/auth_test.go

@@ -15,7 +15,6 @@
 package auth
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -26,6 +25,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"golang.org/x/oauth2/google"
 
 	"google.golang.org/api/option"

auth/user_mgt.go

@@ -15,7 +15,6 @@
 package auth
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -24,6 +23,8 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"google.golang.org/api/identitytoolkit/v3"
 	"google.golang.org/api/iterator"
 )
@@ -567,7 +568,7 @@ func (c *Client) getUser(ctx context.Context, request *identitytoolkit.Identityt
 		return nil, err
 	}
 	if len(resp.Users) == 0 {
-		return nil, fmt.Errorf("cannot find user from params: %v", request)
+		return nil, fmt.Errorf("cannot find user given params: id:%v, phone:%v, email: %v", request.LocalId, request.PhoneNumber, request.Email)
 	}
 
 	eu, err := makeExportedUser(resp.Users[0])

auth/user_mgt_test.go

@@ -16,7 +16,6 @@ package auth
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -27,6 +26,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/internal"
 
 	"golang.org/x/oauth2"
@@ -148,17 +149,24 @@ func TestGetNonExistingUser(t *testing.T) {
 	s := echoServer([]byte(resp), t)
 	defer s.Close()
 
-	user, err := s.Client.GetUser(context.Background(), "ignored_id")
-	if user != nil || err == nil {
-		t.Errorf("GetUser(non-existing) = (%v, %v); want = (nil, error)", user, err)
+	want := "cannot find user given params: id:[%s], phone:[%s], email: [%s]"
+
+	we := fmt.Sprintf(want, "id-nonexisting", "", "")
+	user, err := s.Client.GetUser(context.Background(), "id-nonexisting")
+	if user != nil || err == nil || err.Error() != we {
+		t.Errorf("GetUser(non-existing) = (%v, %q); want = (nil, %q)", user, err, we)
 	}
-	user, err = s.Client.GetUserByEmail(context.Background(), "[email protected]")
-	if user != nil || err == nil {
-		t.Errorf("GetUserByEmail(non-existing) = (%v, %v); want = (nil, error)", user, err)
+
+	we = fmt.Sprintf(want, "", "", "[email protected]")
+	user, err = s.Client.GetUserByEmail(context.Background(), "[email protected]")
+	if user != nil || err == nil || err.Error() != we {
+		t.Errorf("GetUserByEmail(non-existing) = (%v, %q); want = (nil, %q)", user, err, we)
 	}
-	user, err = s.Client.GetUserByPhoneNumber(context.Background(), "+1234567890")
-	if user != nil || err == nil {
-		t.Errorf("GetUserPhoneNumber(non-existing) = (%v, %v); want = (nil, error)", user, err)
+
+	we = fmt.Sprintf(want, "", "+12345678901", "")
+	user, err = s.Client.GetUserByPhoneNumber(context.Background(), "+12345678901")
+	if user != nil || err == nil || err.Error() != we {
+		t.Errorf("GetUserPhoneNumber(non-existing) = (%v, %q); want = (nil, %q)", user, err, we)
 	}
 }
 

db/db_test.go

@@ -107,7 +107,7 @@ func TestNewClient(t *testing.T) {
 func TestNewClientAuthOverrides(t *testing.T) {
 	cases := []map[string]interface{}{
 		nil,
-		map[string]interface{}{"uid": "user1"},
+		{"uid": "user1"},
 	}
 	for _, tc := range cases {
 		c, err := NewClient(context.Background(), &internal.DatabaseConfig{

db/query.go

@@ -306,7 +306,7 @@ func (q *queryNodeImpl) Key() string {
 	if q.CompKey.Str != nil {
 		return *q.CompKey.Str
 	}
-	// Numeric keys in queryNodeImpl are always array indices, and can be safely coverted into int.
+	// Numeric keys in queryNodeImpl are always array indices, and can be safely converted into int.
 	return strconv.Itoa(int(*q.CompKey.Num))
 }
 

db/ref_test.go

@@ -265,12 +265,12 @@ func TestGetIfChanged(t *testing.T) {
 	}
 
 	checkAllRequests(t, mock.Reqs, []*testReq{
-		&testReq{
+		{
 			Method: "GET",
 			Path:   "/peter.json",
 			Header: http.Header{"If-None-Match": []string{"old-etag"}},
 		},
-		&testReq{
+		{
 			Method: "GET",
 			Path:   "/peter.json",
 			Header: http.Header{"If-None-Match": []string{"new-etag"}},
@@ -513,7 +513,7 @@ func TestInvalidUpdate(t *testing.T) {
 	cases := []map[string]interface{}{
 		nil,
 		make(map[string]interface{}),
-		map[string]interface{}{"foo": func() {}},
+		{"foo": func() {}},
 	}
 	for _, tc := range cases {
 		if err := testref.Update(context.Background(), tc); err == nil {
@@ -542,12 +542,12 @@ func TestTransaction(t *testing.T) {
 		t.Fatal(err)
 	}
 	checkAllRequests(t, mock.Reqs, []*testReq{
-		&testReq{
+		{
 			Method: "GET",
 			Path:   "/peter.json",
 			Header: http.Header{"X-Firebase-ETag": []string{"true"}},
 		},
-		&testReq{
+		{
 			Method: "PUT",
 			Path:   "/peter.json",
 			Body: serialize(map[string]interface{}{
@@ -591,12 +591,12 @@ func TestTransactionRetry(t *testing.T) {
 		t.Errorf("Transaction() retries = %d; want = %d", cnt, 2)
 	}
 	checkAllRequests(t, mock.Reqs, []*testReq{
-		&testReq{
+		{
 			Method: "GET",
 			Path:   "/peter.json",
 			Header: http.Header{"X-Firebase-ETag": []string{"true"}},
 		},
-		&testReq{
+		{
 			Method: "PUT",
 			Path:   "/peter.json",
 			Body: serialize(map[string]interface{}{
@@ -605,7 +605,7 @@ func TestTransactionRetry(t *testing.T) {
 			}),
 			Header: http.Header{"If-Match": []string{"mock-etag1"}},
 		},
-		&testReq{
+		{
 			Method: "PUT",
 			Path:   "/peter.json",
 			Body: serialize(map[string]interface{}{
@@ -650,12 +650,12 @@ func TestTransactionError(t *testing.T) {
 		t.Errorf("Transaction() retries = %d; want = %d", cnt, 1)
 	}
 	checkAllRequests(t, mock.Reqs, []*testReq{
-		&testReq{
+		{
 			Method: "GET",
 			Path:   "/peter.json",
 			Header: http.Header{"X-Firebase-ETag": []string{"true"}},
 		},
-		&testReq{
+		{
 			Method: "PUT",
 			Path:   "/peter.json",
 			Body: serialize(map[string]interface{}{
@@ -694,7 +694,7 @@ func TestTransactionAbort(t *testing.T) {
 		t.Errorf("Transaction() = nil; want error")
 	}
 	wanted := []*testReq{
-		&testReq{
+		{
 			Method: "GET",
 			Path:   "/peter.json",
 			Header: http.Header{"X-Firebase-ETag": []string{"true"}},

firebase.go

@@ -18,12 +18,13 @@
 package firebase
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"os"
 
+	"golang.org/x/net/context"
+
 	"cloud.google.com/go/firestore"
 
 	"firebase.google.com/go/auth"
@@ -41,7 +42,7 @@ import (
 var defaultAuthOverrides = make(map[string]interface{})
 
 // Version of the Firebase Go Admin SDK.
-const Version = "2.6.0"
+const Version = "2.6.1"
 
 // firebaseEnvName is the name of the environment variable with the Config.
 const firebaseEnvName = "FIREBASE_CONFIG"

firebase_test.go

@@ -15,8 +15,6 @@
 package firebase
 
 import (
-	"context"
-	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -28,6 +26,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"golang.org/x/oauth2/google"
 
 	"google.golang.org/api/transport"
@@ -247,8 +247,8 @@ func TestDatabase(t *testing.T) {
 func TestDatabaseAuthOverrides(t *testing.T) {
 	cases := []map[string]interface{}{
 		nil,
-		map[string]interface{}{},
-		map[string]interface{}{"uid": "user1"},
+		{},
+		{"uid": "user1"},
 	}
 	for _, tc := range cases {
 		ctx := context.Background()
@@ -539,15 +539,13 @@ func TestAutoInit(t *testing.T) {
 	defer reinstateEnv(credEnvVar, credOld)
 
 	for _, test := range tests {
-		t.Run(fmt.Sprintf("NewApp(%s)", test.name), func(t *testing.T) {
-			overwriteEnv(firebaseEnvName, test.optionsConfig)
-			app, err := NewApp(context.Background(), test.initOptions)
-			if err != nil {
-				t.Error(err)
-			} else {
-				compareConfig(app, test.wantOptions, t)
-			}
-		})
+		overwriteEnv(firebaseEnvName, test.optionsConfig)
+		app, err := NewApp(context.Background(), test.initOptions)
+		if err != nil {
+			t.Errorf("NewApp(%s): %v", test.name, err)
+		} else {
+			compareConfig(app, test.wantOptions, t)
+		}
 	}
 }
 
@@ -577,13 +575,11 @@ func TestAutoInitInvalidFiles(t *testing.T) {
 	defer reinstateEnv(credEnvVar, credOld)
 
 	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			overwriteEnv(firebaseEnvName, test.filename)
-			_, err := NewApp(context.Background(), nil)
-			if err == nil || err.Error() != test.wantError {
-				t.Errorf("got error = %s; want = %s", err, test.wantError)
-			}
-		})
+		overwriteEnv(firebaseEnvName, test.filename)
+		_, err := NewApp(context.Background(), nil)
+		if err == nil || err.Error() != test.wantError {
+			t.Errorf("%s got error = %s; want = %s", test.name, err, test.wantError)
+		}
 	}
 }