Setup support for secrets (#72)

* Make all browsers use BrowserData folder

* Increment version

.github/workflows/cd.yaml

@@ -9,6 +9,9 @@ on:
   push:
     branches:
       - master
+    paths:
+      - "Daybreak/**"
+      - "Daybreak.Installer/**"
       
 jobs:
 
@@ -24,7 +27,7 @@ jobs:
       Configuration: Release
       Solution_Path: Daybreak.sln
       Test_Project_Path: Daybreak.Tests\Daybreak.Tests.csproj
-      Wpf_Project_Path: Daybreak\Daybreal.csproj
+      Wpf_Project_Path: Daybreak\Daybreak.csproj
       Actions_Allow_Unsecure_Commands: true
 
     steps:
@@ -57,6 +60,10 @@ jobs:
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.1
 
+    - name: Setup project secrets
+      run: |
+        #dotnet user-secrets --project $env:Wpf_ProjectPath set secretName "${{ secrets.secretName }}"
+
     - name:  Restore project
       run: msbuild $env:Solution_Path /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=$env:RuntimeIdentifier
       env:

Daybreak/Configuration/SecretKeys.cs

@@ -0,0 +1,9 @@
+namespace Daybreak.Configuration;
+
+public class SecretKeys
+{
+    public string Key { get; private set; }
+    private SecretKeys()
+    {
+    }
+}

Daybreak/Configuration/SecretManager.cs

@@ -0,0 +1,39 @@
+using Newtonsoft.Json.Linq;
+using System.Extensions;
+using System.Linq;
+using System.Reflection;
+
+namespace Daybreak.Configuration;
+
+public static class SecretManager
+{
+    private static JObject SecretsHolder;
+
+    public static string GetSecret(SecretKeys secretKey)
+    {
+        if (SecretsHolder is null)
+        {
+            LoadSecrets();
+        }
+
+        return SecretsHolder.Value<string>(secretKey.Key);
+    }
+
+    private static void LoadSecrets()
+    {
+        var serializedSecrets = Assembly.GetExecutingAssembly().GetManifestResourceStream("Daybreak.secrets.json").ReadAllBytes().GetString();
+        serializedSecrets = TrimUnwantedCharacters(serializedSecrets);
+        SecretsHolder = JObject.Parse(serializedSecrets);
+    }
+
+    private static string TrimUnwantedCharacters(string s)
+    {
+        return new string(s.Where(c =>
+            char.IsWhiteSpace(c) ||
+            char.IsLetterOrDigit(c) ||
+            char.IsSymbol(c) ||
+            char.IsSeparator(c) ||
+            char.IsPunctuation(c))
+            .ToArray());
+    }
+}

Daybreak/Daybreak.csproj

@@ -10,17 +10,33 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.5.2</Version>
+    <Version>0.9.5.4</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
 
+  <Target Name="AddUserSecrets" BeforeTargets="PrepareForBuild" Condition=" '$(Configuration)' == 'Debug' And '$(UserSecretsId)' != '' ">
+    <PropertyGroup>
+      <UserSecretsFilePath Condition=" '$(OS)' == 'Windows_NT' ">
+		$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))\AppData\Roaming\Microsoft\UserSecrets\$(UserSecretsId)\secrets.json
+	  </UserSecretsFilePath>
+	  <UserSecretsFilePath Condition=" '$(OS)' == 'Unix' ">
+		$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))/.microsoft/usersecrets/$(UserSecretsId)/secrets.json
+	  </UserSecretsFilePath>
+    </PropertyGroup>
+    <ItemGroup>
+      <EmbeddedResource Include="$(UserSecretsFilePath)" Condition="Exists($(UserSecretsFilePath))" />
+    </ItemGroup>
+  </Target>
+	
   <ItemGroup>
     <PackageReference Include="LiteDB" Version="5.0.12" />
     <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1293.44" />

Daybreak/Launch/MainWindow.xaml

@@ -103,10 +103,13 @@
         <Grid x:Name="Container" Grid.Row="1">
         </Grid>
         <wcl:Border OnResize="Border_OnResize" Grid.RowSpan="2" Active="True"></wcl:Border>
-        <webview:WebView2 x:Name="BackgroundWebView"
+        <controls:ChromiumBrowserWrapper x:Name="BackgroundWebView"
                                          VerticalAlignment="Center"
                                          HorizontalAlignment="Center"
-                                         Visibility="Collapsed"
-                                         Grid.Row="1"></webview:WebView2>
+                                         Visibility="Visible"
+                                         ControlsEnabled="False"
+                                         CanNavigate="False"
+                                         CanDownloadBuild="False"
+                                         Grid.Row="1"></controls:ChromiumBrowserWrapper>
     </Grid>
 </Window>

Daybreak/Services/IconRetrieve/IIconBrowser.cs

@@ -1,13 +1,12 @@
 using Daybreak.Controls;
 using Daybreak.Models;
