feat: Add AppSetting for frontend asset base url and param in cli

.github/actions/app-run-local-env/action.yaml

@@ -121,7 +121,7 @@ runs:
           }
 
           function targetRunArgs(path, image) {
-            const args = ['run', '--mode', 'container', '--detach', '--random-host-port', '--path', path];
+            const args = ['run', '--mode', 'container', '--detach', '--random-host-port', '--dev-frontend', '--path', path];
             if (image) {
               args.push('--image-tag', image, '--pull', '--skip-build');
             }

.github/workflows/app-frontend-cypress.yml

@@ -100,7 +100,7 @@ jobs:
               while (nextTarget < targets.length) {
                 const target = targets[nextTarget++];
                 core.info(`Worker ${workerId}: building ${target.path}`);
-                await exec.exec('studioctl', ['app', 'build', '--path', target.path, '--image-tag', target.image, '--push']);
+                await exec.exec('studioctl', ['app', 'build', '--path', target.path, '--image-tag', target.image, '--push', '--dev-frontend']);
               }
             }
 

infra/runtime/apps-config/base/apps-runtime-common-env.yaml

@@ -11,7 +11,6 @@ data:
   PlatformSettings__ApiWorkflowEngineEndpoint: http://workflow-engine-app.runtime-workflow-engine-app.svc.cluster.local/api/v1/
   GeneralSettings__ExternalAppBaseUrl: https://{org}.apps.{hostName}/{org}/{app}/
   PlatformFrontendSettings__PostalCodesUrl: https://altinncdn.no/postcodes/registry.json
-  PlatformFrontendSettings__AppFrontendCdnBaseUrl: https://altinncdn.no/toolkits/altinn-app-frontend
   PlatformFrontendSettings__AltinnLogoUrl: https://altinncdn.no/img/Altinn-logo-blue.svg
   PlatformFrontendSettings__HelpCircleIllustrationUrl: https://altinncdn.no/img/illustration-help-circle.svg
 ---

infra/runtime/apps-config/base/apps-runtime-common.yaml

@@ -22,7 +22,6 @@ data:
       },
       "PlatformFrontendSettings": {
         "PostalCodesUrl": "https://altinncdn.no/postcodes/registry.json",
-        "AppFrontendCdnBaseUrl": "https://altinncdn.no/toolkits/altinn-app-frontend",
         "AltinnLogoUrl": "https://altinncdn.no/img/Altinn-logo-blue.svg",
         "HelpCircleIllustrationUrl": "https://altinncdn.no/img/illustration-help-circle.svg"
       }

src/App/backend/src/Altinn.App.Api/Controllers/HomeController.cs

@@ -118,18 +118,17 @@ public async Task<IActionResult> Index(
                 return PartialView("Index");
             }
 
-            string? frontendVersionOverride = null;
-            if (_env.IsDevelopment() && HttpContext.Request.Cookies.TryGetValue("frontendVersion", out var cookie))
-            {
-                frontendVersionOverride = cookie.TrimEnd('/');
-            }
+            string? appFrontendAssetBaseUrlOverride =
+                _env.IsDevelopment() && !string.IsNullOrWhiteSpace(_appSettings.AppFrontendAssetBaseUrl)
+                    ? _appSettings.AppFrontendAssetBaseUrl.Trim().TrimEnd('/')
+                    : null;
 
             var appGlobalState = await _bootstrapGlobalService.GetGlobalState(_appId.Org, _appId.App, returnUrl, lang);
             var html = await _indexPageGenerator.Generate(
                 _appId.Org,
                 _appId.App,
                 appGlobalState,
-                frontendVersionOverride
+                appFrontendAssetBaseUrlOverride
             );
             return Content(html, "text/html; charset=utf-8");
         }

src/App/backend/src/Altinn.App.Core/Configuration/AppSettings.cs

@@ -130,6 +130,15 @@ public class AppSettings
     public string DefaultBootstrapUrl { get; set; } =
         "https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css";
 
+    /// <summary>
+    /// Gets or sets the frontend asset URL used by the generated controller index page.
+    /// </summary>
+    /// <remarks>
+    /// This setting is only honored when the host runs in the Development environment. PDF rendering runs in a
+    /// container, so avoid loopback URLs such as <c>localhost</c> because they resolve inside the container.
+    /// </remarks>
+    public string? AppFrontendAssetBaseUrl { get; set; }
+
     /// <summary>
     /// Open Id Connect Well known endpoint
     /// </summary>

