nextcloud /
server
@@ -45,135 +45,135 @@ |
||
| 45 | 45 | use OCA\Files_Sharing\External\Manager; |
| 46 | 46 | |
| 47 | 47 | class Application extends App { |
| 48 | - public function __construct(array $urlParams = array()) { |
|
| 49 | - parent::__construct('files_sharing', $urlParams); |
|
| 48 | + public function __construct(array $urlParams = array()) { |
|
| 49 | + parent::__construct('files_sharing', $urlParams); |
|
| 50 | 50 | |
| 51 | - $container = $this->getContainer(); |
|
| 52 | - /** @var IServerContainer $server */ |
|
| 53 | - $server = $container->getServer(); |
|
| 51 | + $container = $this->getContainer(); |
|
| 52 | + /** @var IServerContainer $server */ |
|
| 53 | + $server = $container->getServer(); |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * Controllers |
|
| 57 | - */ |
|
| 58 | - $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { |
|
| 59 | - $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); |
|
| 60 | - return new ShareController( |
|
| 61 | - $c->query('AppName'), |
|
| 62 | - $c->query('Request'), |
|
| 63 | - $server->getConfig(), |
|
| 64 | - $server->getURLGenerator(), |
|
| 65 | - $server->getUserManager(), |
|
| 66 | - $server->getLogger(), |
|
| 67 | - $server->getActivityManager(), |
|
| 68 | - $server->getShareManager(), |
|
| 69 | - $server->getSession(), |
|
| 70 | - $server->getPreviewManager(), |
|
| 71 | - $server->getRootFolder(), |
|
| 72 | - $federatedSharingApp->getFederatedShareProvider(), |
|
| 73 | - $server->getEventDispatcher(), |
|
| 74 | - $server->getL10N($c->query('AppName')), |
|
| 75 | - $server->query(Defaults::class) |
|
| 76 | - ); |
|
| 77 | - }); |
|
| 78 | - $container->registerService('ExternalSharesController', function (SimpleContainer $c) { |
|
| 79 | - return new ExternalSharesController( |
|
| 80 | - $c->query('AppName'), |
|
| 81 | - $c->query('Request'), |
|
| 82 | - $c->query('ExternalManager'), |
|
| 83 | - $c->query('HttpClientService') |
|
| 84 | - ); |
|
| 85 | - }); |
|
| 55 | + /** |
|
| 56 | + * Controllers |
|
| 57 | + */ |
|
| 58 | + $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { |
|
| 59 | + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); |
|
| 60 | + return new ShareController( |
|
| 61 | + $c->query('AppName'), |
|
| 62 | + $c->query('Request'), |
|
| 63 | + $server->getConfig(), |
|
| 64 | + $server->getURLGenerator(), |
|
| 65 | + $server->getUserManager(), |
|
| 66 | + $server->getLogger(), |
|
| 67 | + $server->getActivityManager(), |
|
| 68 | + $server->getShareManager(), |
|
| 69 | + $server->getSession(), |
|
| 70 | + $server->getPreviewManager(), |
|
| 71 | + $server->getRootFolder(), |
|
| 72 | + $federatedSharingApp->getFederatedShareProvider(), |
|
| 73 | + $server->getEventDispatcher(), |
|
| 74 | + $server->getL10N($c->query('AppName')), |
|
| 75 | + $server->query(Defaults::class) |
|
| 76 | + ); |
|
| 77 | + }); |
|
| 78 | + $container->registerService('ExternalSharesController', function (SimpleContainer $c) { |
|
| 79 | + return new ExternalSharesController( |
|
| 80 | + $c->query('AppName'), |
|
| 81 | + $c->query('Request'), |
|
| 82 | + $c->query('ExternalManager'), |
|
| 83 | + $c->query('HttpClientService') |
|
| 84 | + ); |
|
| 85 | + }); |
|
| 86 | 86 | |
| 87 | - /** |
|
| 88 | - * Core class wrappers |
|
| 89 | - */ |
|
| 90 | - $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) { |
|
| 91 | - return $server->getHTTPClientService(); |
|
| 92 | - }); |
|
| 93 | - $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) { |
|
| 94 | - return $server->getCloudIdManager(); |
|
| 95 | - }); |
|
| 96 | - $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) { |
|
| 97 | - $user = $server->getUserSession()->getUser(); |
|
| 98 | - $uid = $user ? $user->getUID() : null; |
|
| 99 | - return new \OCA\Files_Sharing\External\Manager( |
|
| 100 | - $server->getDatabaseConnection(), |
|
| 101 | - \OC\Files\Filesystem::getMountManager(), |
|
| 102 | - \OC\Files\Filesystem::getLoader(), |
|
| 103 | - $server->getHTTPClientService(), |
|
| 104 | - $server->getNotificationManager(), |
|
| 105 | - $server->query(\OCP\OCS\IDiscoveryService::class), |
|
| 106 | - $server->getCloudFederationProviderManager(), |
|
| 107 | - $uid |
|
| 108 | - ); |
|
| 109 | - }); |
|
| 110 | - $container->registerAlias(Manager::class, 'ExternalManager'); |
|
| 87 | + /** |
|
| 88 | + * Core class wrappers |
|
| 89 | + */ |
|
| 90 | + $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) { |
|
| 91 | + return $server->getHTTPClientService(); |
|
| 92 | + }); |
|
| 93 | + $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) { |
|
| 94 | + return $server->getCloudIdManager(); |
|
| 95 | + }); |
|
| 96 | + $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) { |
|
| 97 | + $user = $server->getUserSession()->getUser(); |
|
| 98 | + $uid = $user ? $user->getUID() : null; |
|
| 99 | + return new \OCA\Files_Sharing\External\Manager( |
|
| 100 | + $server->getDatabaseConnection(), |
|
| 101 | + \OC\Files\Filesystem::getMountManager(), |
|
| 102 | + \OC\Files\Filesystem::getLoader(), |
|
| 103 | + $server->getHTTPClientService(), |
|
| 104 | + $server->getNotificationManager(), |
|
| 105 | + $server->query(\OCP\OCS\IDiscoveryService::class), |
|
| 106 | + $server->getCloudFederationProviderManager(), |
|
| 107 | + $uid |
|
| 108 | + ); |
|
| 109 | + }); |
|
| 110 | + $container->registerAlias(Manager::class, 'ExternalManager'); |
|
| 111 | 111 | |
| 112 | - /** |
|
| 113 | - * Middleware |
|
| 114 | - */ |
|
| 115 | - $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) { |
|
| 116 | - return new SharingCheckMiddleware( |
|
| 117 | - $c->query('AppName'), |
|
| 118 | - $server->getConfig(), |
|
| 119 | - $server->getAppManager(), |
|
| 120 | - $c['ControllerMethodReflector'], |
|
| 121 | - $server->getShareManager(), |
|
| 122 | - $server->getRequest() |
|
| 123 | - ); |
|
| 124 | - }); |
|
| 112 | + /** |
|
| 113 | + * Middleware |
|
| 114 | + */ |
|
| 115 | + $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) { |
|
| 116 | + return new SharingCheckMiddleware( |
|
| 117 | + $c->query('AppName'), |
|
| 118 | + $server->getConfig(), |
|
| 119 | + $server->getAppManager(), |
|
| 120 | + $c['ControllerMethodReflector'], |
|
| 121 | + $server->getShareManager(), |
|
| 122 | + $server->getRequest() |
|
| 123 | + ); |
|
| 124 | + }); |
|
| 125 | 125 | |
| 126 | - $container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) { |
|
| 127 | - return new OCSShareAPIMiddleware( |
|
| 128 | - $server->getShareManager(), |
|
| 129 | - $server->getL10N($c->query('AppName')) |
|
| 130 | - ); |
|
| 131 | - }); |
|
| 126 | + $container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) { |
|
| 127 | + return new OCSShareAPIMiddleware( |
|
| 128 | + $server->getShareManager(), |
|
| 129 | + $server->getL10N($c->query('AppName')) |
|
| 130 | + ); |
|
| 131 | + }); |
|
| 132 | 132 | |
| 133 | - $container->registerService(ShareInfoMiddleware::class, function () use ($server) { |
|
| 134 | - return new ShareInfoMiddleware( |
|
| 135 | - $server->getShareManager() |
|
| 136 | - ); |
|
| 137 | - }); |
|
| 133 | + $container->registerService(ShareInfoMiddleware::class, function () use ($server) { |
|
| 134 | + return new ShareInfoMiddleware( |
|
| 135 | + $server->getShareManager() |
|
| 136 | + ); |
|
| 137 | + }); |
|
| 138 | 138 | |
| 139 | - // Execute middlewares |
|
| 140 | - $container->registerMiddleWare('SharingCheckMiddleware'); |
|
| 141 | - $container->registerMiddleWare('OCSShareAPIMiddleware'); |
|
| 142 | - $container->registerMiddleWare(ShareInfoMiddleware::class); |
|
| 139 | + // Execute middlewares |
|
| 140 | + $container->registerMiddleWare('SharingCheckMiddleware'); |
|
| 141 | + $container->registerMiddleWare('OCSShareAPIMiddleware'); |
|
| 142 | + $container->registerMiddleWare(ShareInfoMiddleware::class); |
|
| 143 | 143 | |
| 144 | - $container->registerService('MountProvider', function (IContainer $c) { |
|
| 145 | - /** @var \OCP\IServerContainer $server */ |
|
| 146 | - $server = $c->query('ServerContainer'); |
|
| 147 | - return new MountProvider( |
|
| 148 | - $server->getConfig(), |
|
| 149 | - $server->getShareManager(), |
|
| 150 | - $server->getLogger() |
|
| 151 | - ); |
|
| 152 | - }); |
|
| 144 | + $container->registerService('MountProvider', function (IContainer $c) { |
|
| 145 | + /** @var \OCP\IServerContainer $server */ |
|
| 146 | + $server = $c->query('ServerContainer'); |
|
| 147 | + return new MountProvider( |
|
| 148 | + $server->getConfig(), |
|
| 149 | + $server->getShareManager(), |
|
| 150 | + $server->getLogger() |
|
| 151 | + ); |
|
| 152 | + }); |
|
| 153 | 153 | |
| 154 | - $container->registerService('ExternalMountProvider', function (IContainer $c) { |
|
| 155 | - /** @var \OCP\IServerContainer $server */ |
|
| 156 | - $server = $c->query('ServerContainer'); |
|
| 157 | - return new \OCA\Files_Sharing\External\MountProvider( |
|
| 158 | - $server->getDatabaseConnection(), |
|
| 159 | - function() use ($c) { |
|
| 160 | - return $c->query('ExternalManager'); |
|
| 161 | - }, |
|
| 162 | - $server->getCloudIdManager() |
|
| 163 | - ); |
|
| 164 | - }); |
|
| 154 | + $container->registerService('ExternalMountProvider', function (IContainer $c) { |
|
| 155 | + /** @var \OCP\IServerContainer $server */ |
|
| 156 | + $server = $c->query('ServerContainer'); |
|
| 157 | + return new \OCA\Files_Sharing\External\MountProvider( |
|
| 158 | + $server->getDatabaseConnection(), |
|
| 159 | + function() use ($c) { |
|
| 160 | + return $c->query('ExternalManager'); |
|
| 161 | + }, |
|
| 162 | + $server->getCloudIdManager() |
|
| 163 | + ); |
|
| 164 | + }); |
|
| 165 | 165 | |
| 166 | - /* |
|
| 166 | + /* |
|
| 167 | 167 | * Register capabilities |
| 168 | 168 | */ |
| 169 | - $container->registerCapability(Capabilities::class); |
|
| 170 | - } |
|
| 169 | + $container->registerCapability(Capabilities::class); |
|
| 170 | + } |
|
| 171 | 171 | |
| 172 | - public function registerMountProviders() { |
|
| 173 | - /** @var \OCP\IServerContainer $server */ |
|
| 174 | - $server = $this->getContainer()->query('ServerContainer'); |
|
| 175 | - $mountProviderCollection = $server->getMountProviderCollection(); |
|
| 176 | - $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider')); |
|
| 177 | - $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider')); |
|
| 178 | - } |
|
| 172 | + public function registerMountProviders() { |
|
| 173 | + /** @var \OCP\IServerContainer $server */ |
|
| 174 | + $server = $this->getContainer()->query('ServerContainer'); |
|
| 175 | + $mountProviderCollection = $server->getMountProviderCollection(); |
|
| 176 | + $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider')); |
|
| 177 | + $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider')); |
|
| 178 | + } |
|
| 179 | 179 | } |
