Subdomain for accessmanagement app

.env.template

@@ -17,3 +17,4 @@
 ## add it here
 
 #TEST_DOMAIN=local.altinn.cloud
+#AMUI_TEST_DOMAIN=am.ui.local.altinn.cloud

docker-compose.yml

@@ -17,6 +17,7 @@ services:
       - NGINX_HOST=localhost
       - NGINX_PORT=80
       - TEST_DOMAIN=${TEST_DOMAIN:-local.altinn.cloud}
+      - AMUI_TEST_DOMAIN=${AMUI_TEST_DOMAIN:-am.ui.local.altinn.cloud}
       - ALTINN3LOCAL_PORT=${ALTINN3LOCAL_PORT:-80}
       - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/
       - NGINX_ENVSUBST_TEMPLATE_SUFFIX=.conf

loadbalancer/templates/nginx.conf.conf

@@ -53,8 +53,8 @@ http {
         server host.docker.internal:5300;
     }
 
-    upstream accessmanagementcomp {
-        server host.docker.internal:5117;
+    upstream accessmanagementbff {
+        server host.docker.internal:5110;
     }
 
     server {
@@ -90,11 +90,6 @@ http {
 			  error_page 502 /502Receipt.html;
 		}
 
-    location /accessmanagement/ {
-			  proxy_pass		      http://accessmanagementcomp/accessmanagement/;
-        error_page 502 /502Accessmanagement.html;
-		}
-
     location /storage/ {
 			  proxy_pass		      http://localtest/storage/;
 		}
@@ -123,4 +118,34 @@ http {
     }
 
 	}
+
+  server {
+      listen 80;
+      server_name ${AMUI_TEST_DOMAIN};
+
+      proxy_redirect      off;
+      proxy_set_header    Host $host;
+      proxy_set_header    X-Real-IP $remote_addr;
+      proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
+
+    error_page 502 /502Accessmanagement.html;
+
+		location = / {
+        proxy_pass          http://accessmanagementbff/accessmanagment/;
+		}
+
+    location / {
+        #Support using Local js, when a cookie value is set
+        sub_filter_once off;
+        sub_filter 'https://altinncdn.no/toolkits/altinn-app-frontend/3/' $LOCAL_SUB_FILTER;
+        proxy_pass          http://accessmanagementbff/;
+        error_page 502 /502Accessmanagement.html;
+        proxy_cookie_domain altinn3local.no local.altinn.cloud;
+		}
+
+    location /502Accessmanagement.html {
+      root /www;
+    }
+
+	}
 }

src/Configuration/GeneralSettings.cs

@@ -105,6 +105,11 @@ public string GetBaseUrl
             }
         }
 
+        /// <summary>
+        /// Gets or sets the hostname for accessmanagement UI
+        /// </summary>
+        public string AMHostname { get; set; }
+
         /// <summary>
         /// Get value from environment variable with key equals "GeneralSettings__" + propertyName or directly from
         /// the property if the environment variable is missing.

src/Controllers/HomeController.cs

@@ -155,7 +155,7 @@ public async Task<ActionResult> LogInTestUser(StartAppModel startAppModel)
 
             if (startAppModel.AppPathSelection?.Equals("accessmanagement") == true)
             {
-                return Redirect($"/accessmanagement/ui/given-api-delegations/overview");
+                return Redirect($"http://{_generalSettings.AMHostname}/accessmanagement/ui/offered-api-delegations/overview");
             }
 
             Application app = await _localApp.GetApplicationMetadata(startAppModel.AppPathSelection);
@@ -410,7 +410,7 @@ private List<SelectListItem> GetAuthenticationLevels(int defaultAuthLevel)
         }
 
         private async Task<List<SelectListItem>> GetAppsList()
-        {
+        {           
             var applications = await _localApp.GetApplications();
             return applications.Select((kv) => GetSelectItem(kv.Value, kv.Key)).ToList();
         }

src/Services/LocalApp/Implementation/LocalAppFile.cs

@@ -126,7 +126,7 @@ private string GetAppPath(string appId)
             try
             {
                 HttpClient client = new HttpClient();
-                client.BaseAddress = new Uri("http://localhost:5117/");
+                client.BaseAddress = new Uri("http://localhost:5110/");
                 HttpResponseMessage respnse = await client.GetAsync("swagger/index.html");
                 if (respnse.StatusCode.Equals(HttpStatusCode.OK))
                 {

src/appsettings.json

@@ -11,7 +11,8 @@
     "PlatformEndpoint": "http://localhost:5040/",
     "ClaimsIdentity": "UserLogin",
     "JwtCookieValidityTime": "960",
-    "AltinnPartyCookieName": "AltinnPartyId"
+    "AltinnPartyCookieName": "AltinnPartyId",
+    "AMHostName": "am.ui.local.altinn.cloud"
   },
   "CertificateSettings": {
     "CertificatePwd": "qwer1234",