fix unban url creation

umputun · Dec 6, 2023 · 73233d9 · 73233d9
1 parent 1861ba4
commit 73233d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/events/telegram.go b/app/events/telegram.go
@@ -448,7 +448,7 @@ func (l *TelegramListener) transformEntities(entities []tbapi.MessageEntity) *[]
 func (l *TelegramListener) unbanURL(userID int64) string {
 	// key is SHA1 of user ID + secret
 	key := fmt.Sprintf("%x", sha256.Sum256([]byte(fmt.Sprintf("%d::%s", userID, l.AdminSecret))))
-	return fmt.Sprintf("%s?user=%d&token=%s", l.AdminURL, userID, key)
+	return fmt.Sprintf("%s/unban?user=%d&token=%s", l.AdminURL, userID, key)
 }
 
 func (l *TelegramListener) runUnbanServer(ctx context.Context) {

diff --git a/app/events/telegram_test.go b/app/events/telegram_test.go
@@ -401,12 +401,12 @@ func TestTelegramListener_unbanURL(t *testing.T) {
 		secret string
 		want   string
 	}{
-		{"empty", "", "", "?user=123&token=d68b50c4f0747630c33bc736bb3087b4c22f19dc645ec63b3bf90760c553e1ae"},
-		{"test1", "http://localhost/unban", "secret",
+		{"empty", "", "", "/unban?user=123&token=d68b50c4f0747630c33bc736bb3087b4c22f19dc645ec63b3bf90760c553e1ae"},
+		{"test1", "http://localhost", "secret",
 			"http://localhost/unban?user=123&token=71199ea8c011a49df546451e456ad10b0016566a53c4861bf849ec6b2ad2a0b7"},
-		{"test2", "http://127.0.0.1:8080/unban", "secret",
+		{"test2", "http://127.0.0.1:8080", "secret",
 			"http://127.0.0.1:8080/unban?user=123&token=71199ea8c011a49df546451e456ad10b0016566a53c4861bf849ec6b2ad2a0b7"},
-		{"test3", "http://127.0.0.1:8080/unban", "secret2",
+		{"test3", "http://127.0.0.1:8080", "secret2",
 			"http://127.0.0.1:8080/unban?user=123&token=5385a71e8d5b65ea03e3da10175d78028ae59efd58811004e907baf422019b2e"},
 	}
 
@@ -418,7 +418,7 @@ func TestTelegramListener_unbanURL(t *testing.T) {
 		})
 	}
 
-	listener := TelegramListener{AdminURL: "http://localhost/unban", AdminSecret: "secret"}
+	listener := TelegramListener{AdminURL: "http://localhost", AdminSecret: "secret"}
 	res := listener.unbanURL(123)
 	assert.Equal(t, "http://localhost/unban?user=123&token=71199ea8c011a49df546451e456ad10b0016566a53c4861bf849ec6b2ad2a0b7", res)
 }