From 8fcbcd125f81ed6bf97d7bac6b83e65d6770825a Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Thu, 13 May 2021 21:27:12 +0200
Subject: [PATCH] Fixing authentication issues in publish mode

---
 Kyoo.WebApp        |  2 +-
 Kyoo/Kyoo.csproj   | 27 +++++++++++++++++++++++++--
 Kyoo/settings.json |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Kyoo.WebApp b/Kyoo.WebApp
index a0f8fe4d..22a02671 160000
--- a/Kyoo.WebApp
+++ b/Kyoo.WebApp
@@ -1 +1 @@
-Subproject commit a0f8fe4de48a0f0770646d6052a09c551b6442dd
+Subproject commit 22a02671918201d6d9d4e80a76f01b59b216a82d
diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj
index 77c01a03..22fd6e21 100644
--- a/Kyoo/Kyoo.csproj
+++ b/Kyoo/Kyoo.csproj
@@ -39,12 +39,14 @@
 		<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.14" />
 		<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.5" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-		<ProjectReference Include="../Kyoo.Postgresql/Kyoo.Postgresql.csproj" />
 	</ItemGroup>
 	
 	<ItemGroup>
+		<ProjectReference Include="../Kyoo.Postgresql/Kyoo.Postgresql.csproj">
+<!--			<ExcludeAssets>all</ExcludeAssets>-->
+		</ProjectReference>
 		<ProjectReference Include="../Kyoo.Authentication/Kyoo.Authentication.csproj">
-			<ExcludeAssets>all</ExcludeAssets>
+<!--			<ExcludeAssets>all</ExcludeAssets>-->
 		</ProjectReference>
 	</ItemGroup>
 	
@@ -104,4 +106,25 @@
 			<Visible>false</Visible>
 		</None>
 	</ItemGroup>
+
+
+	<!--TODO remove this once plugins are reworked. This is useful because the authentication plugin is loaded manually and not by the plugin manager-->
+	<PropertyGroup>
+		<LoginRoot>../Kyoo.WebLogin/</LoginRoot>
+	</PropertyGroup>
+	<ItemGroup>
+		<LoginFiles Include="$(LoginRoot)**" Visible="false" />
+	</ItemGroup>
+	<Target Name="Publish login files" AfterTargets="ComputeFilesToPublish">
+		<ItemGroup>
+			<ResolvedFileToPublish Include="@(LoginFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
+				<RelativePath>login/%(LoginFiles.RecursiveDir)%(LoginFiles.Filename)%(LoginFiles.Extension)</RelativePath>
+				<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+				<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			</ResolvedFileToPublish>
+		</ItemGroup>
+	</Target>
+	<Target Name="Prepare static files" AfterTargets="Build" Condition="$(Configuration) == 'Debug'">
+		<Copy SourceFiles="@(LoginFiles)" DestinationFolder="$(OutputPath)/login/%(RecursiveDir)" />
+	</Target>
 </Project>
diff --git a/Kyoo/settings.json b/Kyoo/settings.json
index e8d72e8f..fed2bd58 100644
--- a/Kyoo/settings.json
+++ b/Kyoo/settings.json
@@ -17,7 +17,7 @@
 
   "logging": {
     "logLevel": {
-      "default": "Trace",
+      "default": "Warning",
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information",
       "Microsoft.EntityFrameworkCore": "None",