src/App/backend/src/Altinn.App.Core/Configuration/PlatformFrontendSettings.cs

@@ -11,11 +11,6 @@ internal class PlatformFrontendSettings
     /// </summary>
     public Uri PostalCodesUrl { get; set; } = new("https://altinncdn.no/postcodes/registry.json");
 
-    /// <summary>
-    /// Base URL for the app frontend CDN.
-    /// </summary>
-    public Uri AppFrontendCdnBaseUrl { get; set; } = new("https://altinncdn.no/toolkits/altinn-app-frontend");
-
     /// <summary>
     /// URL for the Altinn logo SVG.
     /// </summary>

src/App/backend/src/Altinn.App.Core/Infrastructure/Clients/Pdf/PdfGeneratorClient.cs

@@ -6,8 +6,6 @@
 using Altinn.App.Core.Internal.Auth;
 using Altinn.App.Core.Internal.Pdf;
 using Altinn.App.Core.Models.Pdf;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using OpenTelemetry.Context.Propagation;
@@ -32,8 +30,6 @@ public class PdfGeneratorClient : IPdfGeneratorClient
     private readonly PdfGeneratorSettings _pdfGeneratorSettings;
     private readonly PlatformSettings _platformSettings;
     private readonly IUserTokenProvider _userTokenProvider;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly IHostEnvironment _hostEnvironment;
     private readonly Telemetry? _telemetry;
 
     /// <summary>
@@ -46,17 +42,13 @@ public class PdfGeneratorClient : IPdfGeneratorClient
     /// </param>
     /// <param name="platformSettings">Links to platform services</param>
     /// <param name="userTokenProvider">A service able to identify the JWT for currently authenticated user.</param>
-    /// <param name="httpContextAccessor">http context</param>
-    /// <param name="hostEnvironment">The host environment.</param>
     /// <param name="telemetry">Telemetry service</param>
     public PdfGeneratorClient(
         ILogger<PdfGeneratorClient> logger,
         HttpClient httpClient,
         IOptions<PdfGeneratorSettings> pdfGeneratorSettings,
         IOptions<PlatformSettings> platformSettings,
         IUserTokenProvider userTokenProvider,
-        IHttpContextAccessor httpContextAccessor,
-        IHostEnvironment hostEnvironment,
         Telemetry? telemetry = null
     )
     {
@@ -65,8 +57,6 @@ public PdfGeneratorClient(
         _userTokenProvider = userTokenProvider;
         _pdfGeneratorSettings = pdfGeneratorSettings.Value;
         _platformSettings = platformSettings.Value;
-        _httpContextAccessor = httpContextAccessor;
-        _hostEnvironment = hostEnvironment;
         _telemetry = telemetry;
     }
 
@@ -125,25 +115,6 @@ public async Task<Stream> GeneratePdf(Uri uri, string? footerContent, Cancellati
             new PdfGeneratorCookieOptions { Value = _userTokenProvider.GetUserToken(), Domain = uri.Host }
         );
 
-        if (
-            _hostEnvironment.IsDevelopment()
-            && _httpContextAccessor.HttpContext?.Request.Cookies.TryGetValue("frontendVersion", out var frontendVersion)
-                == true
-            && !string.IsNullOrEmpty(frontendVersion)
-        )
-        {
-            frontendVersion = frontendVersion.Replace("localhost", "host.containers.internal");
-            generatorRequest.Cookies.Insert(
-                0,
-                new PdfGeneratorCookieOptions
-                {
-                    Name = "frontendVersion",
-                    Domain = uri.Host,
-                    Value = frontendVersion,
-                }
-            );
-        }
-
         string requestContent = JsonSerializer.Serialize(generatorRequest, _jsonSerializerOptions);
         using StringContent stringContent = new(requestContent, Encoding.UTF8, "application/json");
         var httpResponseMessage = await _httpClient.PostAsync(_platformSettings.ApiPdf2Endpoint, stringContent, ct);

src/App/backend/src/Altinn.App.Core/Internal/App/IIndexPageGenerator.cs

@@ -19,12 +19,12 @@ internal interface IIndexPageGenerator
     /// <param name="org">The organization identifier.</param>
     /// <param name="app">The application identifier.</param>
     /// <param name="appGlobalState">The bootstrap global state for the app.</param>
-    /// <param name="frontendVersionOverride">Optional frontend version URL override (only used in development).</param>
+    /// <param name="appFrontendAssetBaseUrlOverride">Optional app frontend asset base URL override (only used in development).</param>
     /// <returns>The generated HTML content.</returns>
     Task<string> Generate(
         string org,
         string app,
         BootstrapGlobalResponse appGlobalState,
-        string? frontendVersionOverride = null
+        string? appFrontendAssetBaseUrlOverride = null
     );
 }

