Use directory provider (#57)

* refactor: use os.UserConfigDir for convenience

* refactor: remove RunCmd from console.go

* refactor: move TestDirectoryProvider to separate package used for testing only

Author: parfenovvs

cmd/root.go

@@ -59,11 +59,20 @@ func Execute() {
 }
 
 func init() {
-	cp := config.NewYamlConfigProvider()
-	holocron := remote.NewDefaultHolocron(config.NewConfigFileMachineIdProvider())
+	// Create directory provider (single source of truth for all directory paths)
+	dirProvider, err := config.NewDefaultDirectoryProvider()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: failed to initialize configuration directory: %v\n", err)
+		os.Exit(1)
+	}
+
+	// Wire up all dependencies with directory provider
+	cp := config.NewYamlConfigProvider(dirProvider)
+	machineIdProvider := config.NewConfigFileMachineIdProvider(dirProvider)
+	holocron := remote.NewDefaultHolocron(machineIdProvider)
 	sm := session.NewDefaultSessionManager(cp, holocron)
-	ss := servers.NewDefaultServerStorage()
-	vpn := vpn.NewDefaultVpn(cp, holocron, ss)
+	ss := servers.NewDefaultServerStorage(dirProvider)
+	vpn := vpn.NewDefaultVpn(cp, holocron, ss, dirProvider)
 
 	rootCmd.AddCommand(NewLoginCommand(sm))
 	rootCmd.AddCommand(NewLogoutCommand(sm))

pkg/config/config.go

@@ -24,21 +24,13 @@ type ConfigProvider interface {
 }
 
 type YamlConfigProvider struct{
-	// For testing purposes
-	homeDir string
+	dirProvider DirectoryProvider
 }
 
-func NewYamlConfigProvider() ConfigProvider {
-	return &YamlConfigProvider{}
-}
-
-// GetUserHomeDir returns the user's home directory
-// This is extracted to a method to make it testable
-func (cp *YamlConfigProvider) GetUserHomeDir() (string, error) {
-	if cp.homeDir != "" {
-		return cp.homeDir, nil
+func NewYamlConfigProvider(dirProvider DirectoryProvider) ConfigProvider {
+	return &YamlConfigProvider{
+		dirProvider: dirProvider,
 	}
-	return os.UserHomeDir()
 }
 
 func (cp *YamlConfigProvider) StoreInstallationToken(token string) error {
@@ -61,13 +53,11 @@ func (cp *YamlConfigProvider) GetInstallationToken() (string, error) {
 }
 
 func (cp *YamlConfigProvider) DeleteConfig() error {
-	home, err := cp.GetUserHomeDir()
+	configPath, err := cp.dirProvider.GetConfigFile()
 	if err != nil {
-		return fmt.Errorf("failed to get user home directory: %w", err)
+		return fmt.Errorf("failed to get config file path: %w", err)
 	}
 
-	configPath := filepath.Join(home, ".config", "mbvpn", "config.yml")
-
 	err = os.Remove(configPath)
 	if err != nil {
 		return fmt.Errorf("failed to delete config file: %w", err)
@@ -77,12 +67,11 @@ func (cp *YamlConfigProvider) DeleteConfig() error {
 }
 
 func (cp *YamlConfigProvider) update(cfg Config) error {
-	home, err := cp.GetUserHomeDir()
+	configPath, err := cp.dirProvider.GetConfigFile()
 	if err != nil {
-		return fmt.Errorf("failed to get user home directory: %w", err)
+		return fmt.Errorf("failed to get config file path: %w", err)
 	}
 
-	configPath := filepath.Join(home, ".config", "mbvpn", "config.yml")
 	f, err := os.OpenFile(configPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600)
 	if err != nil {
 		return fmt.Errorf("failed to open config file for writing: %w", err)
@@ -94,7 +83,7 @@ func (cp *YamlConfigProvider) update(cfg Config) error {
 	if err != nil {
 		return fmt.Errorf("failed to encode config data: %w", err)
 	}
-	
+
 	return nil
 }
 
@@ -117,44 +106,42 @@ func (cp *YamlConfigProvider) StoreData(publicKey string, privateKey string) err
 
 
 func (cp *YamlConfigProvider) Get() (Config, error) {
-	home, err := cp.GetUserHomeDir()
+	configPath, err := cp.dirProvider.GetConfigFile()
 	if err != nil {
-		return Config{}, fmt.Errorf("failed to get user home directory: %w", err)
+		return Config{}, fmt.Errorf("failed to get config file path: %w", err)
 	}
 
-	configPath := filepath.Join(home, ".config", "mbvpn", "config.yml")
-	
 	// Try to open the file
 	f, err := os.Open(configPath)
-	
+
 	// If file doesn't exist, create it with default config
 	if os.IsNotExist(err) {
 		// Ensure directory exists
 		configDir := filepath.Dir(configPath)
 		if err := os.MkdirAll(configDir, 0755); err != nil {
 			return Config{}, fmt.Errorf("failed to create config directory: %w", err)
 		}
-		
+
 		// Create default config
 		defaultConfig := Config{
 			// Set your default values here
 			// For example:
 			// ServerURL: "default.server.com",
 			// Port: 51820,
 		}
-		
+
 		// Create and write to the file
 		f, err := os.Create(configPath)
 		if err != nil {
 			return Config{}, fmt.Errorf("failed to create config file: %w", err)
 		}
 		defer f.Close()
-		
+
 		encoder := yaml.NewEncoder(f)
 		if err := encoder.Encode(defaultConfig); err != nil {
 			return Config{}, fmt.Errorf("failed to write default config: %w", err)
 		}
-		
+
 		return defaultConfig, nil
 	} else if err != nil {
 		// Handle other errors