Migrating DeleteUser() API to the internal.HTTPClient (#240)

Author: hiranya911

auth/user_mgt.go

@@ -27,7 +27,6 @@ import (
 
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/googleapi"
-	"google.golang.org/api/identitytoolkit/v3"
 )
 
 const (
@@ -297,23 +296,6 @@ func (u *UserToUpdate) validatedRequest() (map[string]interface{}, error) {
 	return req, nil
 }
 
-// DeleteUser deletes the user by the given UID.
-func (c *Client) DeleteUser(ctx context.Context, uid string) error {
-	if err := validateUID(uid); err != nil {
-		return err
-	}
-	request := &identitytoolkit.IdentitytoolkitRelyingpartyDeleteAccountRequest{
-		LocalId: uid,
-	}
-
-	call := c.is.Relyingparty.DeleteAccount(request)
-	c.setHeader(call)
-	if _, err := call.Context(ctx).Do(); err != nil {
-		return handleServerError(err)
-	}
-	return nil
-}
-
 // RevokeRefreshTokens revokes all refresh tokens issued to a user.
 //
 // RevokeRefreshTokens updates the user's TokensValidAfterMillis to the current UTC second.
@@ -726,6 +708,26 @@ func (c *userManagementClient) updateUser(ctx context.Context, uid string, user
 	return nil
 }
 
+// DeleteUser deletes the user by the given UID.
+func (c *userManagementClient) DeleteUser(ctx context.Context, uid string) error {
+	if err := validateUID(uid); err != nil {
+		return err
+	}
+
+	payload := map[string]interface{}{
+		"localId": uid,
+	}
+	resp, err := c.post(ctx, "/accounts:delete", payload)
+	if err != nil {
+		return err
+	}
+
+	if resp.Status != http.StatusOK {
+		return handleHTTPError(resp)
+	}
+	return nil
+}
+
 // SessionCookie creates a new Firebase session cookie from the given ID token and expiry
 // duration. The returned JWT can be set as a server-side session cookie with a custom cookie
 // policy. Expiry duration must be at least 5 minutes but may not exceed 14 days.

auth/user_mgt_test.go

@@ -24,6 +24,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -518,6 +519,7 @@ func TestUpdateUser(t *testing.T) {
 		}
 	}
 }
+
 func TestRevokeRefreshTokens(t *testing.T) {
 	resp := `{
 		"kind": "identitytoolkit#SetAccountInfoResponse",
@@ -531,12 +533,20 @@ func TestRevokeRefreshTokens(t *testing.T) {
 	}
 	after := time.Now().Unix()
 
-	req := &identitytoolkit.IdentitytoolkitRelyingpartySetAccountInfoRequest{}
+	var req struct {
+		ValidSince string `json:"validSince"`
+	}
 	if err := json.Unmarshal(s.Rbody, &req); err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
-	if req.ValidSince > after || req.ValidSince < before {
-		t.Errorf("validSince = %d, expecting time between %d and %d", req.ValidSince, before, after)
+
+	validSince, err := strconv.ParseInt(req.ValidSince, 10, 64)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if validSince > after || validSince < before {
+		t.Errorf("validSince = %d, expecting time between %d and %d", validSince, before, after)
 	}
 }