src/App/backend/src/Altinn.App.Core/Internal/App/IndexPageGenerator.cs

@@ -39,10 +39,35 @@ public async Task<string> Generate(
         string org,
         string app,
         BootstrapGlobalResponse appGlobalState,
-        string? frontendVersionOverride = null
+        string? appFrontendAssetBaseUrl = null
     )
     {
-        var frontendUrl = frontendVersionOverride ?? "https://altinncdn.no/toolkits/altinn-app-frontend/4";
+        if (appFrontendAssetBaseUrl is null)
+        {
+            var htmlContentError = $$"""
+                <!DOCTYPE html>
+                <html lang="no">
+                <head>
+                 <meta charset="utf-8">
+                 <meta http-equiv="X-UA-Compatible" content="IE=edge">
+                 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+                 <title>{{org}} - {{app}}</title>
+                 <link rel="icon" href="https://altinncdn.no/favicon.ico">
+                </head>
+                <body>
+                <h1>Not implemented yet</h1>
+                  <p>Sorry, loading our built-in frontend is not yet supported. Please build and host frontend from the monorepo code yourself.</p>
+                  <p>To serve a production-level/faster build with no hot-reloads:</p>
+                  <pre>cd src/App/frontend; yarn build; yarn serve 8080</pre>
+                  <p>To serve a slightly slower build with hot-reloads tailored for development:</p>
+                  <pre>cd src/App/frontend; yarn start</pre>
+                  <p>Then make sure to restart this app with:</p>
+                  <pre>studioctl run --dev-frontend</pre>
+                </body>
+                </html>
+                """;
+            return htmlContentError;
+        }
 
         var featureToggles = await _frontendFeatures.GetFrontendFeatures();
         var featureTogglesJson = JsonSerializer.Serialize(featureToggles, _jsonSerializerOptions);
@@ -71,7 +96,7 @@ public async Task<string> Generate(
               <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
               <title>{{org}} - {{app}}</title>
               <link rel="icon" href="https://altinncdn.no/favicon.ico">
-              <link rel="stylesheet" type="text/css" href="{{frontendUrl}}/altinn-app-frontend.css">
+              <link rel="stylesheet" type="text/css" href="{{appFrontendAssetBaseUrl}}/altinn-app-frontend.css">
             {{externalStylesheets}}{{customCssLinks}}</head>
             <body>
               <div id="root"></div>
@@ -81,7 +106,7 @@ public async Task<string> Generate(
                 window.featureToggles = {{featureTogglesJson}};
                 window.altinnAppGlobalData = {{globalDataJson}};
               </script>
-              <script src="{{frontendUrl}}/altinn-app-frontend.js" crossorigin></script>
+              <script src="{{appFrontendAssetBaseUrl}}/altinn-app-frontend.js" crossorigin></script>
             {{externalScripts}}{{customJsScripts}}</body>
             </html>
             """;

src/App/backend/src/Altinn.App.Core/Internal/Auth/AuthenticationTokenResolver.cs

@@ -75,7 +75,7 @@ CancellationToken cancellationToken
         ApplicationMetadata appMetadata = await _appMetadata.GetApplicationMetadata();
         string formattedScopes = MaskinportenClient.GetFormattedScopes(request.Scopes);
         string url =
-            $"{_localtestBaseUrl}/Home/GetTestOrgToken?org={appMetadata.Org}&orgNumber=991825827&authenticationLevel=3&scopes={Uri.EscapeDataString(formattedScopes)}";
+            $"{_localtestBaseUrl}/Home/GetTestOrgToken?org={appMetadata.Org}&orgNumber=405003309&authenticationLevel=3&scopes={Uri.EscapeDataString(formattedScopes)}";
 
         using var client = _httpClientFactory.CreateClient();
         var response = await client.GetAsync(url, cancellationToken);

src/App/backend/test/Altinn.App.Api.Tests/Controllers/HomeControllerTest_AppFrontendAssetBaseUrl.cs

@@ -0,0 +1,81 @@
+using System.Net;
+using Altinn.App.Core.Models;
+using Altinn.Platform.Storage.Interface.Models;
+using App.IntegrationTests.Mocks.Services;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Hosting;
+using Moq;
+using Xunit.Abstractions;
+
+namespace Altinn.App.Api.Tests.Controllers;
+
+public class HomeControllerTest_AppFrontendAssetBaseUrl : ApiTestBase, IClassFixture<WebApplicationFactory<Program>>
+{
+    private const string Org = "tdd";
+    private const string App = "contributer-restriction";
+
+    public HomeControllerTest_AppFrontendAssetBaseUrl(
+        WebApplicationFactory<Program> factory,
+        ITestOutputHelper outputHelper
+    )
+        : base(factory, outputHelper)
+    {
+        OverrideEnvironment = Environments.Development;
+        SendAsync = _ =>
+            Task.FromResult(
+                new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent("""{"orgs":{}}""") }
+            );
+    }
+
+    [Fact]
+    public async Task Index_UsesAppFrontendAssetBaseUrlAppSetting()
+    {
+        OverrideAppSetting("AppSettings:AppFrontendAssetBaseUrl", "/configured/frontend/");
+
+        using var client = GetRootedClient(Org, App, configureServices: ConfigureStatelessAnonymousApp);
+        using var response = await client.GetAsync($"{Org}/{App}/");
+        var html = await response.Content.ReadAsStringAsync();
+
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Contains("href=\"/configured/frontend/altinn-app-frontend.css\"", html);
+        Assert.Contains("src=\"/configured/frontend/altinn-app-frontend.js\"", html);
+    }
+
+    [Fact]
+    public async Task Index_UsesCdnAppFrontendAssetsByDefault()
+    {
+        using var client = GetRootedClient(Org, App, configureServices: ConfigureStatelessAnonymousApp);
+        using var response = await client.GetAsync($"{Org}/{App}/");
+        var html = await response.Content.ReadAsStringAsync();
+
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Contains("href=\"https://altinncdn.no/toolkits/altinn-app-frontend/4/altinn-app-frontend.css\"", html);
+        Assert.Contains("src=\"https://altinncdn.no/toolkits/altinn-app-frontend/4/altinn-app-frontend.js\"", html);
+    }
+
+    private static void ConfigureStatelessAnonymousApp(IServiceCollection services)
+    {
+        var webHostEnvironmentMock = new Mock<IWebHostEnvironment>();
+        webHostEnvironmentMock.SetupGet(e => e.EnvironmentName).Returns(Environments.Development);
+        webHostEnvironmentMock.SetupGet(e => e.ApplicationName).Returns("Altinn.App.Api");
+        webHostEnvironmentMock.SetupGet(e => e.ContentRootPath).Returns(Directory.GetCurrentDirectory());
+        webHostEnvironmentMock
+            .SetupGet(e => e.WebRootPath)
+            .Returns(Path.Join(Directory.GetCurrentDirectory(), "wwwroot"));
+        webHostEnvironmentMock.SetupGet(e => e.ContentRootFileProvider).Returns(new NullFileProvider());
+        webHostEnvironmentMock.SetupGet(e => e.WebRootFileProvider).Returns(new NullFileProvider());
+        services.Replace(ServiceDescriptor.Singleton(webHostEnvironmentMock.Object));
+
+        services.AddSingleton(
+            new AppMetadataMutationHook(appMetadata =>
+            {
+                appMetadata.OnEntry = new OnEntry { Show = "Task_1" };
+                appMetadata.DataTypes.Find(d => d.Id == "default")!.AppLogic!.AllowAnonymousOnStateless = true;
+            })
+        );
+    }
+}