Merge branch 'hotfix/v2.6.3' of git.onlyoffice.com:ONLYOFFICE/DocSpac…

…e-server into hotfix/v2.6.3 # Conflicts: # products/ASC.Files/Core/Core/Security/ExternalShare.cs
ONLYOFFICE · Oct 2, 2024 · 97f3c4c · 97f3c4c
2 parents a729111 + a74e60a
commit 97f3c4c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/products/ASC.Files/Core/Core/Security/ExternalShare.cs b/products/ASC.Files/Core/Core/Security/ExternalShare.cs
@@ -178,15 +178,24 @@ public string GetKey()
 
     public async Task<TokenData> ParseShareKeyAsync(string key)
     {
-        ArgumentException.ThrowIfNullOrEmpty(key);
+        if (string.IsNullOrEmpty(key))
+        {
+            return new TokenData
+            {
+                Id = Guid.Empty
+            };
+        }
 
         var stringKey = Signature.Read<string>(key, await GetDbKeyAsync());
 
         if (string.IsNullOrEmpty(stringKey))
         {
-            return null;
+            return new TokenData
+            {
+                Id = Guid.Empty
+            };
         }
-        
+
         if (!stringKey.StartsWith('{') || !stringKey.EndsWith('}'))
         {
             return new TokenData