Skip to content

fix: portal base URL for Capability.NameLink variable wrong protocol #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SEQUOIIA merged 1 commit into from
Sep 16, 2026
Merged

fix: portal base URL for Capability.NameLink variable wrong protocol #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/SelfService.Tests/Infrastructure/Persistence/TestTemplateRenderingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@ public void RenderTemplate_ExistingCapabilityVariables_StillWork()
Assert.Equal("My Capability - A test capability (5 members)", result);
}

[Theory]
[InlineData("https://build.dfds.cloud")]
[InlineData("https://build.dfds.cloud/")]
[InlineData("build.dfds.cloud")]
public void RenderTemplate_CapabilityNameLink_UsesPortalBaseUrlWithSingleScheme(string portalBaseUrl)
{
var configMock = new Mock<IConfiguration>();
configMock.Setup(c => c["SS_PORTAL_BASE_URL"]).Returns(portalBaseUrl);
var sut = new TemplateRenderingService(configMock.Object);

var capability = A.Capability.WithId("my-capability-abc12").WithName("My Capability").Build();
var context = CreateContext(capability: capability);

var result = sut.RenderTemplate("{{Capability.NameLink}}", context);

Assert.Equal("<a href=\"https://build.dfds.cloud/capabilities/my-capability-abc12\">My Capability</a>", result);
}

[Fact]
public void RenderTemplate_MemberVariables_StillWork()
{
Expand Down
12 changes: 10 additions & 2 deletions src/SelfService/Infrastructure/Persistence/TemplateRenderingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ private sealed record PatternVariable(

public TemplateRenderingService(IConfiguration configuration)
{
_portalBaseUrl =
var portalBaseUrl =
configuration["SS_PORTAL_BASE_URL"]
?? throw new InvalidOperationException("SS_PORTAL_BASE_URL configuration is required but not set.");
_portalBaseUrl = NormalizePortalBaseUrl(portalBaseUrl);
_variables = InitializeVariables();
_byName = _variables.OfType<StaticVariable>().ToDictionary(v => v.Name);
_patterns = _variables.OfType<PatternVariable>().ToArray();
Expand Down Expand Up @@ -118,7 +119,7 @@ private VariableEntry[] InitializeVariables()
return "";
var capId = ctx.Capability.Id.ToString();
var name = ctx.Capability.Name;
return $"<a href=\"https://{_portalBaseUrl}/capabilities/{capId}\">{name}</a>";
return $"<a href=\"{_portalBaseUrl}/capabilities/{capId}\">{name}</a>";
}
),
new StaticVariable(
Expand Down Expand Up @@ -473,6 +474,13 @@ private string ExpandUserCapabilitiesBlocks(string template, TemplateRenderConte
);
}

// Local configuration omits the scheme; production includes it.
private static string NormalizePortalBaseUrl(string value)
{
var trimmed = value.Trim().TrimEnd('/');
return trimmed.Contains("://", StringComparison.Ordinal) ? trimmed : "https://" + trimmed;
}

private string? Resolve(string name, TemplateRenderContext context)
{
if (_byName.TryGetValue(name, out var def))
Expand Down
Loading