From fb5b0b59f85cb900cf173abb93ea2c2af6376103 Mon Sep 17 00:00:00 2001
From: Peter Grlica <peter.grlica@gmail.com>
Date: Wed, 25 May 2022 08:45:28 +0200
Subject: [PATCH] Fixed federation uri node generation

---
 app/boot_levels.go            | 1 +
 federation/service/node.go    | 5 ++---
 federation/service/service.go | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/boot_levels.go b/app/boot_levels.go
index bf73ecbde..701e7d355 100644
--- a/app/boot_levels.go
+++ b/app/boot_levels.go
@@ -517,6 +517,7 @@ func (app *CortezaApp) InitServices(ctx context.Context) (err error) {
 		err = fedService.Initialize(ctx, app.Log, app.Store, fedService.Config{
 			ActionLog:  app.Opt.ActionLog,
 			Federation: app.Opt.Federation,
+			Server:     app.Opt.HTTPServer,
 		})
 
 		if err != nil {
diff --git a/federation/service/node.go b/federation/service/node.go
index 5a340e62d..950392945 100644
--- a/federation/service/node.go
+++ b/federation/service/node.go
@@ -58,7 +58,7 @@ type (
 	}
 )
 
-func Node(s store.Storer, u service.UserService, al actionlog.Recorder, th tokenIssuer, options options.FederationOpt, ac nodeAccessController) *node {
+func Node(s store.Storer, u service.UserService, al actionlog.Recorder, th tokenIssuer, options options.FederationOpt, sopt options.HttpServerOpt, ac nodeAccessController) *node {
 	return &node{
 		store:       s,
 		sysUser:     u,
@@ -68,8 +68,7 @@ func Node(s store.Storer, u service.UserService, al actionlog.Recorder, th token
 		name:        options.Label,
 		host:        options.Host,
 
-		// @todo use HTTP_API_BASE_URL (HttpServerOpt.ApiBaseUrl) to prefix URI path
-		baseURL: "/federation",
+		baseURL: fmt.Sprintf("%s/federation", strings.TrimRight(sopt.ApiBaseUrl, "/")),
 
 		handshaker: HttpHandshake(http.DefaultClient),
 	}
diff --git a/federation/service/service.go b/federation/service/service.go
index 3470c614d..b701749e5 100644
--- a/federation/service/service.go
+++ b/federation/service/service.go
@@ -24,6 +24,7 @@ type (
 		ActionLog  options.ActionLogOpt
 		Storage    options.ObjectStoreOpt
 		Federation options.FederationOpt
+		Server     options.HttpServerOpt
 	}
 )
 
@@ -99,6 +100,7 @@ func Initialize(_ context.Context, log *zap.Logger, s store.Storer, c Config) (e
 			)
 		},
 		c.Federation,
+		c.Server,
 		DefaultAccessControl,
 	)
 	DefaultNodeSync = NodeSync()