diff --git a/LCU.WebApps.Collections.RepoClient/Dockerfile b/LCU.WebApps.Collections.RepoClient/Dockerfile index cce3f39..e1829d5 100644 --- a/LCU.WebApps.Collections.RepoClient/Dockerfile +++ b/LCU.WebApps.Collections.RepoClient/Dockerfile @@ -5,6 +5,7 @@ WORKDIR /app COPY package.json package-lock.json ./ RUN npm install -g npm@9 +RUN npm pkg delete dependencies.node ARG PAT=vvqu3q252m5kqwptu4tavha4ghk4svhmwsahb2kvlu22ogiegt6q RUN TOKEN="$(printf "%s" "${PAT}" | base64 | tr -d '\n')" && \ @@ -17,7 +18,7 @@ RUN TOKEN="$(printf "%s" "${PAT}" | base64 | tr -d '\n')" && \ printf "//landmarkcu.pkgs.visualstudio.com/_packaging/LCU-Internal/npm/:_password=%s\n" "${TOKEN}" >> .npmrc && \ printf "//landmarkcu.pkgs.visualstudio.com/_packaging/LCU-Internal/npm/:email=build@landmarkcu.com\n" >> .npmrc -RUN npm ci --unsafe-perm +RUN npm install --unsafe-perm COPY . ./ diff --git a/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/Startup.cs b/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/Startup.cs index b687b89..cd72350 100644 --- a/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/Startup.cs +++ b/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/Startup.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Identity.Web; using Microsoft.Identity.Web.UI; +using Microsoft.AspNetCore.HttpOverrides; using Blazored.Toast; using LCU.Library.Internal.Configuration; using LCU.Library.Internal.LcuHttpClient; @@ -32,8 +33,8 @@ namespace ReserveManagementSystemUI // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { - services.AddAzureAdGroupPolicyServicesWithToken(Configuration.GetSection("AzureAd"), - Configuration.GetSection("Security")); + services.AddAzureAdGroupPolicyServices(Configuration.GetSection("AzureAd"), + Configuration.GetSection("Security")); var appConfiguration = new AppConfiguration(); Configuration.GetSection("Primary").Bind(appConfiguration); @@ -92,6 +93,10 @@ namespace ReserveManagementSystemUI app.UseHttpsRedirection(); app.UseStaticFiles(); + app.UseForwardedHeaders(new ForwardedHeadersOptions + { + ForwardedHeaders = ForwardedHeaders.XForwardedProto + }); app.UseRouting(); app.UseAuthentication(); @@ -100,7 +105,6 @@ namespace ReserveManagementSystemUI app.UseEndpoints(endpoints => { endpoints.MapControllers(); - endpoints.MapRazorPages(); endpoints.MapBlazorHub(); endpoints.MapFallbackToPage("/_Host"); }); diff --git a/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/appsettings.json b/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/appsettings.json index 45a0f38..ec0cd21 100644 --- a/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/appsettings.json +++ b/LCU.WebApps.Indirect.ReserveManagementSystem/WebApp/ReserveManagementSystemUI/appsettings.json @@ -5,7 +5,8 @@ "TenantId": "00000000-0000-0000-0000-000000000000", "ClientId": "00000000-0000-0000-0000-000000000000", "CallbackPath": "/signin-oidc", - "ClientSecret": "VALUE-IN-KEYVAULT" + "ClientSecret": "VALUE-IN-KEYVAULT", + "AuthenticationUrl": "https://login.microsoftonline.com/landmarkcu.onmicrosoft.com/oauth2/v2.0/token" }, "Primary": { "AppName": "Reserve Management System",