Fix #22 #20

Author: rookie0

appinfo/info.xml

@@ -7,7 +7,7 @@
     <description>
         <![CDATA[Files sharing use file stored path. Now you cau use nextcloud as your CDN origin.
         What you need to do is just share your files, then click Open Sharing Path to access from files dropdown actions menu. ]]></description>
-    <version>0.2.2</version>
+    <version>0.2.3</version>
     <licence>agpl</licence>
     <author mail="[email protected]">Rookie0</author>
     <namespace>SharingPath</namespace>

lib/Controller/PathController.php

@@ -46,6 +46,7 @@ public function __construct($appName,
      * @PublicPage
      * @NoAdminRequired
      * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
      */
     public function index()
     {
@@ -63,6 +64,7 @@ public function index()
      * @PublicPage
      * @NoAdminRequired
      * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
      */
     public function handle($uid, $path)
     {
@@ -159,10 +161,11 @@ private function isShared($uid, $path)
         $now      = time();
         $shared   = false;
         for ($i = $len; $i > 0; $i--) {
-            $tmpPath  = implode(DIRECTORY_SEPARATOR, array_slice($segments, 0, $i));
-            $userPath = $this->rootFolder->getUserFolder($uid)->get($tmpPath);
-            $shares   = $this->shareManager->getSharesBy($uid, IShare::TYPE_LINK, $userPath);
-            $share    = $shares[0] ?? null;
+            $tmpPath   = implode(DIRECTORY_SEPARATOR, array_slice($segments, 0, $i));
+            $userPath  = $this->rootFolder->getUserFolder($uid)->get($tmpPath);
+            $shareType = version_compare(\OC_Util::getVersionString(), '17.0.0', '>=') ? IShare::TYPE_LINK : OC\Share\Constants::SHARE_TYPE_LINK;
+            $shares    = $this->shareManager->getSharesBy($uid, $shareType, $userPath);
+            $share     = $shares[0] ?? null;
 
             // shared but checked hide download or password protect or expired
             if ($share && (