Stage 11: account linking & merge (email + Telegram Login Widget) (#12)

platform/telegram/internal/connector/server.go

@@ -16,6 +16,7 @@ import (
 
 	telegramv1 "scrabble/pkg/proto/telegram/v1"
 	"scrabble/platform/telegram/internal/initdata"
+	"scrabble/platform/telegram/internal/loginwidget"
 	"scrabble/platform/telegram/internal/render"
 )
 
@@ -30,19 +31,21 @@ type Sender interface {
 // Server implements telegramv1.TelegramServer.
 type Server struct {
 	telegramv1.UnimplementedTelegramServer
-	validator initdata.Validator
-	sender    Sender
-	channelID int64
-	log       *zap.Logger
+	validator       initdata.Validator
+	widgetValidator loginwidget.Validator
+	sender          Sender
+	channelID       int64
+	log             *zap.Logger
 }
 
-// NewServer builds the gRPC service from a validator (for ValidateInitData), a
-// sender (the bot), and the configured game channel id (0 disables channel posts).
-func NewServer(validator initdata.Validator, sender Sender, channelID int64, log *zap.Logger) *Server {
+// NewServer builds the gRPC service from the Mini App initData validator, the Login
+// Widget validator (Stage 11), a sender (the bot), and the configured game channel
+// id (0 disables channel posts).
+func NewServer(validator initdata.Validator, widgetValidator loginwidget.Validator, sender Sender, channelID int64, log *zap.Logger) *Server {
 	if log == nil {
 		log = zap.NewNop()
 	}
-	return &Server{validator: validator, sender: sender, channelID: channelID, log: log}
+	return &Server{validator: validator, widgetValidator: widgetValidator, sender: sender, channelID: channelID, log: log}
 }
 
 // ValidateInitData verifies Mini App launch data and returns the user identity.
@@ -59,6 +62,20 @@ func (s *Server) ValidateInitData(ctx context.Context, req *telegramv1.ValidateI
 	}, nil
 }
 
+// ValidateLoginWidget verifies Login Widget authorization data and returns the user
+// identity, for attaching a Telegram identity to an existing account (Stage 11).
+func (s *Server) ValidateLoginWidget(ctx context.Context, req *telegramv1.ValidateLoginWidgetRequest) (*telegramv1.ValidateLoginWidgetResponse, error) {
+	u, err := s.widgetValidator.Validate(req.GetData())
+	if err != nil {
+		return nil, status.Error(codes.InvalidArgument, err.Error())
+	}
+	return &telegramv1.ValidateLoginWidgetResponse{
+		ExternalId: u.ExternalID,
+		Username:   u.Username,
+		FirstName:  u.FirstName,
+	}, nil
+}
+
 // Notify renders and delivers an out-of-app notification. It reports
 // delivered=false (without an error) for a kind that is not pushed out-of-app or a
 // delivery the bot could not complete (e.g. the user never started the bot), so the

platform/telegram/internal/connector/server_test.go

@@ -11,6 +11,7 @@ import (
 	"scrabble/pkg/fbs/scrabblefb"
 	telegramv1 "scrabble/pkg/proto/telegram/v1"
 	"scrabble/platform/telegram/internal/initdata"
+	"scrabble/platform/telegram/internal/loginwidget"
 )
 
 // stubValidator returns a fixed user / error from Validate.
@@ -21,6 +22,14 @@ type stubValidator struct {
 
 func (s stubValidator) Validate(string) (initdata.User, error) { return s.user, s.err }
 
+// stubWidgetValidator returns a fixed user / error from the Login Widget Validate.
+type stubWidgetValidator struct {
+	user loginwidget.User
+	err  error
+}
+
+func (s stubWidgetValidator) Validate(string) (loginwidget.User, error) { return s.user, s.err }
+
 // fakeSender records the delivery calls the server makes.
 type fakeSender struct {
 	notify []notifyCall
@@ -58,7 +67,7 @@ func yourTurnPayload(gameID string) []byte {
 
 func TestValidateInitData(t *testing.T) {
 	want := initdata.User{ExternalID: "42", Username: "neo", FirstName: "Thomas", LanguageCode: "ru"}
-	srv := NewServer(stubValidator{user: want}, &fakeSender{}, 0, nil)
+	srv := NewServer(stubValidator{user: want}, stubWidgetValidator{}, &fakeSender{}, 0, nil)
 	resp, err := srv.ValidateInitData(context.Background(), &telegramv1.ValidateInitDataRequest{InitData: "x"})
 	if err != nil {
 		t.Fatalf("validate: %v", err)
@@ -67,16 +76,33 @@ func TestValidateInitData(t *testing.T) {
 		t.Errorf("resp = %+v, want %+v", resp, want)
 	}
 
-	bad := NewServer(stubValidator{err: initdata.ErrInvalidInitData}, &fakeSender{}, 0, nil)
+	bad := NewServer(stubValidator{err: initdata.ErrInvalidInitData}, stubWidgetValidator{}, &fakeSender{}, 0, nil)
 	if _, err := bad.ValidateInitData(context.Background(), &telegramv1.ValidateInitDataRequest{}); status.Code(err) != codes.InvalidArgument {
 		t.Errorf("err code = %v, want InvalidArgument", status.Code(err))
 	}
 }
 
+func TestValidateLoginWidget(t *testing.T) {
+	want := loginwidget.User{ExternalID: "42", Username: "neo", FirstName: "Thomas"}
+	srv := NewServer(stubValidator{}, stubWidgetValidator{user: want}, &fakeSender{}, 0, nil)
+	resp, err := srv.ValidateLoginWidget(context.Background(), &telegramv1.ValidateLoginWidgetRequest{Data: "x"})
+	if err != nil {
+		t.Fatalf("validate: %v", err)
+	}
+	if resp.GetExternalId() != "42" || resp.GetUsername() != "neo" || resp.GetFirstName() != "Thomas" {
+		t.Errorf("resp = %+v, want %+v", resp, want)
+	}
+
+	bad := NewServer(stubValidator{}, stubWidgetValidator{err: loginwidget.ErrInvalidLoginWidget}, &fakeSender{}, 0, nil)
+	if _, err := bad.ValidateLoginWidget(context.Background(), &telegramv1.ValidateLoginWidgetRequest{}); status.Code(err) != codes.InvalidArgument {
+		t.Errorf("err code = %v, want InvalidArgument", status.Code(err))
+	}
+}
+
 func TestNotifyDelivers(t *testing.T) {
 	const gameID = "7c9e6679-7425-40de-944b-e07fc1f90ae7"
 	sender := &fakeSender{}
-	srv := NewServer(stubValidator{}, sender, 0, nil)
+	srv := NewServer(stubValidator{}, stubWidgetValidator{}, sender, 0, nil)
 	resp, err := srv.Notify(context.Background(), &telegramv1.NotifyRequest{
 		ExternalId: "12345", Kind: "your_turn", Payload: yourTurnPayload(gameID), Language: "en",
 	})
@@ -96,7 +122,7 @@ func TestNotifyDelivers(t *testing.T) {
 
 func TestNotifySkipsUnrenderedKind(t *testing.T) {
 	sender := &fakeSender{}
-	srv := NewServer(stubValidator{}, sender, 0, nil)
+	srv := NewServer(stubValidator{}, stubWidgetValidator{}, sender, 0, nil)
 	resp, err := srv.Notify(context.Background(), &telegramv1.NotifyRequest{
 		ExternalId: "12345", Kind: "opponent_moved", Language: "en",
 	})
@@ -112,7 +138,7 @@ func TestNotifySkipsUnrenderedKind(t *testing.T) {
 }
 
 func TestNotifyInvalidExternalID(t *testing.T) {
-	srv := NewServer(stubValidator{}, &fakeSender{}, 0, nil)
+	srv := NewServer(stubValidator{}, stubWidgetValidator{}, &fakeSender{}, 0, nil)
 	_, err := srv.Notify(context.Background(), &telegramv1.NotifyRequest{
 		ExternalId: "not-a-number", Kind: "your_turn", Payload: yourTurnPayload("g"), Language: "en",
 	})
@@ -123,7 +149,7 @@ func TestNotifyInvalidExternalID(t *testing.T) {
 
 func TestSendToUser(t *testing.T) {
 	sender := &fakeSender{}
-	srv := NewServer(stubValidator{}, sender, 0, nil)
+	srv := NewServer(stubValidator{}, stubWidgetValidator{}, sender, 0, nil)
 	resp, err := srv.SendToUser(context.Background(), &telegramv1.SendToUserRequest{ExternalId: "999", Text: "hi"})
 	if err != nil {
 		t.Fatalf("send to user: %v", err)
@@ -135,7 +161,7 @@ func TestSendToUser(t *testing.T) {
 
 func TestSendToGameChannel(t *testing.T) {
 	t.Run("unconfigured", func(t *testing.T) {
-		srv := NewServer(stubValidator{}, &fakeSender{}, 0, nil)
+		srv := NewServer(stubValidator{}, stubWidgetValidator{}, &fakeSender{}, 0, nil)
 		_, err := srv.SendToGameChannel(context.Background(), &telegramv1.SendToGameChannelRequest{Text: "x"})
 		if status.Code(err) != codes.FailedPrecondition {
 			t.Errorf("err code = %v, want FailedPrecondition", status.Code(err))
@@ -143,7 +169,7 @@ func TestSendToGameChannel(t *testing.T) {
 	})
 	t.Run("configured", func(t *testing.T) {
 		sender := &fakeSender{}
-		srv := NewServer(stubValidator{}, sender, 555, nil)
+		srv := NewServer(stubValidator{}, stubWidgetValidator{}, sender, 555, nil)
 		resp, err := srv.SendToGameChannel(context.Background(), &telegramv1.SendToGameChannelRequest{Text: "news"})
 		if err != nil {
 			t.Fatalf("send to channel: %v", err)