Merge branch 'develop' into 'release'

Auto stash before rebase of...

See merge request passbolt/desktop/passbolt-windows!246

Author: scadra

passbolt/Controllers/MainController.cs

@@ -12,11 +12,6 @@
  * @since         0.0.1
  */
 
-using System;
-using System.Diagnostics;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Web.WebView2.Core;
 using passbolt.Exceptions;
@@ -31,6 +26,11 @@
 using passbolt.Services.NavigationService;
 using passbolt.Services.WebviewService;
 using passbolt.Utils;
+using System;
+using System.Diagnostics;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace passbolt.Controllers
 {
@@ -103,7 +103,7 @@ public async Task BackgroundNavigationStarting(WebView2 sender, CoreWebView2Navi
                 this.SetWebviewSettings(webviewBackground);
             }
             //When credentials are saved from import and we navigate to auth application we init the trusted domain to check API calls
-            if(currentAccountMetaData == null && this.backgroundNavigationService.IsAuthApplication(args.Uri))
+            if (currentAccountMetaData == null && this.backgroundNavigationService.IsAuthApplication(args.Uri))
             {
                 currentAccountMetaData = await this.credentialLockerService.GetAccountMetadata();
                 this.httpService.setTrustedDomain(currentAccountMetaData.domain);
@@ -211,7 +211,7 @@ public virtual void SetWebviewSettings(WebView2 webView)
         /// </summary>
         public virtual void NewWindowRequested(CoreWebView2 sender, CoreWebView2NewWindowRequestedEventArgs args)
         {
-            if(sender.Source == webviewRendered.Source.AbsoluteUri)
+            if (sender.Source == webviewRendered.Source.AbsoluteUri)
             {
                 this.renderedNavigationService.CanOpenBrowser(args.Uri);
             }
@@ -230,7 +230,7 @@ public virtual void AllowNavigation(WebView2 sender, CoreWebView2NavigationStart
             {
                 //When session is expired we are redirected to the API
                 //To avoid this we catch the navigation and replicate the behaviour done during logout
-                if(args.Uri.EndsWith("/auth/login"))
+                if (args.Uri.EndsWith("/auth/login"))
                 {
                     backgroundTopic.ProceedMessage(new IPC(AuthenticationTopics.LOG_OUT));
                 }
@@ -296,7 +296,7 @@ protected void WebMessageReceived(object sender, CoreWebView2WebMessageReceivedE
             IPC ipc = SerializationHelper.DeserializeFromJson<IPC>(message);
 
             //Validate requestId to be an uuid
-            if(ipc.requestId != null && !this.validateUUIDRegex.IsMatch(ipc.requestId))
+            if (ipc.requestId != null && !this.validateUUIDRegex.IsMatch(ipc.requestId))
             {
                 throw new UnauthorizedTopicException(ipc.topic);
             }
@@ -345,7 +345,7 @@ public async Task BackgroundNavigationCompleted(WebView2 sender, CoreWebView2Nav
                     this.backgroundTopic = new BackgroundTopic(webviewBackground, webviewRendered, localFolderService, backgroundWebviewService);
                 }
                 //Webview can be not initialized at this step so we wait it
-                if(backgroundNavigationService != null)
+                if (backgroundNavigationService != null)
                 {
                     backgroundNavigationService.SetPreviousNavigation(sender.CoreWebView2.Source);
                 }

passbolt/Webviews/Background/dist/background-workspace.js

@@ -133918,7 +133918,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   ClipboardEvents: () => (/* binding */ ClipboardEvents)
 /* harmony export */ });
 /* harmony import */ var passbolt_browser_extension_src_all_background_page_controller_clipboard_copyToClipboardController__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! passbolt-browser-extension/src/all/background_page/controller/clipboard/copyToClipboardController */ "./node_modules/passbolt-browser-extension/src/all/background_page/controller/clipboard/copyToClipboardController.js");
-/* harmony import */ var passbolt_browser_extension_src_all_background_page_controller_clipboard_copyTemporarilyToClipboardController__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! passbolt-browser-extension/src/all/background_page/controller/clipboard/copyTemporarilyToClipboardController */ "./node_modules/passbolt-browser-extension/src/all/background_page/controller/clipboard/copyTemporarilyToClipboardController.js");
 /**
  * Passbolt ~ Open source password manager for teams
  * Copyright (c) Passbolt SA (https://www.passbolt.com)
@@ -133935,7 +133934,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
 const listen = function(worker) {
   /**
    * Copies the given content into the clipboard and clear any clipboard flush alarms.
@@ -133957,7 +133955,7 @@ const listen = function(worker) {
    * @param {string} text the content to copy
    */
   worker.port.on('passbolt.clipboard.copy-temporarily', async(requestId, text) => {
-    const clipboardController = new passbolt_browser_extension_src_all_background_page_controller_clipboard_copyTemporarilyToClipboardController__WEBPACK_IMPORTED_MODULE_1__["default"](worker, requestId);
+    const clipboardController = new passbolt_browser_extension_src_all_background_page_controller_clipboard_copyToClipboardController__WEBPACK_IMPORTED_MODULE_0__["default"](worker, requestId);
     await clipboardController._exec(text);
   }); 
 }

passbolt/Webviews/Background/dist/background-workspace.js.map

@@ -13,7 +13,6 @@
  */
 
 import CopyToClipboardController from "passbolt-browser-extension/src/all/background_page/controller/clipboard/copyToClipboardController";
-import CopyTemporarilyToClipboardController from "passbolt-browser-extension/src/all/background_page/controller/clipboard/copyTemporarilyToClipboardController";
 
 const listen = function(worker) {
   /**
@@ -36,7 +35,7 @@ const listen = function(worker) {
    * @param {string} text the content to copy
    */
   worker.port.on('passbolt.clipboard.copy-temporarily', async(requestId, text) => {
-    const clipboardController = new CopyTemporarilyToClipboardController(worker, requestId);
+    const clipboardController = new CopyToClipboardController(worker, requestId);
     await clipboardController._exec(text);
   }); 
 }