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

gateway/internal/backendclient/api.go

@@ -33,6 +33,20 @@ type ProfileResp struct {
 	NotificationsInAppOnly bool   `json:"notifications_in_app_only"`
 }
 
+// LinkResultResp is the result of an account link/merge step (Stage 11). Status is
+// "linked", "merge_required" (the secondary_* fields summarise the other account) or
+// "merged". Token is a switched-session token (a guest initiator's durable
+// counterpart won); Profile is the surviving/active account's profile.
+type LinkResultResp struct {
+	Status           string       `json:"status"`
+	SecondaryUserID  string       `json:"secondary_user_id"`
+	SecondaryName    string       `json:"secondary_display_name"`
+	SecondaryGames   int          `json:"secondary_games"`
+	SecondaryFriends int          `json:"secondary_friends"`
+	Token            string       `json:"token"`
+	Profile          *ProfileResp `json:"profile"`
+}
+
 // TileJSON is one placed tile, used in both play requests and move responses.
 type TileJSON struct {
 	Row    int    `json:"row"`

gateway/internal/backendclient/api_social.go

@@ -228,20 +228,47 @@ func (c *Client) UpdateProfile(ctx context.Context, userID string, p ProfileResp
 	return out, err
 }
 
-// EmailBindRequest asks the backend to mail a confirm-code binding email.
-func (c *Client) EmailBindRequest(ctx context.Context, userID, email string) error {
-	return c.do(ctx, http.MethodPost, "/api/v1/user/email/request", userID, "",
+// LinkEmailRequest asks the backend to mail a confirm-code for a link or merge.
+func (c *Client) LinkEmailRequest(ctx context.Context, userID, email string) error {
+	return c.do(ctx, http.MethodPost, "/api/v1/user/link/email/request", userID, "",
 		map[string]string{"email": email}, nil)
 }
 
-// EmailBindConfirm verifies the code and binds the email, returning the profile.
-func (c *Client) EmailBindConfirm(ctx context.Context, userID, email, code string) (ProfileResp, error) {
-	var out ProfileResp
-	err := c.do(ctx, http.MethodPost, "/api/v1/user/email/confirm", userID, "",
+// LinkEmailConfirm verifies the code and binds a free email or reports a required
+// merge (Stage 11).
+func (c *Client) LinkEmailConfirm(ctx context.Context, userID, email, code string) (LinkResultResp, error) {
+	var out LinkResultResp
+	err := c.do(ctx, http.MethodPost, "/api/v1/user/link/email/confirm", userID, "",
 		map[string]string{"email": email, "code": code}, &out)
 	return out, err
 }
 
+// LinkEmailMerge re-verifies the code and performs the merge (Stage 11).
+func (c *Client) LinkEmailMerge(ctx context.Context, userID, email, code string) (LinkResultResp, error) {
+	var out LinkResultResp
+	err := c.do(ctx, http.MethodPost, "/api/v1/user/link/email/merge", userID, "",
+		map[string]string{"email": email, "code": code}, &out)
+	return out, err
+}
+
+// LinkTelegram attaches a gateway-validated Telegram identity to the caller or
+// reports a required merge (Stage 11).
+func (c *Client) LinkTelegram(ctx context.Context, userID, externalID string) (LinkResultResp, error) {
+	var out LinkResultResp
+	err := c.do(ctx, http.MethodPost, "/api/v1/user/link/telegram", userID, "",
+		map[string]string{"external_id": externalID}, &out)
+	return out, err
+}
+
+// LinkTelegramMerge merges the account owning a gateway-validated Telegram identity
+// into the caller's (Stage 11).
+func (c *Client) LinkTelegramMerge(ctx context.Context, userID, externalID string) (LinkResultResp, error) {
+	var out LinkResultResp
+	err := c.do(ctx, http.MethodPost, "/api/v1/user/link/telegram/merge", userID, "",
+		map[string]string{"external_id": externalID}, &out)
+	return out, err
+}
+
 // Stats returns the caller's lifetime statistics.
 func (c *Client) Stats(ctx context.Context, userID string) (StatsResp, error) {
 	var out StatsResp