request to remote if available

ONLYOFFICE · Oct 7, 2022 · 5728682 · 5728682
1 parent e1a21af
commit 5728682
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 30 deletions.
diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
@@ -37,8 +37,6 @@
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 
-use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
-
 use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\Crypt;
 use OCA\Onlyoffice\DocumentService;
@@ -535,7 +533,7 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
 
                     $prevIsForcesave = KeyManager::wasForcesave($fileId);
 
-                    if ($this->isFederatedOperation($file)) {
+                    if (RemoteInstance::isRemoteFile($file)) {
                         $isLock = RemoteInstance::lockRemoteKey($file, $isForcesave, null);
                         if ($isForcesave && !$isLock) {
                             break;
@@ -549,7 +547,7 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
                         return $file->putContent($newData);
                     });
 
-                    if ($this->isFederatedOperation($file)) {
+                    if (RemoteInstance::isRemoteFile($file)) {
                         if ($isForcesave) {
                             RemoteInstance::lockRemoteKey($file, false, $isForcesave);
                         }
@@ -722,26 +720,6 @@ private function getFileByToken($fileId, $shareToken, $version = 0) {
         return [$file, null];
     }
 
-    /**
-     * Check of federated capable
-     *
-     * @param File $file - file
-     *
-     * @return bool
-     */
-    private function isFederatedOperation($file) {
-        $storage = $file->getStorage();
-
-        $alive = false;
-        $isFederated = $storage->instanceOfStorage(SharingExternalStorage::class);
-        if (!$isFederated) {
-            return false;
-        }
-
-        $alive = RemoteInstance::healthCheck($storage->getRemote());
-        return $alive;
-    }
-
     /**
      * Getting share by token
      *

diff --git a/controller/federationcontroller.php b/controller/federationcontroller.php
@@ -28,8 +28,6 @@
 
 use OC\OCS\Result;
 
-use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
-
 use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\DocumentService;
 use OCA\Onlyoffice\FileUtility;
@@ -138,7 +136,7 @@ public function keylock($shareToken, $path, $lock, $fs) {
 
         $fileId = $file->getId();
 
-        if ($file->getStorage()->instanceOfStorage(SharingExternalStorage::class)) {
+        if (RemoteInstance::isRemoteFile($file)) {
             $isLock = RemoteInstance::lockRemoteKey($file, $lock, $fs);
             if (!$isLock) {
                 return new Result(["error" => "Failed request"]);

diff --git a/lib/fileutility.php b/lib/fileutility.php
@@ -27,8 +27,6 @@
 use OCP\ISession;
 use OCP\Share\IManager;
 
-use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
-
 use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\Version;
 use OCA\Onlyoffice\KeyManager;
@@ -223,7 +221,7 @@ public function getKey($file, $origin = false) {
         $fileId = $file->getId();
 
         if ($origin
-            && $file->getStorage()->instanceOfStorage(SharingExternalStorage::class)) {
+            && RemoteInstance::isRemoteFile($file)) {
 
             try {
                 $key = RemoteInstance::getRemoteKey($file);

diff --git a/lib/remoteinstance.php b/lib/remoteinstance.php
@@ -21,6 +21,8 @@
 
 use OCP\Files\File;
 
+use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
+
 /**
  * Remote instance manager
  *
@@ -245,4 +247,24 @@ public static function lockRemoteKey($file, $lock, $fs) {
             return false;
         }
     }
+
+    /**
+     * Check of federated capable
+     *
+     * @param File $file - file
+     *
+     * @return bool
+     */
+    public static function isRemoteFile($file) {
+        $storage = $file->getStorage();
+
+        $alive = false;
+        $isFederated = $storage->instanceOfStorage(SharingExternalStorage::class);
+        if (!$isFederated) {
+            return false;
+        }
+
+        $alive = RemoteInstance::healthCheck($storage->getRemote());
+        return $alive;
+    }
 }