-using Microsoft.Web.WebView2.Wpf;
 using System.Threading;
 
 namespace Daybreak.Services.IconRetrieve
 {
     public interface IIconBrowser
     {
-        void InitializeWebView(WebView2 webView2, CancellationToken cancellationToken);
+        void InitializeWebView(ChromiumBrowserWrapper webView2, CancellationToken cancellationToken);
         /// <summary>
         /// Queue an icon request. The browser will attempt to download the icon. Monitor the <see cref="IconRequest.Finished"/> to be notified when the request has been served.
         /// </summary>

Daybreak/Services/IconRetrieve/IIconDownloader.cs

@@ -1,13 +1,12 @@
 using Daybreak.Controls;
 using Daybreak.Models.Progress;
-using Microsoft.Web.WebView2.Wpf;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.IconRetrieve
 {
     public interface IIconDownloader
     {
-        void SetBrowser(WebView2 chromiumBrowserWrapper);
+        void SetBrowser(ChromiumBrowserWrapper chromiumBrowserWrapper);
 
         bool DownloadComplete { get; }
         Task<IconDownloadStatus> StartIconDownload();

Daybreak/Services/IconRetrieve/IconBrowser.cs

@@ -1,4 +1,5 @@
-using Daybreak.Controls;
+using Daybreak.Configuration;
+using Daybreak.Controls;
 using Daybreak.Models;
 using Daybreak.Models.Builds;
 using Daybreak.Utils;
@@ -8,6 +9,7 @@ using Microsoft.Web.WebView2.Wpf;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
+using System.Configuration;
 using System.Core.Extensions;
 using System.Extensions;
 using System.IO;
@@ -30,17 +32,24 @@ namespace Daybreak.Services.IconRetrieve
         private const string IconsLocation = $"{IconsDirectoryName}/{NamePlaceholder}.jpg";
 
         private readonly ConcurrentQueue<IconRequest> iconRequests = new();
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
+        private readonly ILogger<ChromiumBrowserWrapper> browserLogger;
         private readonly ILogger<IconBrowser> logger;
-        private WebView2 browserWrapper;
+
+        private ChromiumBrowserWrapper browserWrapper;
         private CancellationToken cancellationToken;
 
         public IconBrowser(
+            ILiveOptions<ApplicationConfiguration> liveOptions,
+            ILogger<ChromiumBrowserWrapper> browserLogger,
             ILogger<IconBrowser> logger)
         {
+            this.liveOptions = liveOptions.ThrowIfNull();
+            this.browserLogger = browserLogger.ThrowIfNull();
             this.logger = logger.ThrowIfNull();
         }
 
-        public void InitializeWebView(WebView2 webView2, CancellationToken cancellationToken)
+        public void InitializeWebView(ChromiumBrowserWrapper webView2, CancellationToken cancellationToken)
         {
             this.browserWrapper = webView2.ThrowIfNull();
             this.cancellationToken = cancellationToken;
@@ -91,7 +100,7 @@ namespace Daybreak.Services.IconRetrieve
 
             try
             {
-                await this.browserWrapper.EnsureCoreWebView2Async();
+                await this.browserWrapper.InitializeBrowser(this.liveOptions, null, this.browserLogger);
             }
             catch(Exception e)
             {
@@ -104,7 +113,7 @@ namespace Daybreak.Services.IconRetrieve
             var skillIconUrl = $"{BaseUrl}/{QueryUrl.Replace(NamePlaceholder, curedSkillName)}";
             logger.LogInformation($"Looking for icon at {skillIconUrl}");
 
-            this.browserWrapper.CoreWebView2.Navigate(skillIconUrl);
+            this.browserWrapper.Address = skillIconUrl;
 
             for (var i = 0; i < 5; i++)
             {
@@ -116,7 +125,7 @@ namespace Daybreak.Services.IconRetrieve
                 logger.LogInformation("Executing extraction script");
                 var responseTask = await Application.Current.Dispatcher.InvokeAsync(async () =>
                 {
-                    return await this.browserWrapper.ExecuteScriptAsync(Scripts.GetHrefFromSkillPage);
+                    return await this.browserWrapper.WebBrowser.ExecuteScriptAsync(Scripts.GetHrefFromSkillPage);
                 });
                 var response = await responseTask;
                 logger.LogInformation("Parsing response");

Daybreak/Services/IconRetrieve/IconDownloader.cs

@@ -28,7 +28,7 @@ namespace Daybreak.Services.IconRetrieve
         private readonly ILogger<IconDownloader> logger;
         private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly ILogger<ChromiumBrowserWrapper> browserLogger;
-        private WebView2 browserWrapper;
+        private ChromiumBrowserWrapper browserWrapper;
         private CancellationTokenSource cancellationTokenSource;
         private IconDownloadStatus iconDownloadStatus;
 
@@ -52,7 +52,7 @@ namespace Daybreak.Services.IconRetrieve
             this.HookIntoConfigurationChanges();
         }
 
-        public void SetBrowser(WebView2 chromiumBrowserWrapper)
+        public void SetBrowser(ChromiumBrowserWrapper chromiumBrowserWrapper)
         {
             if (this.browserWrapper is not null)
             {
@@ -179,7 +179,7 @@ namespace Daybreak.Services.IconRetrieve
                 Application.Current.Dispatcher.Invoke(() =>
                 {
                     this.browserWrapper.IsEnabled = false;
-                    this.browserWrapper.Dispose();
+                    this.browserWrapper.WebBrowser.Dispose();
                 });
                 this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Finished;
                 this.DownloadComplete = true;