bug 65568

restore old values, if error
ONLYOFFICE · Jan 18, 2024 · de52634 · de52634
1 parent 124019e
commit de52634
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/products/ASC.Files/Server/Api/EditorController.cs b/products/ASC.Files/Server/Api/EditorController.cs
@@ -360,21 +360,35 @@ public EditorController(
     public async Task<DocServiceUrlDto> CheckDocServiceUrl(CheckDocServiceUrlRequestDto inDto)
     {        
         await _permissionContext.DemandPermissionsAsync(SecurityConstants.EditPortalSettings);
+
+        var currentDocServiceUrl = _filesLinkUtility.DocServiceUrl;
+        var currentDocServiceUrlInternal = _filesLinkUtility.DocServiceUrlInternal;
+        var currentDocServicePortalUrl = _filesLinkUtility.DocServicePortalUrl;
 
         _filesLinkUtility.DocServiceUrl = inDto.DocServiceUrl;
         _filesLinkUtility.DocServiceUrlInternal = inDto.DocServiceUrlInternal;
         _filesLinkUtility.DocServicePortalUrl = inDto.DocServiceUrlPortal;
 
-        await _messageService.SendAsync(MessageAction.DocumentServiceLocationSetting);
-
         var https = new Regex(@"^https://", RegexOptions.IgnoreCase);
         var http = new Regex(@"^http://", RegexOptions.IgnoreCase);
         if (https.IsMatch(_commonLinkUtility.GetFullAbsolutePath("")) && http.IsMatch(_filesLinkUtility.DocServiceUrl))
         {
             throw new Exception("Mixed Active Content is not allowed. HTTPS address for Document Server is required.");
         }
 
-        await _documentServiceConnector.CheckDocServiceUrlAsync();
+        try
+        {        
+            await _documentServiceConnector.CheckDocServiceUrlAsync();
+
+            await _messageService.SendAsync(MessageAction.DocumentServiceLocationSetting);
+        }
+        catch (Exception)
+        {        
+            _filesLinkUtility.DocServiceUrl = currentDocServiceUrl;
+            _filesLinkUtility.DocServiceUrlInternal = currentDocServiceUrlInternal;
+            _filesLinkUtility.DocServicePortalUrl = currentDocServicePortalUrl;
+            throw;
+        }
 
         return await GetDocServiceUrlAsync(false);
     }