Ilia Denisov
57c778f9b2
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 10s
CI / integration (pull_request) Successful in 13s
CI / ui (pull_request) Successful in 54s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 57s
Collapse the two per-language Telegram bots into one unified bot and
replace language-based variant gating with explicit per-user variant
preferences.
- Telegram: one bot; drop service_language and the supported_languages
set everywhere (DB, account, auth, FlatBuffers Session wire, gateway,
connector proto). The single bot renders chat and out-of-app push in
the recipient's preferred_language; remove the game-language push
routing override (notify Intent.Language / push Event.language).
- Preferences: new accounts.variant_preferences (text[], DB default
{erudit_ru}, CHECK non-empty + subset of the three variants). Gates
the New Game picker, vs-AI and the friend invitation the player
creates, enforced server-side (HTTP 400 otherwise); an invited friend
may still accept any variant. Edited on the Settings screen; variants
are Erudit-first everywhere.
- Admin: drop the per-bot language selectors (broadcast / send-to-user)
and the feedback channel_lang column/field.
- Env/CI: collapse TELEGRAM_BOT_TOKEN_{EN,RU}, TELEGRAM_GAME_CHANNEL_ID_{EN,RU},
VITE_TELEGRAM_LINK{,_EN,_RU} and VITE_TELEGRAM_GAME_CHANNEL_NAME_{EN,RU}
to single unsuffixed names; drop GATEWAY_DEFAULT_SUPPORTED_LANGUAGES.
- Docs updated (ARCHITECTURE, FUNCTIONAL + _ru, platform/telegram, gateway,
backend, ui, UI_DESIGN, PRERELEASE).
The migration squash is deferred to a follow-up PR.
96 lines
3.3 KiB
Go
96 lines
3.3 KiB
Go
package transcode_test
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"testing"
|
|
|
|
flatbuffers "github.com/google/flatbuffers/go"
|
|
|
|
"scrabble/gateway/internal/connector"
|
|
"scrabble/gateway/internal/transcode"
|
|
fb "scrabble/pkg/fbs/scrabblefb"
|
|
)
|
|
|
|
// fakeValidator stands in for the connector's ValidateInitData RPC.
|
|
type fakeValidator struct {
|
|
user connector.User
|
|
err error
|
|
}
|
|
|
|
func (f fakeValidator) ValidateInitData(context.Context, string) (connector.User, error) {
|
|
return f.user, f.err
|
|
}
|
|
|
|
func (f fakeValidator) ValidateLoginWidget(context.Context, string) (connector.User, error) {
|
|
return f.user, f.err
|
|
}
|
|
|
|
func telegramLoginPayload(initData string) []byte {
|
|
b := flatbuffers.NewBuilder(0)
|
|
off := b.CreateString(initData)
|
|
fb.TelegramLoginRequestStart(b)
|
|
fb.TelegramLoginRequestAddInitData(b, off)
|
|
b.Finish(fb.TelegramLoginRequestEnd(b))
|
|
return b.FinishedBytes()
|
|
}
|
|
|
|
func TestTelegramAuthForwardsSeedFields(t *testing.T) {
|
|
var gotBody map[string]string
|
|
backend, cleanup := fakeBackend(t, func(w http.ResponseWriter, r *http.Request) {
|
|
if r.URL.Path != "/api/v1/internal/sessions/telegram" {
|
|
t.Errorf("unexpected path %q", r.URL.Path)
|
|
}
|
|
_ = json.NewDecoder(r.Body).Decode(&gotBody)
|
|
_, _ = w.Write([]byte(`{"token":"tok-tg","user_id":"u-tg","is_guest":false,"display_name":"Иван"}`))
|
|
})
|
|
defer cleanup()
|
|
|
|
v := fakeValidator{user: connector.User{ExternalID: "42", Username: "neo", FirstName: "Иван", LanguageCode: "ru"}}
|
|
reg := transcode.NewRegistry(backend, v)
|
|
op, ok := reg.Lookup(transcode.MsgAuthTelegram)
|
|
if !ok {
|
|
t.Fatal("auth.telegram not registered")
|
|
}
|
|
|
|
payload, err := op.Handler(context.Background(), transcode.Request{Payload: telegramLoginPayload("init")})
|
|
if err != nil {
|
|
t.Fatalf("handler: %v", err)
|
|
}
|
|
sess := fb.GetRootAsSession(payload, 0)
|
|
if string(sess.Token()) != "tok-tg" || string(sess.UserId()) != "u-tg" {
|
|
t.Fatalf("session decoded wrong: token=%q user=%q", sess.Token(), sess.UserId())
|
|
}
|
|
// The validated launch fields are forwarded so the backend can seed a new account.
|
|
if gotBody["external_id"] != "42" || gotBody["language_code"] != "ru" || gotBody["first_name"] != "Иван" {
|
|
t.Errorf("forwarded body = %+v, want external_id=42 language_code=ru first_name=Иван", gotBody)
|
|
}
|
|
}
|
|
|
|
func TestTelegramAuthInvalidInitData(t *testing.T) {
|
|
backend, cleanup := fakeBackend(t, func(http.ResponseWriter, *http.Request) {
|
|
t.Error("backend must not be called when initData is invalid")
|
|
})
|
|
defer cleanup()
|
|
|
|
reg := transcode.NewRegistry(backend, fakeValidator{err: connector.ErrInvalidInitData})
|
|
op, _ := reg.Lookup(transcode.MsgAuthTelegram)
|
|
|
|
_, err := op.Handler(context.Background(), transcode.Request{Payload: telegramLoginPayload("bad")})
|
|
if code, ok := transcode.DomainCode(err); !ok || code != "invalid_init_data" {
|
|
t.Errorf("DomainCode = (%q, %v), want (invalid_init_data, true)", code, ok)
|
|
}
|
|
}
|
|
|
|
// TestTelegramAuthDisabledWithoutConnector confirms a nil validator leaves
|
|
// auth.telegram unregistered.
|
|
func TestTelegramAuthDisabledWithoutConnector(t *testing.T) {
|
|
backend, cleanup := fakeBackend(t, func(http.ResponseWriter, *http.Request) {})
|
|
defer cleanup()
|
|
reg := transcode.NewRegistry(backend, nil)
|
|
if _, ok := reg.Lookup(transcode.MsgAuthTelegram); ok {
|
|
t.Error("auth.telegram should be unregistered without a connector")
|
|
}
|
|
}
|