Merge branch 'feature/nc-23' into develop

# Conflicts:
#	lib/listeners/fileslistener.php

2 files changed, 17 insertions, 1 deletions

diff --git a/appinfo/application.php b/appinfo/application.php
index a90be12..3b3065a 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -44,6 +44,7 @@ use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\Controller\CallbackController;
 use OCA\Onlyoffice\Controller\EditorController;
 use OCA\Onlyoffice\Controller\EditorApiController;
+use OCA\Onlyoffice\Controller\SharingApiController;
 use OCA\Onlyoffice\Controller\SettingsController;
 use OCA\Onlyoffice\Controller\TemplateController;
 use OCA\Onlyoffice\Listeners\FilesListener;
@@ -163,6 +164,19 @@ class Application extends App implements IBootstrap {
             );
         });
 
+        $context->registerService("SharingApiController", function (ContainerInterface $c) {
+            return new SharingApiController(
+                $c->get("AppName"),
+                $c->get("Request"),
+                $c->get("RootStorage"),
+                $c->get("Logger"),
+                $c->get("UserSession"),
+                $c->get("UserManager"),
+                $c->get("IManager"),
+                $this->appConfig
+            );
+        });
+
         $context->registerService("EditorApiController", function (ContainerInterface $c) {
             return new EditorApiController(
                 $c->get("AppName"),
diff --git a/appinfo/routes.php b/appinfo/routes.php
index cbdb010..bf5ea6d 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -47,6 +47,8 @@ return [
     "ocs" => [
         ["name" => "federation#key", "url" => "/api/v1/key", "verb" => "POST"],
         ["name" => "federation#keylock", "url" => "/api/v1/keylock", "verb" => "POST"],
-        ["name" => "editorapi#config", "url" => "/api/v1/config/{fileId}", "verb" => "GET"]
+        ["name" => "editorapi#config", "url" => "/api/v1/config/{fileId}", "verb" => "GET"],
+        ["name" => "sharingapi#get_shares", "url" => "/api/v1/shares/{fileId}", "verb" => "GET"],
+        ["name" => "sharingapi#set_shares", "url" => "/api/v1/shares", "verb" => "PUT"]
     ]
 ];
\ No newline at end of file