feat: support file multi server file manager support

raghavyuva · raghavyuva · commit db234ac896b9 · 2025-12-11T14:57:42.000+05:30
diff --git a/api/api/versions.json b/api/api/versions.json
@@ -3,7 +3,7 @@
     {
       "version": "v1",
       "status": "active",
-      "release_date": "2025-12-10T22:01:46.6664+05:30",
+      "release_date": "2025-12-11T14:46:46.935266+05:30",
       "end_of_life": "0001-01-01T00:00:00Z",
       "changes": [
         "Initial API version"
diff --git a/api/doc/openapi.json b/api/doc/openapi.json
diff --git a/api/internal/features/file-manager/controller/copy_directory.go b/api/internal/features/file-manager/controller/copy_directory.go
@@ -23,7 +23,7 @@ func (c *FileManagerController) CopyDirectory(f fuego.ContextWithBody[CopyDirect
 		}
 	}
 
-	err = c.service.CopyDirectory(request.FromPath, request.ToPath)
+	err = c.service.CopyDirectory(f.Request().Context(), request.FromPath, request.ToPath)
 	if err != nil {
 		c.logger.Log(logger.Error, err.Error(), "")
 		return nil, fuego.HTTPError{
diff --git a/api/internal/features/file-manager/controller/create_directory.go b/api/internal/features/file-manager/controller/create_directory.go
@@ -22,7 +22,7 @@ func (c *FileManagerController) CreateDirectory(f fuego.ContextWithBody[CreateDi
 		}
 	}
 
-	err = c.service.CreateDirectory(request.Path)
+	err = c.service.CreateDirectory(f.Request().Context(), request.Path)
 	if err != nil {
 		c.logger.Log(logger.Error, err.Error(), "")
 		return nil, fuego.HTTPError{
diff --git a/api/internal/features/file-manager/controller/delete_file.go b/api/internal/features/file-manager/controller/delete_file.go
@@ -21,7 +21,7 @@ func (c *FileManagerController) DeleteDirectory(f fuego.ContextWithBody[DeleteDi
 		}
 	}
 
-	err = c.service.DeleteDirectory(request.Path)
+	err = c.service.DeleteDirectory(f.Request().Context(), request.Path)
 	if err != nil {
 		c.logger.Log(logger.Error, err.Error(), "")
 		return nil, fuego.HTTPError{
diff --git a/api/internal/features/file-manager/controller/init.go b/api/internal/features/file-manager/controller/init.go
@@ -6,6 +6,7 @@ import (
 	"github.com/raghavyuva/nixopus-api/internal/features/file-manager/service"
 	"github.com/raghavyuva/nixopus-api/internal/features/logger"
 	"github.com/raghavyuva/nixopus-api/internal/features/notification"
+	"github.com/uptrace/bun"
 )
 
 type FileManagerController struct {
@@ -19,9 +20,10 @@ func NewFileManagerController(
 	ctx context.Context,
 	l logger.Logger,
 	notificationManager *notification.NotificationManager,
+	db *bun.DB,
 ) *FileManagerController {
 	return &FileManagerController{
-		service:      service.NewFileManagerService(ctx, l),
+		service:      service.NewFileManagerService(l, db),
 		ctx:          ctx,
 		logger:       l,
 		notification: notificationManager,
diff --git a/api/internal/features/file-manager/controller/list_files.go b/api/internal/features/file-manager/controller/list_files.go
@@ -24,7 +24,7 @@ func (c *FileManagerController) ListFiles(f fuego.ContextWithBody[ListFilesReque
 		}
 	}
 
-	files, err := c.service.ListFiles(path)
+	files, err := c.service.ListFiles(r.Context(), path)
 	if err != nil {
 		c.logger.Log(logger.Error, err.Error(), "")
 		return nil, fuego.HTTPError{
diff --git a/api/internal/features/file-manager/controller/move_file.go b/api/internal/features/file-manager/controller/move_file.go
@@ -23,7 +23,7 @@ func (c *FileManagerController) MoveDirectory(f fuego.ContextWithBody[MoveDirect
 		}
 	}
 
-	err = c.service.MoveDirectory(request.FromPath, request.ToPath)
+	err = c.service.MoveDirectory(f.Request().Context(), request.FromPath, request.ToPath)
 	if err != nil {
 		c.logger.Log(logger.Error, err.Error(), "")
 		return nil, fuego.HTTPError{
diff --git a/api/internal/features/file-manager/controller/upload_file.go b/api/internal/features/file-manager/controller/upload_file.go
@@ -24,7 +24,7 @@ func (c *FileManagerController) UploadFile(f fuego.ContextNoBody) (*shared_types
 		path = "."
 	}
 
-	err = c.service.UploadFile(file, path, header.Filename)
+	err = c.service.UploadFile(f.Request().Context(), file, path, header.Filename)
 	if err != nil {
 		c.logger.Log(logger.Error, err.Error(), "")
 		return nil, fuego.HTTPError{
diff --git a/api/internal/features/file-manager/service/init.go b/api/internal/features/file-manager/service/init.go
@@ -3,27 +3,46 @@ package service
 import (
 	"context"
 	"fmt"
+	"log"
 
+	"github.com/google/uuid"
 	"github.com/melbahja/goph"
 	"github.com/raghavyuva/nixopus-api/internal/features/logger"
 	"github.com/raghavyuva/nixopus-api/internal/features/ssh"
+	"github.com/raghavyuva/nixopus-api/internal/utils"
+	"github.com/uptrace/bun"
 )
 
 type FileManagerService struct {
 	logger logger.Logger
-	Ctx    context.Context
-	sshpkg *goph.Client
+	db     *bun.DB
 }
 
-func NewFileManagerService(ctx context.Context, logger logger.Logger) *FileManagerService {
-	client, err := ssh.NewSSH().Connect()
-	if err != nil {
-		fmt.Printf("Failed to create ssh client in file manager")
-		return &FileManagerService{}
-	}
+func NewFileManagerService(logger logger.Logger, db *bun.DB) *FileManagerService {
 	return &FileManagerService{
 		logger: logger,
-		Ctx:    ctx,
-		sshpkg: client,
+		db:     db,
+	}
+}
+
+// getSSHClient creates an SSH client using the active server from the database
+// It extracts the organization ID from the request context (set by supertokens middleware)
+func (f *FileManagerService) getSSHClient(ctx context.Context) (*goph.Client, error) {
+	organizationID := utils.GetOrganizationIDFromContext(ctx)
+	if organizationID == uuid.Nil {
+		log.Printf("No organization ID in context, falling back to default SSH config")
+		client, err := ssh.NewSSH().Connect()
+		if err != nil {
+			return nil, fmt.Errorf("failed to create default SSH client: %w", err)
+		}
+		return client, nil
 	}
+
+	sshConfig := ssh.NewSSHWithServer(f.db, ctx, organizationID)
+	client, err := sshConfig.Connect()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SSH client with server config: %w", err)
+	}
+
+	return client, nil
 }
diff --git a/api/internal/features/file-manager/service/manager.go b/api/internal/features/file-manager/service/manager.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
@@ -51,16 +52,20 @@ type SFTPFileMode interface {
 }
 
 // withSFTPClient safely executes an operation with an SFTP client
-func (f *FileManagerService) withSFTPClient(operation func(SFTPClient) error) error {
+// It creates the SSH client using the active server from the database
+// The organization ID is extracted from the context (set by supertokens middleware)
+func (f *FileManagerService) withSFTPClient(ctx context.Context, operation func(SFTPClient) error) error {
 	if f == nil {
 		return fmt.Errorf("file manager service is nil")
 	}
 
-	if f.sshpkg == nil {
-		return fmt.Errorf("ssh client is nil")
+	sshClient, err := f.getSSHClient(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get SSH client: %w", err)
 	}
+	defer sshClient.Close()
 
-	client, err := f.sshpkg.NewSftp()
+	client, err := sshClient.NewSftp()
 	if err != nil {
 		return err
 	}
@@ -70,10 +75,10 @@ func (f *FileManagerService) withSFTPClient(operation func(SFTPClient) error) er
 }
 
 // ListFiles returns a list of files in the given path
-func (f *FileManagerService) ListFiles(path string) ([]FileData, error) {
+func (f *FileManagerService) ListFiles(ctx context.Context, path string) ([]FileData, error) {
 	var fileData []FileData
 
-	err := f.withSFTPClient(func(client SFTPClient) error {
+	err := f.withSFTPClient(ctx, func(client SFTPClient) error {
 		sftpFileInfos, err := client.ReadDir(path)
 		if err != nil {
 			return fmt.Errorf("failed to read directory %s: %w", path, err)
@@ -157,9 +162,9 @@ type FileData struct {
 }
 
 // CreateDirectory creates a new directory at the given path and returns its contents
-func (f *FileManagerService) CreateDirectory(path string) error {
+func (f *FileManagerService) CreateDirectory(ctx context.Context, path string) error {
 	f.logger.Log(logger.Info, "creating directory", path)
-	err := f.withSFTPClient(func(client SFTPClient) error {
+	err := f.withSFTPClient(ctx, func(client SFTPClient) error {
 		if err := client.Mkdir(path); err != nil {
 			return fmt.Errorf("failed to create directory %s: %w", path, err)
 		}
@@ -173,8 +178,8 @@ func (f *FileManagerService) CreateDirectory(path string) error {
 	return nil
 }
 
-func (f *FileManagerService) DeleteDirectory(path string) error {
-	err := f.withSFTPClient(func(client SFTPClient) error {
+func (f *FileManagerService) DeleteDirectory(ctx context.Context, path string) error {
+	err := f.withSFTPClient(ctx, func(client SFTPClient) error {
 		if err := client.Remove(path); err != nil {
 			return fmt.Errorf("failed to delete file %s: %w", path, err)
 		}
@@ -188,8 +193,8 @@ func (f *FileManagerService) DeleteDirectory(path string) error {
 	return nil
 }
 
-func (f *FileManagerService) MoveDirectory(fromPath string, toPath string) error {
-	err := f.withSFTPClient(func(client SFTPClient) error {
+func (f *FileManagerService) MoveDirectory(ctx context.Context, fromPath string, toPath string) error {
+	err := f.withSFTPClient(ctx, func(client SFTPClient) error {
 		if err := client.Rename(fromPath, toPath); err != nil {
 			return fmt.Errorf("failed to move directory %s to %s: %w", fromPath, toPath, err)
 		}
@@ -204,10 +209,10 @@ func (f *FileManagerService) MoveDirectory(fromPath string, toPath string) error
 }
 
 // UploadFile handles file upload to the specified path
-func (f *FileManagerService) UploadFile(file io.Reader, path string, filename string) error {
+func (f *FileManagerService) UploadFile(ctx context.Context, file io.Reader, path string, filename string) error {
 	f.logger.Log(logger.Info, "uploading file", filename)
 
-	err := f.withSFTPClient(func(client SFTPClient) error {
+	err := f.withSFTPClient(ctx, func(client SFTPClient) error {
 		if err := client.MkdirAll(path); err != nil {
 			return fmt.Errorf("failed to create directory %s: %w", path, err)
 		}
@@ -231,10 +236,10 @@ func (f *FileManagerService) UploadFile(file io.Reader, path string, filename st
 	return nil
 }
 
-func (f *FileManagerService) CopyDirectory(fromPath string, toPath string) error {
+func (f *FileManagerService) CopyDirectory(ctx context.Context, fromPath string, toPath string) error {
 	f.logger.Log(logger.Info, "copying directory", fmt.Sprintf("from %s to %s", fromPath, toPath))
 
-	err := f.withSFTPClient(func(client SFTPClient) error {
+	err := f.withSFTPClient(ctx, func(client SFTPClient) error {
 		sourceInfo, err := client.Stat(fromPath)
 		if err != nil {
 			return fmt.Errorf("source path %s does not exist: %w", fromPath, err)
@@ -258,7 +263,7 @@ func (f *FileManagerService) CopyDirectory(fromPath string, toPath string) error
 			targetPath := filepath.Join(toPath, file.Name())
 
 			if file.IsDir() {
-				if err := f.CopyDirectory(sourcePath, targetPath); err != nil {
+				if err := f.CopyDirectory(ctx, sourcePath, targetPath); err != nil {
 					return fmt.Errorf("failed to copy directory %s: %w", sourcePath, err)
 				}
 			} else {
@@ -297,10 +302,10 @@ func (f *FileManagerService) copyFile(client SFTPClient, sourcePath, targetPath
 	return nil
 }
 
-func (f *FileManagerService) DeleteFile(path string) error {
+func (f *FileManagerService) DeleteFile(ctx context.Context, path string) error {
 	f.logger.Log(logger.Info, "deleting file/directory", path)
 
-	err := f.withSFTPClient(func(client SFTPClient) error {
+	err := f.withSFTPClient(ctx, func(client SFTPClient) error {
 		info, err := client.Stat(path)
 		if err != nil {
 			return fmt.Errorf("failed to stat %s: %w", path, err)
@@ -314,7 +319,7 @@ func (f *FileManagerService) DeleteFile(path string) error {
 
 			for _, file := range files {
 				filePath := filepath.Join(path, file.Name())
-				if err := f.DeleteFile(filePath); err != nil {
+				if err := f.DeleteFile(ctx, filePath); err != nil {
 					return err
 				}
 			}
diff --git a/api/internal/features/servers/storage/init.go b/api/internal/features/servers/storage/init.go
@@ -26,6 +26,7 @@ type ServerStorageInterface interface {
 	GetServersCount(OrganizationID string, UserID uuid.UUID, search string) (int, error)
 	GetServerName(name string, organizationID uuid.UUID) (*shared_types.Server, error)
 	GetServerByHost(host string, port int, organizationID uuid.UUID) (*shared_types.Server, error)
+	GetActiveServer(organizationID uuid.UUID) (*shared_types.Server, error)
 	BeginTx() (bun.Tx, error)
 	WithTx(tx bun.Tx) ServerStorageInterface
 }
@@ -186,3 +187,14 @@ func (s *ServerStorage) GetServerByHost(host string, port int, organizationID uu
 	}
 	return &server, nil
 }
+
+func (s *ServerStorage) GetActiveServer(organizationID uuid.UUID) (*shared_types.Server, error) {
+	var server shared_types.Server
+	err := s.getDB().NewSelect().Model(&server).
+		Where("organization_id = ? AND status = ? AND deleted_at IS NULL", organizationID, "active").
+		Scan(s.Ctx)
+	if err != nil {
+		return nil, err
+	}
+	return &server, nil
+}
diff --git a/api/internal/features/ssh/init.go b/api/internal/features/ssh/init.go
@@ -1,12 +1,17 @@
 package ssh
 
 import (
+	"context"
 	"fmt"
+	"log"
 	"os"
 	"strconv"
 
+	"github.com/google/uuid"
 	"github.com/melbahja/goph"
 	"github.com/raghavyuva/nixopus-api/internal/config"
+	server_storage "github.com/raghavyuva/nixopus-api/internal/features/servers/storage"
+	"github.com/uptrace/bun"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/terminal"
 )
@@ -32,6 +37,47 @@ func NewSSH() *SSH {
 	}
 }
 
+// getStringValue returns the string value if the pointer is not nil, otherwise returns empty string
+func getStringValue(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
+
+// NewSSHWithServer creates SSH client by querying the database for the active server
+// If an active server is found, it uses that server's SSH config
+// Otherwise falls back to default config
+func NewSSHWithServer(db *bun.DB, ctx context.Context, organizationID uuid.UUID) *SSH {
+	// Query database for active server
+	serverStorage := server_storage.ServerStorage{
+		DB:  db,
+		Ctx: ctx,
+	}
+
+	server, err := serverStorage.GetActiveServer(organizationID)
+	if err != nil {
+		log.Printf("Error querying active server: %v, falling back to default SSH config", err)
+		return NewSSH()
+	}
+
+	// Check if server is provided
+	if server != nil {
+		log.Printf("Using server SSH config: %s@%s:%d", server.Username, server.Host, server.Port)
+		return &SSH{
+			PrivateKey: getStringValue(server.SSHPrivateKeyPath),
+			Host:       server.Host,
+			User:       server.Username,
+			Port:       uint(server.Port),
+			Password:   getStringValue(server.SSHPassword),
+		}
+	}
+
+	log.Printf("No active server found, using default SSH config")
+	// Fallback to default config
+	return NewSSH()
+}
+
 func (s *SSH) ConnectWithPassword() (*goph.Client, error) {
 	if s.Password == "" {
 		return nil, fmt.Errorf("password is required for SSH connection")
diff --git a/api/internal/routes.go b/api/internal/routes.go
diff --git a/api/internal/utils/get_user.go b/api/internal/utils/get_user.go

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`"version": "v1",`
`5`	`5`	`"status": "active",`
`6`		`- "release_date": "2025-12-10T22:01:46.6664+05:30",`
	`6`	`+ "release_date": "2025-12-11T14:46:46.935266+05:30",`
`7`	`7`	`"end_of_life": "0001-01-01T00:00:00Z",`
`8`	`8`	`"changes": [`
`9`	`9`	`"Initial API version"`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func (c *FileManagerController) CopyDirectory(f fuego.ContextWithBody[CopyDirect`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- err = c.service.CopyDirectory(request.FromPath, request.ToPath)`
	`26`	`+ err = c.service.CopyDirectory(f.Request().Context(), request.FromPath, request.ToPath)`
`27`	`27`	`if err != nil {`
`28`	`28`	`c.logger.Log(logger.Error, err.Error(), "")`
`29`	`29`	`return nil, fuego.HTTPError{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (c *FileManagerController) CreateDirectory(f fuego.ContextWithBody[CreateDi`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`- err = c.service.CreateDirectory(request.Path)`
	`25`	`+ err = c.service.CreateDirectory(f.Request().Context(), request.Path)`
`26`	`26`	`if err != nil {`
`27`	`27`	`c.logger.Log(logger.Error, err.Error(), "")`
`28`	`28`	`return nil, fuego.HTTPError{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func (c *FileManagerController) DeleteDirectory(f fuego.ContextWithBody[DeleteDi`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- err = c.service.DeleteDirectory(request.Path)`
	`24`	`+ err = c.service.DeleteDirectory(f.Request().Context(), request.Path)`
`25`	`25`	`if err != nil {`
`26`	`26`	`c.logger.Log(logger.Error, err.Error(), "")`
`27`	`27`	`return nil, fuego.HTTPError{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (c *FileManagerController) ListFiles(f fuego.ContextWithBody[ListFilesReque`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- files, err := c.service.ListFiles(path)`
	`27`	`+ files, err := c.service.ListFiles(r.Context(), path)`
`28`	`28`	`if err != nil {`
`29`	`29`	`c.logger.Log(logger.Error, err.Error(), "")`
`30`	`30`	`return nil, fuego.HTTPError{`