Remove actual email value from the error message returned in validate…

…Error()
firebase · Sep 27, 2023 · 691f78d · 691f78d
1 parent 5e861fd
commit 691f78d
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 8 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/GitLink.xml b/.idea/GitLink.xml
diff --git a/.idea/firebase-admin-go.iml b/.idea/firebase-admin-go.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/auth/user_mgt.go b/auth/user_mgt.go
@@ -605,7 +605,7 @@ func validateEmail(email string) error {
 		return fmt.Errorf("email must be a non-empty string")
 	}
 	if parts := strings.Split(email, "@"); len(parts) != 2 || parts[0] == "" || parts[1] == "" {
-		return fmt.Errorf("malformed email string: %q", email)
+		return fmt.Errorf("malformed email string")
 	}
 	return nil
 }

diff --git a/auth/user_mgt_test.go b/auth/user_mgt_test.go
@@ -395,7 +395,7 @@ func TestGetUsersInvalidEmail(t *testing.T) {
 	getUsersResult, err := client.GetUsers(
 		context.Background(),
 		[]UserIdentifier{EmailIdentifier{"invalid email addr"}})
-	want := `malformed email string: "invalid email addr"`
+	want := `malformed email string`
 	if getUsersResult != nil || err == nil || err.Error() != want {
 		t.Errorf("GetUsers() = (%v, %q); want = (nil, %q)", getUsersResult, err, want)
 	}
@@ -632,16 +632,16 @@ func TestInvalidCreateUser(t *testing.T) {
 			"email must be a non-empty string",
 		}, {
 			(&UserToCreate{}).Email("a"),
-			`malformed email string: "a"`,
+			`malformed email string`,
 		}, {
 			(&UserToCreate{}).Email("a@"),
-			`malformed email string: "a@"`,
+			`malformed email string`,
 		}, {
 			(&UserToCreate{}).Email("@a"),
-			`malformed email string: "@a"`,
+			`malformed email string`,
 		}, {
 			(&UserToCreate{}).Email("a@a@a"),
-			`malformed email string: "a@a@a"`,
+			`malformed email string`,
 		}, {
 			(&UserToCreate{}).MFASettings(MultiFactorSettings{
 				EnrolledFactors: []*MultiFactorInfo{
@@ -861,7 +861,7 @@ func TestInvalidUpdateUser(t *testing.T) {
 			"email must be a non-empty string",
 		}, {
 			(&UserToUpdate{}).Email("invalid"),
-			`malformed email string: "invalid"`,
+			`malformed email string`,
 		}, {
 			(&UserToUpdate{}).PhoneNumber("1"),
 			"phone number must be a valid, E.164 compliant identifier",
@@ -1528,7 +1528,7 @@ func TestUserToImportError(t *testing.T) {
 		},
 		{
 			(&UserToImport{}).UID("test").Email("not-an-email"),
-			`malformed email string: "not-an-email"`,
+			`malformed email string`,
 		},
 		{
 			(&UserToImport{}).UID("test").PhoneNumber("not-a-phone"),