@@ -39,117 +39,117 @@ |
||
39 | 39 | |
40 | 40 | class Application extends App { |
41 | 41 | |
42 | - /** @var FederatedShareProvider */ |
|
43 | - protected $federatedShareProvider; |
|
42 | + /** @var FederatedShareProvider */ |
|
43 | + protected $federatedShareProvider; |
|
44 | 44 | |
45 | - public function __construct() { |
|
46 | - parent::__construct('federatedfilesharing'); |
|
45 | + public function __construct() { |
|
46 | + parent::__construct('federatedfilesharing'); |
|
47 | 47 | |
48 | - $container = $this->getContainer(); |
|
49 | - $server = $container->getServer(); |
|
48 | + $container = $this->getContainer(); |
|
49 | + $server = $container->getServer(); |
|
50 | 50 | |
51 | - $cloudFederationManager = $server->getCloudFederationProviderManager(); |
|
52 | - $cloudFederationManager->addCloudFederationProvider('file', |
|
53 | - 'Federated Files Sharing', |
|
54 | - function() use ($container) { |
|
55 | - $server = $container->getServer(); |
|
56 | - return new CloudFederationProviderFiles( |
|
57 | - $server->getAppManager(), |
|
58 | - $server->query(FederatedShareProvider::class), |
|
59 | - $server->query(AddressHandler::class), |
|
60 | - $server->getLogger(), |
|
61 | - $server->getUserManager(), |
|
62 | - $server->getCloudIdManager(), |
|
63 | - $server->getActivityManager(), |
|
64 | - $server->getNotificationManager(), |
|
65 | - $server->getURLGenerator(), |
|
66 | - $server->getCloudFederationFactory(), |
|
67 | - $server->getCloudFederationProviderManager(), |
|
68 | - $server->getDatabaseConnection(), |
|
69 | - $server->getGroupManager() |
|
70 | - ); |
|
71 | - }); |
|
51 | + $cloudFederationManager = $server->getCloudFederationProviderManager(); |
|
52 | + $cloudFederationManager->addCloudFederationProvider('file', |
|
53 | + 'Federated Files Sharing', |
|
54 | + function() use ($container) { |
|
55 | + $server = $container->getServer(); |
|
56 | + return new CloudFederationProviderFiles( |
|
57 | + $server->getAppManager(), |
|
58 | + $server->query(FederatedShareProvider::class), |
|
59 | + $server->query(AddressHandler::class), |
|
60 | + $server->getLogger(), |
|
61 | + $server->getUserManager(), |
|
62 | + $server->getCloudIdManager(), |
|
63 | + $server->getActivityManager(), |
|
64 | + $server->getNotificationManager(), |
|
65 | + $server->getURLGenerator(), |
|
66 | + $server->getCloudFederationFactory(), |
|
67 | + $server->getCloudFederationProviderManager(), |
|
68 | + $server->getDatabaseConnection(), |
|
69 | + $server->getGroupManager() |
|
70 | + ); |
|
71 | + }); |
|
72 | 72 | |
73 | - $container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) { |
|
74 | - $addressHandler = new AddressHandler( |
|
75 | - $server->getURLGenerator(), |
|
76 | - $server->getL10N('federatedfilesharing'), |
|
77 | - $server->getCloudIdManager() |
|
78 | - ); |
|
79 | - $notification = new Notifications( |
|
80 | - $addressHandler, |
|
81 | - $server->getHTTPClientService(), |
|
82 | - $server->query(\OCP\OCS\IDiscoveryService::class), |
|
83 | - \OC::$server->getJobList(), |
|
84 | - \OC::$server->getCloudFederationProviderManager(), |
|
85 | - \OC::$server->getCloudFederationFactory() |
|
86 | - ); |
|
87 | - return new RequestHandlerController( |
|
88 | - $c->query('AppName'), |
|
89 | - $server->getRequest(), |
|
90 | - $this->getFederatedShareProvider(), |
|
91 | - $server->getDatabaseConnection(), |
|
92 | - $server->getShareManager(), |
|
93 | - $notification, |
|
94 | - $addressHandler, |
|
95 | - $server->getUserManager(), |
|
96 | - $server->getCloudIdManager(), |
|
97 | - $server->getLogger(), |
|
98 | - $server->getCloudFederationFactory(), |
|
99 | - $server->getCloudFederationProviderManager() |
|
100 | - ); |
|
101 | - }); |
|
102 | - } |
|
73 | + $container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) { |
|
74 | + $addressHandler = new AddressHandler( |
|
75 | + $server->getURLGenerator(), |
|
76 | + $server->getL10N('federatedfilesharing'), |
|
77 | + $server->getCloudIdManager() |
|
78 | + ); |
|
79 | + $notification = new Notifications( |
|
80 | + $addressHandler, |
|
81 | + $server->getHTTPClientService(), |
|
82 | + $server->query(\OCP\OCS\IDiscoveryService::class), |
|
83 | + \OC::$server->getJobList(), |
|
84 | + \OC::$server->getCloudFederationProviderManager(), |
|
85 | + \OC::$server->getCloudFederationFactory() |
|
86 | + ); |
|
87 | + return new RequestHandlerController( |
|
88 | + $c->query('AppName'), |
|
89 | + $server->getRequest(), |
|
90 | + $this->getFederatedShareProvider(), |
|
91 | + $server->getDatabaseConnection(), |
|
92 | + $server->getShareManager(), |
|
93 | + $notification, |
|
94 | + $addressHandler, |
|
95 | + $server->getUserManager(), |
|
96 | + $server->getCloudIdManager(), |
|
97 | + $server->getLogger(), |
|
98 | + $server->getCloudFederationFactory(), |
|
99 | + $server->getCloudFederationProviderManager() |
|
100 | + ); |
|
101 | + }); |
|
102 | + } |
|
103 | 103 | |
104 | - /** |
|
105 | - * get instance of federated share provider |
|
106 | - * |
|
107 | - * @return FederatedShareProvider |
|
108 | - */ |
|
109 | - public function getFederatedShareProvider() { |
|
110 | - if ($this->federatedShareProvider === null) { |
|
111 | - $this->initFederatedShareProvider(); |
|
112 | - } |
|
113 | - return $this->federatedShareProvider; |
|
114 | - } |
|
104 | + /** |
|
105 | + * get instance of federated share provider |
|
106 | + * |
|
107 | + * @return FederatedShareProvider |
|
108 | + */ |
|
109 | + public function getFederatedShareProvider() { |
|
110 | + if ($this->federatedShareProvider === null) { |
|
111 | + $this->initFederatedShareProvider(); |
|
112 | + } |
|
113 | + return $this->federatedShareProvider; |
|
114 | + } |
|
115 | 115 | |
116 | - /** |
|
117 | - * initialize federated share provider |
|
118 | - */ |
|
119 | - protected function initFederatedShareProvider() { |
|
120 | - $c = $this->getContainer(); |
|
121 | - $addressHandler = new \OCA\FederatedFileSharing\AddressHandler( |
|
122 | - \OC::$server->getURLGenerator(), |
|
123 | - \OC::$server->getL10N('federatedfilesharing'), |
|
124 | - \OC::$server->getCloudIdManager() |
|
125 | - ); |
|
126 | - $notifications = new \OCA\FederatedFileSharing\Notifications( |
|
127 | - $addressHandler, |
|
128 | - \OC::$server->getHTTPClientService(), |
|
129 | - \OC::$server->query(\OCP\OCS\IDiscoveryService::class), |
|
130 | - \OC::$server->getJobList(), |
|
131 | - \OC::$server->getCloudFederationProviderManager(), |
|
132 | - \OC::$server->getCloudFederationFactory() |
|
133 | - ); |
|
134 | - $tokenHandler = new \OCA\FederatedFileSharing\TokenHandler( |
|
135 | - \OC::$server->getSecureRandom() |
|
136 | - ); |
|
116 | + /** |
|
117 | + * initialize federated share provider |
|
118 | + */ |
|
119 | + protected function initFederatedShareProvider() { |
|
120 | + $c = $this->getContainer(); |
|
121 | + $addressHandler = new \OCA\FederatedFileSharing\AddressHandler( |
|
122 | + \OC::$server->getURLGenerator(), |
|
123 | + \OC::$server->getL10N('federatedfilesharing'), |
|
124 | + \OC::$server->getCloudIdManager() |
|
125 | + ); |
|
126 | + $notifications = new \OCA\FederatedFileSharing\Notifications( |
|
127 | + $addressHandler, |
|
128 | + \OC::$server->getHTTPClientService(), |
|
129 | + \OC::$server->query(\OCP\OCS\IDiscoveryService::class), |
|
130 | + \OC::$server->getJobList(), |
|
131 | + \OC::$server->getCloudFederationProviderManager(), |
|
132 | + \OC::$server->getCloudFederationFactory() |
|
133 | + ); |
|
134 | + $tokenHandler = new \OCA\FederatedFileSharing\TokenHandler( |
|
135 | + \OC::$server->getSecureRandom() |
|
136 | + ); |
|
137 | 137 | |
138 | - $this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider( |
|
139 | - \OC::$server->getDatabaseConnection(), |
|
140 | - $addressHandler, |
|
141 | - $notifications, |
|
142 | - $tokenHandler, |
|
143 | - \OC::$server->getL10N('federatedfilesharing'), |
|
144 | - \OC::$server->getLogger(), |
|
145 | - \OC::$server->getLazyRootFolder(), |
|
146 | - \OC::$server->getConfig(), |
|
147 | - \OC::$server->getUserManager(), |
|
148 | - \OC::$server->getCloudIdManager(), |
|
149 | - $c->query(IConfig::class), |
|
150 | - \OC::$server->getCloudFederationProviderManager() |
|
138 | + $this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider( |
|
139 | + \OC::$server->getDatabaseConnection(), |
|
140 | + $addressHandler, |
|
141 | + $notifications, |
|
142 | + $tokenHandler, |
|
143 | + \OC::$server->getL10N('federatedfilesharing'), |
|
144 | + \OC::$server->getLogger(), |
|
145 | + \OC::$server->getLazyRootFolder(), |
|
146 | + \OC::$server->getConfig(), |
|
147 | + \OC::$server->getUserManager(), |
|
148 | + \OC::$server->getCloudIdManager(), |
|
149 | + $c->query(IConfig::class), |
|
150 | + \OC::$server->getCloudFederationProviderManager() |
|
151 | 151 | |
152 | - ); |
|
153 | - } |
|
152 | + ); |
|
153 | + } |
|
154 | 154 | |
155 | 155 | } |