fix(user): call identify after signup/login

Author: LorrisSaintGenez

pkg/cmd/auth/login/login.go

@@ -1,6 +1,7 @@
 package login
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -14,6 +15,7 @@ import (
 	"github.com/algolia/cli/pkg/config"
 	"github.com/algolia/cli/pkg/iostreams"
 	"github.com/algolia/cli/pkg/prompt"
+	"github.com/algolia/cli/pkg/telemetry"
 	"github.com/algolia/cli/pkg/validators"
 )
 
@@ -71,7 +73,7 @@ func NewLoginCmd(f *cmdutil.Factory) *cobra.Command {
 		`),
 		Args: validators.NoArgs(),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runLoginCmd(opts)
+			return runLoginCmd(cmd.Context(), opts)
 		},
 	}
 
@@ -83,13 +85,13 @@ func NewLoginCmd(f *cmdutil.Factory) *cobra.Command {
 	return cmd
 }
 
-func runLoginCmd(opts *LoginOptions) error {
-	return RunOAuthFlow(opts, false)
+func runLoginCmd(ctx context.Context, opts *LoginOptions) error {
+	return RunOAuthFlow(ctx, opts, false)
 }
 
 // RunOAuthFlow runs the full browser-based OAuth + profile setup flow.
 // If signup is true, the browser opens to the sign-up page instead of sign-in.
-func RunOAuthFlow(opts *LoginOptions, signup bool) error {
+func RunOAuthFlow(ctx context.Context, opts *LoginOptions, signup bool) error {
 	cs := opts.IO.ColorScheme()
 	client := opts.NewDashboardClient(auth.OAuthClientID())
 
@@ -99,6 +101,8 @@ func RunOAuthFlow(opts *LoginOptions, signup bool) error {
 		return err
 	}
 
+	identifyAuthenticatedUser(ctx)
+
 	opts.IO.StartProgressIndicatorWithLabel("Fetching applications")
 	apps, err := client.ListApplications(accessToken)
 	opts.IO.StopProgressIndicator()
@@ -138,6 +142,32 @@ func RunOAuthFlow(opts *LoginOptions, signup bool) error {
 	return apputil.ConfigureProfile(opts.IO, opts.Config, appDetails, profileName, opts.Default)
 }
 
+// identifyAuthenticatedUser emits a telemetry Identify for the user that just
+// authenticated. It is a no-op when no identified token is present.
+func identifyAuthenticatedUser(ctx context.Context) {
+	if applyStoredIdentity(ctx) {
+		telemetry.IdentifyOnce(ctx)
+	}
+}
+
+// applyStoredIdentity copies the persisted user identity from the stored token
+// onto the request's telemetry metadata. It reports whether an identity was
+// applied.
+func applyStoredIdentity(ctx context.Context) bool {
+	token := auth.LoadToken()
+	if token == nil || token.UserID == "" {
+		return false
+	}
+
+	metadata := telemetry.GetEventMetadata(ctx)
+	if metadata == nil {
+		return false
+	}
+
+	metadata.SetUser(token.UserID, token.Email, token.Name)
+	return true
+}
+
 // reuseExistingAPIKey checks if a local profile already has an API key for
 // the given application. If so, it sets app.APIKey and returns true.
 func reuseExistingAPIKey(cfg config.IConfig, app *dashboard.Application) bool {

pkg/cmd/auth/login/login_test.go

@@ -1,14 +1,18 @@
 package login
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/zalando/go-keyring"
 
 	"github.com/algolia/cli/api/dashboard"
+	"github.com/algolia/cli/pkg/auth"
 	"github.com/algolia/cli/pkg/cmdutil"
 	"github.com/algolia/cli/pkg/iostreams"
+	"github.com/algolia/cli/pkg/telemetry"
 	"github.com/algolia/cli/test"
 )
 
@@ -71,6 +75,61 @@ func TestSelectApplication_ByName_NotFound(t *testing.T) {
 	assert.Contains(t, err.Error(), "not found")
 }
 
+func TestApplyStoredIdentity_SetsMetadataFromToken(t *testing.T) {
+	keyring.MockInit()
+	t.Cleanup(auth.ClearToken)
+
+	err := auth.SaveToken(&dashboard.OAuthTokenResponse{
+		AccessToken:  "access",
+		RefreshToken: "refresh",
+		ExpiresIn:    3600,
+		User: &dashboard.User{
+			ID:    42,
+			Email: "user@example.com",
+			Name:  "Ada Lovelace",
+		},
+	})
+	require.NoError(t, err)
+
+	metadata := telemetry.NewEventMetadata()
+	ctx := telemetry.WithEventMetadata(context.Background(), metadata)
+
+	assert.True(t, applyStoredIdentity(ctx))
+	assert.Equal(t, "42", metadata.UserID)
+	assert.Equal(t, "user@example.com", metadata.Email)
+	assert.Equal(t, "Ada Lovelace", metadata.Name)
+}
+
+func TestApplyStoredIdentity_NoTokenReturnsFalse(t *testing.T) {
+	keyring.MockInit()
+	auth.ClearToken()
+
+	metadata := telemetry.NewEventMetadata()
+	ctx := telemetry.WithEventMetadata(context.Background(), metadata)
+
+	assert.False(t, applyStoredIdentity(ctx))
+	assert.Empty(t, metadata.UserID)
+}
+
+func TestApplyStoredIdentity_TokenWithoutIdentityReturnsFalse(t *testing.T) {
+	keyring.MockInit()
+	t.Cleanup(auth.ClearToken)
+
+	// Token persisted before identity was tracked (no user object).
+	err := auth.SaveToken(&dashboard.OAuthTokenResponse{
+		AccessToken:  "access",
+		RefreshToken: "refresh",
+		ExpiresIn:    3600,
+	})
+	require.NoError(t, err)
+
+	metadata := telemetry.NewEventMetadata()
+	ctx := telemetry.WithEventMetadata(context.Background(), metadata)
+
+	assert.False(t, applyStoredIdentity(ctx))
+	assert.Empty(t, metadata.UserID)
+}
+
 func TestSelectApplication_MultipleApps_NonInteractive_NoAppName(t *testing.T) {
 	io, _, _, _ := iostreams.Test()
 	opts := &LoginOptions{IO: io}

pkg/cmd/auth/signup/signup.go

@@ -34,7 +34,7 @@ func NewSignupCmd(f *cmdutil.Factory) *cobra.Command {
 		`),
 		Args: validators.NoArgs(),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return login.RunOAuthFlow(opts, true)
