Fixed embedded resources (#43)

SwissLife-OSS · Oct 24, 2022 · 231f9ef · 231f9ef
1 parent 6154a64
commit 231f9ef
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/src/Backend/src/Authoring.Host/Authoring.Host.csproj b/src/Backend/src/Authoring.Host/Authoring.Host.csproj
@@ -4,9 +4,11 @@
     <AssemblyName>Confix.Authoring.Host</AssemblyName>
     <RootNamespace>Confix.Authoring</RootNamespace>
     <IsPackable>false</IsPackable>
+    <UserSecretsId>3f64ff45-7830-4fc6-b77d-eee879a369d9</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Authoring.UI\Authoring.UI.csproj" />
     <ProjectReference Include="..\Authoring\Authoring.csproj" />
     <ProjectReference Include="..\Authoring.Store.Mongo\Authoring.Store.Mongo.csproj" />
     <ProjectReference Include="..\CryptoProviders.AzureKeyVault\CryptoProviders.AzureKeyVault.csproj" />

diff --git a/src/Backend/src/Authoring.Host/Program.cs b/src/Backend/src/Authoring.Host/Program.cs
@@ -1,8 +1,10 @@
 using Confix.Authoring;
+using Confix.Authoring.UI;
 using Confix.CryptoProviders;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Configuration.AddJsonFile("appsettings.json");
+builder.Configuration.AddUserSecrets("3f64ff45-7830-4fc6-b77d-eee879a369d9");
 
 builder.Services
     .AddConfixAuthoringServer()
@@ -31,5 +33,6 @@
 }
 
 app.UseAuthoringServer();
+app.UseConfixUi();
 
 app.Run();
diff --git a/src/Backend/src/Authoring.Host/appsettings.json b/src/Backend/src/Authoring.Host/appsettings.json
@@ -16,8 +16,8 @@
     },
     "Authoring": {
       "OpenIdConnectOptions": {
-        "Authority": "https://id.a.portals.swisslife.ch",
-        "ClientId": "6bf6666ceb924c059d5dbda214bf0cb9",
+        "Authority": "",
+        "ClientId": "",
         "ClientSecret": "",
         "ResponseMode": "query",
         "ResponseType": "code",

diff --git a/src/Backend/src/Authoring.UI/Authoring.UI.csproj b/src/Backend/src/Authoring.UI/Authoring.UI.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Backend/src/Common/Settings.cs b/src/Backend/src/Common/Settings.cs
@@ -1,4 +1,5 @@
 // ReSharper disable file MemberHidesStaticFromOuterClass
+
 namespace Confix.Common;
 
 public static class Settings
@@ -28,7 +29,7 @@ public static class Seed
 
             public static class Authentication
             {
-                public const string Section = $"{Confix.Section}:{nameof(Authentication)}";
+                public const string Section = $"{Authoring.Section}:{nameof(Authentication)}";
 
                 public static class OpenIdConnect
                 {

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -26,6 +26,7 @@
     <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.10" />
     <PackageVersion Include="MongoDB.Extensions.Context" Version="1.2.0" />
     <PackageVersion Include="MongoDB.Extensions.Transactions" Version="1.2.0" />
     <PackageVersion Include="StrawberryShake.CodeGeneration.CSharp.Analyzers" Version="12.15.0" />
@@ -56,4 +57,4 @@
     </PackageVersion>
     <PackageVersion Include="Snapshooter.Xunit" Version="0.7.1" />
   </ItemGroup>
-</Project>
+</Project>