Merge pull request #30 from erikcc02/master

ggwhite · web-flow · commit b718c0e7dc38 · 2024-09-02T09:46:05.000+08:00
fix: apply the email mask correctly
diff --git a/email.go b/email.go
@@ -24,7 +24,7 @@ func (m *EmailMasker) Marshal(s string, i string) string {
 	addr := tmp[0]
 	domain := tmp[1]
 
-	addr = overlay(addr, strLoop(s, 4), 3, 7)
+	addr = overlay(addr, strLoop(s, 4), 3, len(addr))
 
 	return addr + "@" + domain
 }
diff --git a/email_test.go b/email_test.go
@@ -27,7 +27,7 @@ func TestEmailMasker_Marshal(t *testing.T) {
 				s: "*",
 				i: "ggw.chang@gmail.com",
 			},
-			want: "ggw****ng@gmail.com",
+			want: "ggw****@gmail.com",
 		},
 		{
 			name: "Address Less Than 3",
diff --git a/masker_test.go b/masker_test.go
@@ -345,7 +345,7 @@ func TestMaskerMarshaler_Struct(t *testing.T) {
 					Email string `mask:"email"`
 				}{
 					Name:  "J**n D**e",
-					Email: "ggw****ng@gmail.com",
+					Email: "ggw****@gmail.com",
 				},
 			},
 		},

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (m *EmailMasker) Marshal(s string, i string) string {`
`24`	`24`	`addr := tmp[0]`
`25`	`25`	`domain := tmp[1]`
`26`	`26`
`27`		`- addr = overlay(addr, strLoop(s, 4), 3, 7)`
	`27`	`+ addr = overlay(addr, strLoop(s, 4), 3, len(addr))`
`28`	`28`
`29`	`29`	`return addr + "@" + domain`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func TestEmailMasker_Marshal(t *testing.T) {`
`27`	`27`	`s: "*",`
`28`	`28`	`i: "ggw.chang@gmail.com",`
`29`	`29`	`},`
`30`		`- want: "ggw****ng@gmail.com",`
	`30`	`+ want: "ggw****@gmail.com",`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`name: "Address Less Than 3",`