🐛 fix: resolve lint errors — named returns and struct alignment

Author: kwent

internal/cmd/auth/login.go

@@ -41,7 +41,7 @@ func init() {
 }
 
 // resolveRegistration returns a client ID and scopes, registering dynamically if needed.
-func resolveRegistration(ctx context.Context, authBaseURL string, cmd *cobra.Command) (string, []string, error) {
+func resolveRegistration(ctx context.Context, authBaseURL string, cmd *cobra.Command) (clientID string, scopes []string, err error) {
 	if clientID, _ := cmd.Flags().GetString("client-id"); clientID != "" {
 		return clientID, nil, nil
 	}
@@ -52,14 +52,14 @@ func resolveRegistration(ctx context.Context, authBaseURL string, cmd *cobra.Com
 }
 
 // registerAndCache calls POST /oauth/register and saves the client_id and scopes.
-func registerAndCache(ctx context.Context, authBaseURL string, cmd *cobra.Command) (string, []string, error) {
+func registerAndCache(ctx context.Context, authBaseURL string, cmd *cobra.Command) (clientID string, scopes []string, err error) {
 	_, _ = fmt.Fprintf(cmd.OutOrStderr(), "Registering OAuth client...\n")
-	clientID, scopes, err := xoauth.RegisterClient(ctx, authBaseURL)
+	clientID, scopes, err = xoauth.RegisterClient(ctx, authBaseURL)
 	if err != nil {
 		return "", nil, err
 	}
-	if err := xoauth.SaveRegistration(clientID, scopes); err != nil {
-		return "", nil, fmt.Errorf("failed to cache registration: %w", err)
+	if saveErr := xoauth.SaveRegistration(clientID, scopes); saveErr != nil {
+		return "", nil, fmt.Errorf("failed to cache registration: %w", saveErr)
 	}
 	return clientID, scopes, nil
 }

internal/config/config.go

@@ -24,9 +24,9 @@ type Config struct {
 	Language string     `yaml:"language"` // TUI-specific
 	Layout   string     `yaml:"layout"`   // TUI-specific
 	OAuth    *OAuthData `yaml:"oauth,omitempty"`
-	ClientID string     `yaml:"client_id,omitempty"`     // Dynamically registered OAuth client ID
-	Scopes   []string  `yaml:"scopes,omitempty,flow"`   // Granted OAuth scopes from registration
-	Debug    bool      `yaml:"-"`                       // Runtime only, not persisted
+	ClientID string     `yaml:"client_id,omitempty"`   // Dynamically registered OAuth client ID
+	Scopes   []string   `yaml:"scopes,omitempty,flow"` // Granted OAuth scopes from registration
+	Debug    bool       `yaml:"-"`                     // Runtime only, not persisted
 }
 
 // OAuthData holds OAuth2 token data within the config file.

internal/oauth/oauth.go

@@ -50,7 +50,7 @@ type registrationResponse struct {
 }
 
 // RegisterClient dynamically registers an OAuth client and returns the client_id and granted scopes.
-func RegisterClient(ctx context.Context, authBaseURL string) (string, []string, error) {
+func RegisterClient(ctx context.Context, authBaseURL string) (clientID string, scopes []string, err error) {
 	reqBody := registrationRequest{
 		ClientName:              "Rootly CLI",
 		RedirectURIs:            []string{RedirectURI},
@@ -89,8 +89,9 @@ func RegisterClient(ctx context.Context, authBaseURL string) (string, []string,
 		return "", nil, fmt.Errorf("registration response missing client_id")
 	}
 
-	scopes := strings.Fields(regResp.Scope)
-	return regResp.ClientID, scopes, nil
+	clientID = regResp.ClientID
+	scopes = strings.Fields(regResp.Scope)
+	return clientID, scopes, nil
 }
 
 // LoadCachedRegistration reads the cached client_id and scopes from config.