Ilia Denisov
52f898ca6f
Tests · Go / test (push) Successful in 7s
Tests · Integration / integration (push) Successful in 11s
Tests · UI / test (push) Successful in 20s
Tests · Go / test (pull_request) Successful in 6s
Tests · Integration / integration (pull_request) Successful in 11s
Tests · UI / test (pull_request) Successful in 19s
Link an email (confirm-code) or Telegram (web Login Widget) to the current account; if the identity already has its own account, merge the two into the one in use (the current account is primary, except a guest initiator whose durable counterpart wins). The merge runs in one transaction (internal/accountmerge): stats + hint wallet summed, paid_account ORed, identities/games/chat/complaints transferred, friends/blocks de-duplicated, the secondary kept as a merged_into tombstone so a shared finished game's no-cascade FKs hold; a shared active game blocks the merge. - migration 00009: accounts.paid_account, merged_into, merged_at (+ jetgen) - internal/link orchestrator; session.RevokeAllForAccount on merge - connector ValidateLoginWidget RPC + loginwidget HMAC validator - edge ops link.email.request/confirm/merge, link.telegram.confirm/merge; supersedes the Stage 8 email.bind.* surface (request never reveals 'taken' before the code is verified, so a probe cannot enumerate addresses) - UI Profile link section + irreversible-merge dialog; Telegram web sign-in - focused regression tests (merge core, guest inversion, active-game refusal, finished-shared-game kept), gateway transcode + connector + UI codec/e2e - docs: PLAN, ARCHITECTURE 3/4/9, FUNCTIONAL(+ru), module READMEs
88 lines
3.2 KiB
Go
88 lines
3.2 KiB
Go
package transcode
|
|
|
|
import (
|
|
"context"
|
|
|
|
"scrabble/gateway/internal/backendclient"
|
|
fb "scrabble/pkg/fbs/scrabblefb"
|
|
)
|
|
|
|
// Stage 11 account linking & merge message types. The email ops carry the costly-
|
|
// email rate flag; the telegram ops validate Login Widget data through the
|
|
// connector (registered only when the connector is configured). All are
|
|
// authenticated. The merge ops are the explicit irreversible step, gated in the UI
|
|
// after a merge_required confirm.
|
|
const (
|
|
MsgLinkEmailRequest = "link.email.request"
|
|
MsgLinkEmailConfirm = "link.email.confirm"
|
|
MsgLinkEmailMerge = "link.email.merge"
|
|
MsgLinkTelegram = "link.telegram.confirm"
|
|
MsgLinkTelegramMerge = "link.telegram.merge"
|
|
)
|
|
|
|
// registerStage11 adds the linking & merge operations. The telegram ops need the
|
|
// connector's Login Widget validator, so they are registered only when tg is set.
|
|
func registerStage11(r *Registry, backend *backendclient.Client, tg TelegramValidator) {
|
|
r.ops[MsgLinkEmailRequest] = Op{Handler: linkEmailRequestHandler(backend), Auth: true, Email: true}
|
|
r.ops[MsgLinkEmailConfirm] = Op{Handler: linkEmailConfirmHandler(backend), Auth: true, Email: true}
|
|
r.ops[MsgLinkEmailMerge] = Op{Handler: linkEmailMergeHandler(backend), Auth: true, Email: true}
|
|
if tg != nil {
|
|
r.ops[MsgLinkTelegram] = Op{Handler: linkTelegramHandler(backend, tg, false), Auth: true}
|
|
r.ops[MsgLinkTelegramMerge] = Op{Handler: linkTelegramHandler(backend, tg, true), Auth: true}
|
|
}
|
|
}
|
|
|
|
func linkEmailRequestHandler(backend *backendclient.Client) Handler {
|
|
return func(ctx context.Context, req Request) ([]byte, error) {
|
|
in := fb.GetRootAsLinkEmailRequest(req.Payload, 0)
|
|
if err := backend.LinkEmailRequest(ctx, req.UserID, string(in.Email())); err != nil {
|
|
return nil, err
|
|
}
|
|
return encodeAck(true), nil
|
|
}
|
|
}
|
|
|
|
func linkEmailConfirmHandler(backend *backendclient.Client) Handler {
|
|
return func(ctx context.Context, req Request) ([]byte, error) {
|
|
in := fb.GetRootAsLinkEmailConfirm(req.Payload, 0)
|
|
res, err := backend.LinkEmailConfirm(ctx, req.UserID, string(in.Email()), string(in.Code()))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return encodeLinkResult(res), nil
|
|
}
|
|
}
|
|
|
|
func linkEmailMergeHandler(backend *backendclient.Client) Handler {
|
|
return func(ctx context.Context, req Request) ([]byte, error) {
|
|
in := fb.GetRootAsLinkEmailConfirm(req.Payload, 0)
|
|
res, err := backend.LinkEmailMerge(ctx, req.UserID, string(in.Email()), string(in.Code()))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return encodeLinkResult(res), nil
|
|
}
|
|
}
|
|
|
|
// linkTelegramHandler validates Login Widget data via the connector and then calls
|
|
// the backend's link or merge endpoint with the trusted Telegram external id.
|
|
func linkTelegramHandler(backend *backendclient.Client, tg TelegramValidator, merge bool) Handler {
|
|
return func(ctx context.Context, req Request) ([]byte, error) {
|
|
in := fb.GetRootAsLinkTelegramRequest(req.Payload, 0)
|
|
user, err := tg.ValidateLoginWidget(ctx, string(in.Data()))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var res backendclient.LinkResultResp
|
|
if merge {
|
|
res, err = backend.LinkTelegramMerge(ctx, req.UserID, user.ExternalID)
|
|
} else {
|
|
res, err = backend.LinkTelegram(ctx, req.UserID, user.ExternalID)
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return encodeLinkResult(res), nil
|
|
}
|
|
}
|