Skip to content

Commit

Permalink
Merge pull request #37 from MahdiBaghbani/nextcloud
Browse files Browse the repository at this point in the history 
[Nextcloud]: Update & Bug Fixes
  • Loading branch information
@MahdiBaghbani
MahdiBaghbani authored Sep 8, 2023
2 parents 398787a + 33de183 commit 6e022bc
Show file tree
Hide file tree
Showing 7 changed files with 920 additions and 983 deletions.
6 changes: 0 additions & 6 deletions appinfo/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,3 @@
use OCP\Util;

$app = \OC::$server->query(\OCA\ScienceMesh\AppInfo\ScienceMeshApp::class);

$eventDispatcher = \OC::$server->getEventDispatcher();
$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', function(){
Util::addScript('sciencemesh', 'open-with');
Util::addStyle('sciencemesh', 'open-with');
});
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<category>integration</category>
<bugs>https://github.com/pondersource/nc-sciencemesh/issues</bugs>
<dependencies>
<nextcloud min-version="15" max-version="27"/>
<nextcloud min-version="28" max-version="28"/>
<owncloud min-version="10" max-version="10"/>
</dependencies>

Expand Down
41 changes: 17 additions & 24 deletions appinfo/routes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,25 @@
['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' => 'ocm#addSentShare', 'url' => '/~{userId}/api/ocm/addSentShare', 'verb' => 'POST'],
['name' => 'ocm#addReceivedShare', 'url' => '/~{userId}/api/ocm/addReceivedShare', 'verb' => 'POST'],
['name' => 'ocm#GetSentShare', 'url' => '/~{userId}/api/ocm/GetSentShare', 'verb' => 'POST'],
['name' => 'ocm#GetSentShareByToken', 'url' => '/~nobody/api/ocm/GetSentShareByToken', 'verb' => 'POST'],
['name' => 'ocm#Unshare', 'url' => '/~{userId}/api/ocm/Unshare', 'verb' => 'POST'],
['name' => 'ocm#UpdateShare', 'url' => '/~{userId}/api/ocm/UpdateShare', 'verb' => 'POST'],
['name' => 'ocm#ListSentShares', 'url' => '/~{userId}/api/ocm/ListSentShares', 'verb' => 'POST'],
['name' => 'ocm#ListSentShares', 'url' => '/~{userId}/api/ocm/ListShares', 'verb' => 'POST'], // alias for ListSentShares
['name' => 'ocm#ListReceivedShares', 'url' => '/~{userId}/api/ocm/ListReceivedShares', 'verb' => 'POST'],
['name' => 'ocm#GetReceivedShare', 'url' => '/~{userId}/api/ocm/GetReceivedShare', 'verb' => 'POST'],
['name' => 'ocm#UpdateSentShare', 'url' => '/~{userId}/api/ocm/UpdateSentShare', 'verb' => 'POST'],
['name' => 'ocm#UpdateReceivedShare', 'url' => '/~{userId}/api/ocm/UpdateReceivedShare', 'verb' => 'POST'],
['name' => 'ocm#GetUser', 'url' => '/~{dummy}/api/user/GetUser', 'verb' => 'POST'],
['name' => 'ocm#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'],
*/
['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#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'],
['name' => 'reva#ListSentShares', 'url' => '/~{userId}/api/ocm/ListShares', 'verb' => 'POST'], // alias for ListSentShares
['name' => 'reva#ListReceivedShares', 'url' => '/~{userId}/api/ocm/ListReceivedShares', 'verb' => 'POST'],
['name' => 'reva#GetReceivedShare', 'url' => '/~{userId}/api/ocm/GetReceivedShare', 'verb' => 'POST'],
['name' => 'reva#UpdateSentShare', 'url' => '/~{userId}/api/ocm/UpdateSentShare', 'verb' => 'POST'],
['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'],
// 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' => '.+']],
Expand All @@ -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'],
Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/AppController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,10 @@ public function accept() {
public function invitationsGenerate() {
$recipient = $this->request->getParam('email');
$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 TextPlainResponse("Unexpected response from Reva", Http::STATUS_INTERNAL_SERVER_ERROR);
}
Expand Down
Loading

0 comments on commit 6e022bc

Please sign in to comment.