working state

servers/browsers.go

@@ -7,6 +7,12 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+type FileBrowser struct {
+	Id          string     `json:"Id"`
+	Url         string     `json:"Url"`
+	ConnectedTo ServerInfo `json:"ConnectedTo"`
+}
+
 func (con ServersApi) GetBrowsers(ctx *gin.Context) {
 	fileBrowsers, err := con.InstanceManager.ListFileBrowsers(ctx)
 
@@ -15,7 +21,34 @@ func (con ServersApi) GetBrowsers(ctx *gin.Context) {
 		return
 	}
 
-	ctx.JSON(200, fileBrowsers)
+	fileBrowserInfos := make([]FileBrowserInfo, len(fileBrowsers))
+
+	for i, browser := range fileBrowsers {
+		server, err := con.ServersDbHandler.GetServer(ctx, browser.ServerId)
+		if err != nil {
+			ctx.Error(err)
+			continue
+		}
+
+		serverInfo := ServerInfo{
+			Id: server.Id,
+			Image: ImageInfo{
+				Name:    server.Image.Registry,
+				Version: server.Image.Tag,
+			},
+			OwnerId:        server.Owner,
+			DefaultCommand: server.Command,
+			Nickname:       server.Nickname,
+		}
+
+		fileBrowserInfos[i] = FileBrowserInfo{
+			ConnectedTo: serverInfo,
+			Url:         browser.Url,
+			Id:          browser.Id,
+		}
+	}
+
+	ctx.JSON(200, fileBrowserInfos)
 }
 
 func (con ServersApi) StopBrowser(ctx *gin.Context) {
@@ -40,7 +73,7 @@ func LoadBrowsersGroup(group *gin.RouterGroup, config models.GlobalConfig) {
 		panic(err)
 	}
 
-	instanceManager, err := factories.GetInstanceManager(config.InstanceManager)
+	instanceManager, err := factories.GetInstanceManager(config.InstanceManager, config.Domain)
 	if err != nil {
 		panic(err)
 	}

servers/images.go

@@ -49,7 +49,7 @@ func (con ServersApi) GetImages(ctx *gin.Context) {
 }
 
 func LoadeImagesGroup(group *gin.RouterGroup, config models.GlobalConfig) {
-	instanceManager, err := factories.GetInstanceManager(config.InstanceManager)
+	instanceManager, err := factories.GetInstanceManager(config.InstanceManager, config.Domain)
 	if err != nil {
 		panic(err)
 	}

servers/servers.go

@@ -31,6 +31,7 @@ type ServersApi struct {
 	ServersDbHandler    dbhandler.ServersDbHandler
 	InstanceManager     instancemanager.InstanceManager
 	ServerAuthorization dbhandler.ServersAuthorizationDbHandler
+	config              models.GlobalConfig
 }
 
 type ImageInfo struct {
@@ -513,7 +514,7 @@ func (con ServersApi) SetServerUserPermissions(ctx *gin.Context) {
 }
 
 func LoadGroup(group *gin.RouterGroup, config models.GlobalConfig) {
-	instanceManager, err := factories.GetInstanceManager(config.InstanceManager)
+	instanceManager, err := factories.GetInstanceManager(config.InstanceManager, config.Domain)
 	if err != nil {
 		panic(err)
 	}