Merge pull request #36 from MahdiBaghbani/owncloud

[ownCloud]: Update & Bug Fixes

Author: MahdiBaghbani

appinfo/info.xml

@@ -23,7 +23,7 @@
     <bugs>https://github.com/pondersource/nc-sciencemesh/issues</bugs>
     <screenshot>https://avatars.githubusercontent.com/u/46584276</screenshot>
     <dependencies>
-        <nextcloud min-version="15" max-version="26"/>
+        <nextcloud min-version="28" max-version="28"/>
         <owncloud min-version="10" max-version="10"/>
     </dependencies>
     <settings>

appinfo/routes.php

@@ -38,12 +38,12 @@
 		['name' => 'reva#UnsetArbitraryMetadata', 'url' => '/~{userId}/api/storage/UnsetArbitraryMetadata', 'verb' => 'POST'],
 		['name' => 'reva#UpdateGrant', 'url' => '/~{userId}/api/storage/UpdateGrant', 'verb' => 'POST'],
 		['name' => 'reva#Upload', 'url' => '/~{userId}/api/storage/Upload/{path}', 'verb' => 'PUT', 'requirements' => ['path' => '.+']],
+		['name' => 'reva#Download', 'url' => '/~{userId}/api/storage/Download/{path}', 'verb' => 'GET', 'requirements' => array('path' => '.+')],
 
 		// OCM routes
 		['name' => 'reva#addSentShare', 'url' => '/~{userId}/api/ocm/addSentShare', 'verb' => 'POST'],
 		['name' => 'reva#addReceivedShare', 'url' => '/~{userId}/api/ocm/addReceivedShare', 'verb' => 'POST'],
 		['name' => 'reva#GetSentShare', 'url' => '/~{userId}/api/ocm/GetSentShare', 'verb' => 'POST'],
-		['name' => 'reva#GetSentShareByToken', 'url' => '/~nobody/api/ocm/GetSentShareByToken', 'verb' => 'POST'],
 		['name' => 'reva#Unshare', 'url' => '/~{userId}/api/ocm/Unshare', 'verb' => 'POST'],
 		['name' => 'reva#UpdateShare', 'url' => '/~{userId}/api/ocm/UpdateShare', 'verb' => 'POST'],
 		['name' => 'reva#ListSentShares', 'url' => '/~{userId}/api/ocm/ListSentShares', 'verb' => 'POST'],
@@ -54,15 +54,9 @@
 		['name' => 'reva#UpdateReceivedShare', 'url' => '/~{userId}/api/ocm/UpdateReceivedShare', 'verb' => 'POST'],
 		['name' => 'reva#GetUser', 'url' => '/~{dummy}/api/user/GetUser', 'verb' => 'POST'],
 		['name' => 'reva#GetUserByClaim', 'url' => '/~{dummy}/api/user/GetUserByClaim', 'verb' => 'POST'],
-
-		/*
-		['name' => 'storage#createHome', 'url' => '/~{userId}/CreateHome', 'verb' => 'POST'],
-		['name' => 'storage#listFolder', 'url' => '/~{userId}/ListFolder', 'verb' => 'POST'],
-		['name' => 'storage#initiateUpload', 'url' => '/~{userId}/InitiateUpload', 'verb' => 'POST'],
-		['name' => 'storage#upload', 'url' => '/~{userId}/Upload', 'verb' => 'POST'],
-		['name' => 'storage#handleUpload', 'url' => '/~{userId}/Upload/{path}', 'verb' => 'PUT'],
-		['name' => 'storage#getMD', 'url' => '/~{userId}/GetMD', 'verb' => 'POST'],
-		*/
+		// See: https://github.com/cs3org/reva/pull/4115#discussion_r1308371946
+		// we need to handle this route for both nobody and userId.
+		['name' => 'reva#GetSentShareByToken', 'url' => '/~{userId}/api/ocm/GetSentShareByToken', 'verb' => 'POST'],
 
 		// Files routes
 		['name' => 'storage#handleGet', 'url' => '/~{userId}/files/{path}', 'verb' => 'GET', 'requirements' => ['path' => '.+']],
@@ -71,7 +65,6 @@
 		['name' => 'storage#handleDelete', 'url' => '/~{userId}/files/{path}', 'verb' => 'DELETE', 'requirements' => ['path' => '.+']],
 		['name' => 'storage#handleHead', 'url' => '/~{userId}/files/{path}', 'verb' => 'HEAD', 'requirements' => ['path' => '.+']],
 
-
 		// Internal app routes
 		['name' => 'app#contacts', 'url' => '/', 'verb' => 'GET'],
 		['name' => 'app#generate', 'url' => '/generate', 'verb' => 'GET'],

lib/AppInfo/ScienceMeshApp.php

@@ -7,7 +7,7 @@
 
 class ScienceMeshApp extends App {
 	public const APP_ID = 'sciencemesh';
-    public const SCIENCEMESH_POSTFIX = ' (Sciencemesh)';
+	public const SCIENCEMESH_POSTFIX = ' (Sciencemesh)';
 	public const SHARE_TYPE_REMOTE = 6;
 	public const SHARE_TYPE_SCIENCEMESH = 6;
 
@@ -32,9 +32,6 @@ public function __construct() {
 			return $c->query('UserSession')->getUser();
 		});
 
-
-
-
 		$notificationManager = $server->getNotificationManager();
         $notificationManager->registerNotifier(function () use ($notificationManager) {
             return $this->getContainer()->query('\OCA\ScienceMesh\Notifier\ScienceMeshNotifier');

lib/Controller/AppController.php

@@ -125,6 +125,9 @@ public function invitationsGenerate() {
 		$invitationsData = $this->httpClient->generateTokenFromReva($this->userId, $recipient);
 		$inviteLinkStr = $invitationsData["invite_link"];
 
+		// check if invite_link exist before accessing.
+		$inviteLinkStr = isset($invitationsData["invite_link"]) ? $invitationsData["invite_link"] : false;
+
 		if (!$inviteLinkStr) {
 			return new PlainResponse("Unexpected response from Reva", Http::STATUS_INTERNAL_SERVER_ERROR);
 		}