Popup, theme, optimized search in popup, MD updates, fast dialog animation enhancement, added interprocess WinApi communication

SinglePass.Language/Properties/Resources.resx

@@ -325,4 +325,13 @@
   <data name="CanTMergeCredentials" xml:space="preserve">
     <value>Can't merge credentials</value>
   </data>
+  <data name="ToPasteLogin" xml:space="preserve">
+    <value>to paste login</value>
+  </data>
+  <data name="ToPastePassword" xml:space="preserve">
+    <value>to paste password</value>
+  </data>
+  <data name="Theme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>

SinglePass.Language/Properties/Resources.ru.resx

@@ -345,4 +345,13 @@
   <data name="NoAnyChanges" xml:space="preserve">
     <value>Нет изменений</value>
   </data>
+  <data name="ToPasteLogin" xml:space="preserve">
+    <value>для вставки логина</value>
+  </data>
+  <data name="ToPastePassword" xml:space="preserve">
+    <value>для вставки пароля</value>
+  </data>
+  <data name="Theme" xml:space="preserve">
+    <value>Тема</value>
+  </data>
 </root>

SinglePass.WPF/App.xaml.cs

@@ -16,9 +16,11 @@
 using SinglePass.WPF.Settings;
 using SinglePass.WPF.ViewModels;
 using SinglePass.WPF.Views;
+using SinglePass.WPF.Views.Windows;
 using System;
 using System.Threading;
 using System.Windows;
+using System.Windows.Interop;
 
 namespace SinglePass.WPF
 {
@@ -85,8 +87,9 @@ private static IServiceProvider ConfigureServices(IConfiguration configuration)
             services.AddScoped<PasswordsViewModel>();
             services.AddScoped<CloudSyncViewModel>();
             services.AddScoped<SettingsViewModel>();
-            services.AddScoped<CredentialsDialogViewModel>();
+            services.AddScoped<CredentialsDetailsViewModel>();
 
+            // Popup
             services.AddTransient<PopupWindow>();
             services.AddTransient<PopupViewModel>();
 
@@ -132,6 +135,9 @@ private void Application_Startup(object sender, StartupEventArgs e)
                 var welcomeWindow = new WelcomeWindow();
                 welcomeWindow.Show();
 
+                var hiw = new HiddenInterprocessWindow();
+                hiw.InitWithoutShowing();
+
                 _logger = Services.GetService<ILogger<App>>();
                 _logger.LogInformation("Log session started!");
 
@@ -165,6 +171,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
             }
             else
             {
+                InterprocessHelper.ShowMainWindow();
                 Shutdown();
             }
         }

SinglePass.WPF/Authorization/Brokers/BaseAuthorizationBroker.cs

@@ -1,10 +1,6 @@
 using SinglePass.WPF.Authorization.Helpers;
-using SinglePass.WPF.Authorization.Responses;
 using SinglePass.WPF.Authorization.TokenHolders;
 using System;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