+			return login.RunOAuthFlow(cmd.Context(), opts, true)
 		},
 	}
 

pkg/telemetry/telemetry.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"os"
 	"runtime"
 
 	"github.com/segmentio/analytics-go/v3"
@@ -69,6 +70,26 @@ func NewAnalyticsTelemetryClient(debug bool) (TelemetryClient, error) {
 	return &AnalyticsTelemetryClient{client: client}, nil
 }
 
+// IdentifyOnce sends a single Identify event through a short-lived client and
+// flushes it before returning. It is meant for one-shot identification (for
+// example, right after authentication fills the token) where the command's
+// request-scoped client may already have been closed. It honors the same
+// ALGOLIA_CLI_TELEMETRY and DEBUG environment variables as the root command and
+// fails silently so telemetry never blocks the user.
+func IdentifyOnce(ctx context.Context) {
+	if os.Getenv("ALGOLIA_CLI_TELEMETRY") == "0" {
+		return
+	}
+
+	client, err := NewAnalyticsTelemetryClient(os.Getenv("DEBUG") != "")
+	if err != nil {
+		return
+	}
+	defer client.Close()
+
+	_ = client.Identify(ctx)
+}
+
 // anonymousID is a unique identifier for an anonymous user of the CLI (basically the hash of the mac address)
 func anonymousID() string {
 	addrs, err := net.Interfaces()