Merge branch 'dev'

Author: hiranya911

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# v3.4.0
+
+- [added] `firebase.App` now provides a new `DatabaseWithURL()` function
+  for initializing a database client from a URL.
+
 # v3.3.0
 
 - [fixed] Fixing a regression introduced in 3.2.0, where `VerifyIDToken()`

firebase.go

@@ -42,7 +42,7 @@ import (
 var defaultAuthOverrides = make(map[string]interface{})
 
 // Version of the Firebase Go Admin SDK.
-const Version = "3.3.0"
+const Version = "3.4.0"
 
 // firebaseEnvName is the name of the environment variable with the Config.
 const firebaseEnvName = "FIREBASE_CONFIG"
@@ -79,11 +79,18 @@ func (a *App) Auth(ctx context.Context) (*auth.Client, error) {
 	return auth.NewClient(ctx, conf)
 }
 
-// Database returns an instance of db.Client.
+// Database returns an instance of db.Client to interact with the default Firebase Database
+// configured via Config.DatabaseURL.
 func (a *App) Database(ctx context.Context) (*db.Client, error) {
+	return a.DatabaseWithURL(ctx, a.dbURL)
+}
+
+// DatabaseWithURL returns an instance of db.Client to interact with the Firebase Database
+// identified by the given URL.
+func (a *App) DatabaseWithURL(ctx context.Context, url string) (*db.Client, error) {
 	conf := &internal.DatabaseConfig{
 		AuthOverride: a.authOverride,
-		URL:          a.dbURL,
+		URL:          url,
 		Opts:         a.opts,
 		Version:      Version,
 	}

firebase_test.go

@@ -246,6 +246,10 @@ func TestDatabase(t *testing.T) {
 	if c, err := app.Database(ctx); c == nil || err != nil {
 		t.Errorf("Database() = (%v, %v); want (db, nil)", c, err)
 	}
+	url := "https://other-mock-db.firebaseio.com"
+	if c, err := app.DatabaseWithURL(ctx, url); c == nil || err != nil {
+		t.Errorf("Database() = (%v, %v); want (db, nil)", c, err)
+	}
 }
 
 func TestDatabaseAuthOverrides(t *testing.T) {

iid/iid.go

@@ -131,10 +131,12 @@ func NewClient(ctx context.Context, c *internal.InstanceIDConfig) (*Client, erro
 	}, nil
 }
 
-// DeleteInstanceID deletes an instance ID from Firebase.
+// DeleteInstanceID deletes the specified instance ID and the associated data from Firebase..
 //
-// This can be used to delete an instance ID and associated user data from a Firebase project,
-// pursuant to the General Data protection Regulation (GDPR).
+// Note that Google Analytics for Firebase uses its own form of Instance ID to keep track of
+// analytics data. Therefore deleting a regular instance ID does not delete Analytics data.
+// See https://firebase.google.com/support/privacy/manage-iids#delete_an_instance_id for
+// more information.
 func (c *Client) DeleteInstanceID(ctx context.Context, iid string) error {
 	if iid == "" {
 		return errors.New("instance id must not be empty")