@@ -16,6 +12,7 @@ public abstract class BaseAuthorizationBroker : IAuthorizationBroker
     {
         private readonly IHttpClientFactory _httpClientFactory;
 
+        protected string RedirectUri { get; set; }
         public ITokenHolder TokenHolder { get; }
 
         public BaseAuthorizationBroker(IHttpClientFactory httpClientFactory, ITokenHolder tokenHolder)
@@ -26,24 +23,24 @@ public BaseAuthorizationBroker(IHttpClientFactory httpClientFactory, ITokenHolde
 
         public async Task AuthorizeAsync(CancellationToken cancellationToken)
         {
-            var redirectUri = BuildRedirectUri();
-            var authorizationUri = BuildAuthorizationUri(redirectUri);
-            using var listener = OAuthHelper.StartListener(redirectUri);
+            BuildRedirectUri();
+            var authorizationUri = BuildAuthorizationUri();
+            using var listener = OAuthHelper.StartListener(RedirectUri);
             OAuthHelper.OpenBrowser(authorizationUri);
-            var response = await GetResponseFromListener(listener, cancellationToken);
+            var response = await OAuthHelper.GetResponseFromListener(listener, BuildClosePageResponse(), cancellationToken);
             if (string.IsNullOrWhiteSpace(response?.Code))
             {
                 throw new Exception("Code was empty!");
             }
-            var tokenResponse = await RetrieveToken(response.Code, redirectUri, cancellationToken);
+            var tokenResponse = await RetrieveToken(response.Code, cancellationToken);
             await TokenHolder.SetAndSaveToken(tokenResponse, cancellationToken);
         }
 
         public async Task RefreshAccessToken(CancellationToken cancellationToken)
         {
             var client = _httpClientFactory.CreateClient();
-            var refreshTokenEndpointUri = BuildRefreshAccessTokenEndpointUri();
-            var postData = BuildRequestForRefreshToken();
+            var refreshTokenEndpointUri = BuildRefreshTokenEndpointUri();
+            var postData = BuildRefreshTokenRequest();
             var request = new HttpRequestMessage(HttpMethod.Post, new Uri(refreshTokenEndpointUri))
             {
                 Content = new StringContent(postData, Encoding.UTF8, "application/x-www-form-urlencoded")
@@ -58,61 +55,20 @@ public async Task RevokeToken(CancellationToken cancellationToken)
         {
             await TokenHolder.RemoveToken();
             var client = _httpClientFactory.CreateClient();
-            var revokeTokenEndpointUri = BuildRevokeTokenEndpointUri();
+            var revokeTokenEndpointUri = BuildTokenRevokeEndpointUri();
             var stringContent = new StringContent(string.Empty, Encoding.UTF8, "application/x-www-form-urlencoded");
             var response = await client.PostAsync(revokeTokenEndpointUri, stringContent, cancellationToken);
             using var content = response.Content;
             var json = await content.ReadAsStringAsync(cancellationToken);
         }
 
-        private async Task<AuthorizationCodeResponseUrl> GetResponseFromListener(HttpListener listener, CancellationToken cancellationToken)
-        {
-            HttpListenerContext context;
-            // Set up cancellation. HttpListener.GetContextAsync() doesn't accept a cancellation token,
-            // the HttpListener needs to be stopped which immediately aborts the GetContextAsync() call.
-            using (cancellationToken.Register(listener.Stop))
-            {
-                // Wait to get the authorization code response.
-                try
-                {
-                    context = await listener.GetContextAsync().ConfigureAwait(false);
-                }
-                catch (Exception) when (cancellationToken.IsCancellationRequested)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-                    // Next line will never be reached because cancellation will always have been requested in this catch block.
-                    // But it's required to satisfy compiler.
-                    throw new InvalidOperationException();
-                }
-                catch
-                {
-                    throw;
-                }
-            }
-            NameValueCollection coll = context.Request.QueryString;
-
-            // Write a "close" response.
-            var bytes = Encoding.UTF8.GetBytes(BuildClosePageResponse());
-            context.Response.ContentLength64 = bytes.Length;
-            context.Response.SendChunked = false;
-            context.Response.KeepAlive = false;
-            var output = context.Response.OutputStream;
-            await output.WriteAsync(bytes, cancellationToken).ConfigureAwait(false);
-            await output.FlushAsync(cancellationToken).ConfigureAwait(false);
-            output.Close();
-            context.Response.Close();
-
-            // Create a new response URL with a dictionary that contains all the response query parameters.
-            return new AuthorizationCodeResponseUrl(coll.AllKeys.ToDictionary(k => k, k => coll[k]));
-        }
-
-        private async Task<string> RetrieveToken(string code, string redirectUri, CancellationToken cancellationToken)
+        private async Task<string> RetrieveToken(string code, CancellationToken cancellationToken)
         {
             string result;
 
             var client = _httpClientFactory.CreateClient();
             var tokenEndpointUri = BuildTokenEndpointUri();
-            var postData = BuildRequestForToken(code, redirectUri);
+            var postData = BuildTokenRequest(code);
             var request = new HttpRequestMessage(HttpMethod.Post, new Uri(tokenEndpointUri))
             {
                 Content = new StringContent(postData, Encoding.UTF8, "application/x-www-form-urlencoded")
@@ -130,12 +86,12 @@ protected virtual string BuildClosePageResponse()
             return "Authorization success, you can return to application";
         }
 
-        protected abstract string BuildRedirectUri();
-        protected abstract string BuildAuthorizationUri(string redirectUri);
+        protected abstract void BuildRedirectUri();
+        protected abstract string BuildAuthorizationUri();
         protected abstract string BuildTokenEndpointUri();
-        protected abstract string BuildRequestForToken(string code, string redirectUri);
-        protected abstract string BuildRefreshAccessTokenEndpointUri();
-        protected abstract string BuildRequestForRefreshToken();
-        protected abstract string BuildRevokeTokenEndpointUri();
+        protected abstract string BuildTokenRequest(string code);
+        protected abstract string BuildRefreshTokenEndpointUri();
+        protected abstract string BuildRefreshTokenRequest();
+        protected abstract string BuildTokenRevokeEndpointUri();
     }
 }

SinglePass.WPF/Authorization/Brokers/GoogleAuthorizationBroker.cs

@@ -25,43 +25,43 @@ public GoogleAuthorizationBroker(
             _config = options.Value;
         }
 
-        protected override string BuildAuthorizationUri(string redirectUri)
+        protected override string BuildAuthorizationUri()
         {
             return "https://accounts.google.com/o/oauth2/v2/auth?" +
                 $"scope={HttpUtility.UrlEncode(_config.Scopes)}&" +
                 "access_type=offline&" +
                 "include_granted_scopes=true&" +
                 "response_type=code&" +
                 "state=state_parameter_passthrough_value&" +
-                $"redirect_uri={HttpUtility.UrlEncode(redirectUri)}&" +
+                $"redirect_uri={HttpUtility.UrlEncode(RedirectUri)}&" +
                 $"client_id={_config.ClientId}";
         }
 
-        protected override string BuildRedirectUri()
+        protected override void BuildRedirectUri()
         {
             var unusedPort = OAuthHelper.GetRandomUnusedPort();
-            return $"http://localhost:{unusedPort}/";
+            RedirectUri = $"http://localhost:{unusedPort}/";
         }
 
-        protected override string BuildRefreshAccessTokenEndpointUri()
+        protected override string BuildRefreshTokenEndpointUri()
         {
             return "https://oauth2.googleapis.com/token";
         }
 
-        protected override string BuildRequestForRefreshToken()
+        protected override string BuildRefreshTokenRequest()
         {
             return $"client_id={_config.ClientId}&" +
                 $"client_secret={_config.ClientSecret}&" +
                 $"refresh_token={TokenHolder.Token.RefreshToken}&" +
                 $"grant_type=refresh_token";
         }
 
-        protected override string BuildRequestForToken(string code, string redirectUri)
+        protected override string BuildTokenRequest(string code)
         {
             return $"code={code}&" +
                 $"client_id={_config.ClientId}&" +
                 $"client_secret={_config.ClientSecret}&" +
-                $"redirect_uri={HttpUtility.UrlEncode(redirectUri)}&" +
+                $"redirect_uri={HttpUtility.UrlEncode(RedirectUri)}&" +
                 $"grant_type=authorization_code";
         }
 
@@ -70,7 +70,7 @@ protected override string BuildTokenEndpointUri()
             return "https://oauth2.googleapis.com/token";
         }
 
-        protected override string BuildRevokeTokenEndpointUri()
+        protected override string BuildTokenRevokeEndpointUri()
         {
             return $"https://oauth2.googleapis.com/revoke?token={TokenHolder.Token.RefreshToken}";
         }

SinglePass.WPF/Authorization/Brokers/IAuthorizationBroker.cs

@@ -1,6 +1,6 @@
-using System.Threading;
+using SinglePass.WPF.Authorization.TokenHolders;
+using System.Threading;
 using System.Threading.Tasks;
-using SinglePass.WPF.Authorization.TokenHolders;
 
 namespace SinglePass.WPF.Authorization.Brokers
 {

SinglePass.WPF/Authorization/Helpers/OAuthHelper.cs

@@ -1,6 +1,13 @@
-using System.Diagnostics;
+using SinglePass.WPF.Authorization.Responses;
+using System;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace SinglePass.WPF.Authorization.Helpers
 {
@@ -34,5 +41,49 @@ public static void OpenBrowser(string uri)
             uri = System.Text.RegularExpressions.Regex.Replace(uri, @"(\\+)$", @"$1$1");
             Process.Start(new ProcessStartInfo("cmd", $"/c start \"\" \"{uri}\"") { CreateNoWindow = true });
         }
+
+        public static async Task<AuthorizationCodeResponseUrl> GetResponseFromListener(
+            HttpListener listener,
+            string responseHtmlText,
+            CancellationToken cancellationToken = default)
+        {
+            HttpListenerContext context;
+            // Set up cancellation. HttpListener.GetContextAsync() doesn't accept a cancellation token,
+            // the HttpListener needs to be stopped which immediately aborts the GetContextAsync() call.
+            using (cancellationToken.Register(listener.Stop))
+            {
+                // Wait to get the authorization code response.
+                try
+                {
+                    context = await listener.GetContextAsync().ConfigureAwait(false);
+                }
+                catch (Exception) when (cancellationToken.IsCancellationRequested)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    // Next line will never be reached because cancellation will always have been requested in this catch block.
+                    // But it's required to satisfy compiler.
+                    throw new InvalidOperationException();
+                }
+                catch
+                {
+                    throw;
+                }
+            }
+            NameValueCollection coll = context.Request.QueryString;
+
+            // Write a "close" response.
+            var bytes = Encoding.UTF8.GetBytes(responseHtmlText);
+            context.Response.ContentLength64 = bytes.Length;
+            context.Response.SendChunked = false;
+            context.Response.KeepAlive = false;
+            var output = context.Response.OutputStream;
+            await output.WriteAsync(bytes, cancellationToken).ConfigureAwait(false);
+            await output.FlushAsync(cancellationToken).ConfigureAwait(false);
+            output.Close();
+            context.Response.Close();
+
+            // Create a new response URL with a dictionary that contains all the response query parameters.
+            return new AuthorizationCodeResponseUrl(coll.AllKeys.ToDictionary(k => k, k => coll[k]));
+        }
     }
 }

SinglePass.WPF/Authorization/TokenHolders/ITokenHolder.cs

@@ -1,6 +1,6 @@
-using System.Threading;
+using SinglePass.WPF.Authorization.Responses;
+using System.Threading;
 using System.Threading.Tasks;
-using SinglePass.WPF.Authorization.Responses;
 
 namespace SinglePass.WPF.Authorization.TokenHolders
 {