@@ -25,7 +25,6 @@ |
||
25 | 25 | |
26 | 26 | use OC\CapabilitiesManager; |
27 | 27 | use OCA\FederatedFileSharing\AddressHandler; |
28 | -use OCA\FederatedFileSharing\DiscoveryManager; |
|
29 | 28 | use OCA\FederatedFileSharing\FederatedShareProvider; |
30 | 29 | use OCA\FederatedFileSharing\Notifications; |
31 | 30 | use OCA\FederatedFileSharing\TokenHandler; |
@@ -43,224 +43,224 @@ |
||
43 | 43 | */ |
44 | 44 | class ProviderFactory implements IProviderFactory { |
45 | 45 | |
46 | - /** @var IServerContainer */ |
|
47 | - private $serverContainer; |
|
48 | - /** @var DefaultShareProvider */ |
|
49 | - private $defaultProvider = null; |
|
50 | - /** @var FederatedShareProvider */ |
|
51 | - private $federatedProvider = null; |
|
52 | - /** @var ShareByMailProvider */ |
|
53 | - private $shareByMailProvider; |
|
54 | - /** @var \OCA\Circles\ShareByCircleProvider; |
|
55 | - * ShareByCircleProvider */ |
|
56 | - private $shareByCircleProvider; |
|
57 | - |
|
58 | - /** |
|
59 | - * IProviderFactory constructor. |
|
60 | - * |
|
61 | - * @param IServerContainer $serverContainer |
|
62 | - */ |
|
63 | - public function __construct(IServerContainer $serverContainer) { |
|
64 | - $this->serverContainer = $serverContainer; |
|
65 | - } |
|
66 | - |
|
67 | - /** |
|
68 | - * Create the default share provider. |
|
69 | - * |
|
70 | - * @return DefaultShareProvider |
|
71 | - */ |
|
72 | - protected function defaultShareProvider() { |
|
73 | - if ($this->defaultProvider === null) { |
|
74 | - $this->defaultProvider = new DefaultShareProvider( |
|
75 | - $this->serverContainer->getDatabaseConnection(), |
|
76 | - $this->serverContainer->getUserManager(), |
|
77 | - $this->serverContainer->getGroupManager(), |
|
78 | - $this->serverContainer->getLazyRootFolder() |
|
79 | - ); |
|
80 | - } |
|
81 | - |
|
82 | - return $this->defaultProvider; |
|
83 | - } |
|
84 | - |
|
85 | - /** |
|
86 | - * Create the federated share provider |
|
87 | - * |
|
88 | - * @return FederatedShareProvider |
|
89 | - */ |
|
90 | - protected function federatedShareProvider() { |
|
91 | - if ($this->federatedProvider === null) { |
|
92 | - /* |
|
46 | + /** @var IServerContainer */ |
|
47 | + private $serverContainer; |
|
48 | + /** @var DefaultShareProvider */ |
|
49 | + private $defaultProvider = null; |
|
50 | + /** @var FederatedShareProvider */ |
|
51 | + private $federatedProvider = null; |
|
52 | + /** @var ShareByMailProvider */ |
|
53 | + private $shareByMailProvider; |
|
54 | + /** @var \OCA\Circles\ShareByCircleProvider; |
|
55 | + * ShareByCircleProvider */ |
|
56 | + private $shareByCircleProvider; |
|
57 | + |
|
58 | + /** |
|
59 | + * IProviderFactory constructor. |
|
60 | + * |
|
61 | + * @param IServerContainer $serverContainer |
|
62 | + */ |
|
63 | + public function __construct(IServerContainer $serverContainer) { |
|
64 | + $this->serverContainer = $serverContainer; |
|
65 | + } |
|
66 | + |
|
67 | + /** |
|
68 | + * Create the default share provider. |
|
69 | + * |
|
70 | + * @return DefaultShareProvider |
|
71 | + */ |
|
72 | + protected function defaultShareProvider() { |
|
73 | + if ($this->defaultProvider === null) { |
|
74 | + $this->defaultProvider = new DefaultShareProvider( |
|
75 | + $this->serverContainer->getDatabaseConnection(), |
|
76 | + $this->serverContainer->getUserManager(), |
|
77 | + $this->serverContainer->getGroupManager(), |
|
78 | + $this->serverContainer->getLazyRootFolder() |
|
79 | + ); |
|
80 | + } |
|
81 | + |
|
82 | + return $this->defaultProvider; |
|
83 | + } |
|
84 | + |
|
85 | + /** |
|
86 | + * Create the federated share provider |
|
87 | + * |
|
88 | + * @return FederatedShareProvider |
|
89 | + */ |
|
90 | + protected function federatedShareProvider() { |
|
91 | + if ($this->federatedProvider === null) { |
|
92 | + /* |
|
93 | 93 | * Check if the app is enabled |
94 | 94 | */ |
95 | - $appManager = $this->serverContainer->getAppManager(); |
|
96 | - if (!$appManager->isEnabledForUser('federatedfilesharing')) { |
|
97 | - return null; |
|
98 | - } |
|
95 | + $appManager = $this->serverContainer->getAppManager(); |
|
96 | + if (!$appManager->isEnabledForUser('federatedfilesharing')) { |
|
97 | + return null; |
|
98 | + } |
|
99 | 99 | |
100 | - /* |
|
100 | + /* |
|
101 | 101 | * TODO: add factory to federated sharing app |
102 | 102 | */ |
103 | - $l = $this->serverContainer->getL10N('federatedfilessharing'); |
|
104 | - $addressHandler = new AddressHandler( |
|
105 | - $this->serverContainer->getURLGenerator(), |
|
106 | - $l, |
|
107 | - $this->serverContainer->getCloudIdManager() |
|
108 | - ); |
|
109 | - $notifications = new Notifications( |
|
110 | - $addressHandler, |
|
111 | - $this->serverContainer->getHTTPClientService(), |
|
112 | - $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class), |
|
113 | - $this->serverContainer->getJobList() |
|
114 | - ); |
|
115 | - $tokenHandler = new TokenHandler( |
|
116 | - $this->serverContainer->getSecureRandom() |
|
117 | - ); |
|
118 | - |
|
119 | - $this->federatedProvider = new FederatedShareProvider( |
|
120 | - $this->serverContainer->getDatabaseConnection(), |
|
121 | - $addressHandler, |
|
122 | - $notifications, |
|
123 | - $tokenHandler, |
|
124 | - $l, |
|
125 | - $this->serverContainer->getLogger(), |
|
126 | - $this->serverContainer->getLazyRootFolder(), |
|
127 | - $this->serverContainer->getConfig(), |
|
128 | - $this->serverContainer->getUserManager(), |
|
129 | - $this->serverContainer->getCloudIdManager() |
|
130 | - ); |
|
131 | - } |
|
132 | - |
|
133 | - return $this->federatedProvider; |
|
134 | - } |
|
135 | - |
|
136 | - /** |
|
137 | - * Create the federated share provider |
|
138 | - * |
|
139 | - * @return ShareByMailProvider |
|
140 | - */ |
|
141 | - protected function getShareByMailProvider() { |
|
142 | - if ($this->shareByMailProvider === null) { |
|
143 | - /* |
|
103 | + $l = $this->serverContainer->getL10N('federatedfilessharing'); |
|
104 | + $addressHandler = new AddressHandler( |
|
105 | + $this->serverContainer->getURLGenerator(), |
|
106 | + $l, |
|
107 | + $this->serverContainer->getCloudIdManager() |
|
108 | + ); |
|
109 | + $notifications = new Notifications( |
|
110 | + $addressHandler, |
|
111 | + $this->serverContainer->getHTTPClientService(), |
|
112 | + $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class), |
|
113 | + $this->serverContainer->getJobList() |
|
114 | + ); |
|
115 | + $tokenHandler = new TokenHandler( |
|
116 | + $this->serverContainer->getSecureRandom() |
|
117 | + ); |
|
118 | + |
|
119 | + $this->federatedProvider = new FederatedShareProvider( |
|
120 | + $this->serverContainer->getDatabaseConnection(), |
|
121 | + $addressHandler, |
|
122 | + $notifications, |
|
123 | + $tokenHandler, |
|
124 | + $l, |
|
125 | + $this->serverContainer->getLogger(), |
|
126 | + $this->serverContainer->getLazyRootFolder(), |
|
127 | + $this->serverContainer->getConfig(), |
|
128 | + $this->serverContainer->getUserManager(), |
|
129 | + $this->serverContainer->getCloudIdManager() |
|
130 | + ); |
|
131 | + } |
|
132 | + |
|
133 | + return $this->federatedProvider; |
|
134 | + } |
|
135 | + |
|
136 | + /** |
|
137 | + * Create the federated share provider |
|
138 | + * |
|
139 | + * @return ShareByMailProvider |
|
140 | + */ |
|
141 | + protected function getShareByMailProvider() { |
|
142 | + if ($this->shareByMailProvider === null) { |
|
143 | + /* |
|
144 | 144 | * Check if the app is enabled |
145 | 145 | */ |
146 | - $appManager = $this->serverContainer->getAppManager(); |
|
147 | - if (!$appManager->isEnabledForUser('sharebymail')) { |
|
148 | - return null; |
|
149 | - } |
|
150 | - |
|
151 | - $settingsManager = new SettingsManager($this->serverContainer->getConfig()); |
|
152 | - |
|
153 | - $this->shareByMailProvider = new ShareByMailProvider( |
|
154 | - $this->serverContainer->getDatabaseConnection(), |
|
155 | - $this->serverContainer->getSecureRandom(), |
|
156 | - $this->serverContainer->getUserManager(), |
|
157 | - $this->serverContainer->getLazyRootFolder(), |
|
158 | - $this->serverContainer->getL10N('sharebymail'), |
|
159 | - $this->serverContainer->getLogger(), |
|
160 | - $this->serverContainer->getMailer(), |
|
161 | - $this->serverContainer->getURLGenerator(), |
|
162 | - $this->serverContainer->getActivityManager(), |
|
163 | - $settingsManager, |
|
164 | - $this->serverContainer->query(Defaults::class), |
|
165 | - $this->serverContainer->getHasher(), |
|
166 | - $this->serverContainer->query(CapabilitiesManager::class) |
|
167 | - ); |
|
168 | - } |
|
169 | - |
|
170 | - return $this->shareByMailProvider; |
|
171 | - } |
|
172 | - |
|
173 | - |
|
174 | - /** |
|
175 | - * Create the circle share provider |
|
176 | - * |
|
177 | - * @return FederatedShareProvider |
|
178 | - */ |
|
179 | - protected function getShareByCircleProvider() { |
|
180 | - |
|
181 | - $appManager = $this->serverContainer->getAppManager(); |
|
182 | - if (!$appManager->isEnabledForUser('circles')) { |
|
183 | - return null; |
|
184 | - } |
|
185 | - |
|
186 | - |
|
187 | - if ($this->shareByCircleProvider === null) { |
|
188 | - |
|
189 | - $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider( |
|
190 | - $this->serverContainer->getDatabaseConnection(), |
|
191 | - $this->serverContainer->getSecureRandom(), |
|
192 | - $this->serverContainer->getUserManager(), |
|
193 | - $this->serverContainer->getLazyRootFolder(), |
|
194 | - $this->serverContainer->getL10N('circles'), |
|
195 | - $this->serverContainer->getLogger(), |
|
196 | - $this->serverContainer->getURLGenerator() |
|
197 | - ); |
|
198 | - } |
|
199 | - |
|
200 | - return $this->shareByCircleProvider; |
|
201 | - } |
|
202 | - |
|
203 | - |
|
204 | - /** |
|
205 | - * @inheritdoc |
|
206 | - */ |
|
207 | - public function getProvider($id) { |
|
208 | - $provider = null; |
|
209 | - if ($id === 'ocinternal') { |
|
210 | - $provider = $this->defaultShareProvider(); |
|
211 | - } else if ($id === 'ocFederatedSharing') { |
|
212 | - $provider = $this->federatedShareProvider(); |
|
213 | - } else if ($id === 'ocMailShare') { |
|
214 | - $provider = $this->getShareByMailProvider(); |
|
215 | - } else if ($id === 'ocCircleShare') { |
|
216 | - $provider = $this->getShareByCircleProvider(); |
|
217 | - } |
|
218 | - |
|
219 | - if ($provider === null) { |
|
220 | - throw new ProviderException('No provider with id .' . $id . ' found.'); |
|
221 | - } |
|
222 | - |
|
223 | - return $provider; |
|
224 | - } |
|
225 | - |
|
226 | - /** |
|
227 | - * @inheritdoc |
|
228 | - */ |
|
229 | - public function getProviderForType($shareType) { |
|
230 | - $provider = null; |
|
231 | - |
|
232 | - if ($shareType === \OCP\Share::SHARE_TYPE_USER || |
|
233 | - $shareType === \OCP\Share::SHARE_TYPE_GROUP || |
|
234 | - $shareType === \OCP\Share::SHARE_TYPE_LINK |
|
235 | - ) { |
|
236 | - $provider = $this->defaultShareProvider(); |
|
237 | - } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) { |
|
238 | - $provider = $this->federatedShareProvider(); |
|
239 | - } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) { |
|
240 | - $provider = $this->getShareByMailProvider(); |
|
241 | - } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) { |
|
242 | - $provider = $this->getShareByCircleProvider(); |
|
243 | - } |
|
244 | - |
|
245 | - |
|
246 | - if ($provider === null) { |
|
247 | - throw new ProviderException('No share provider for share type ' . $shareType); |
|
248 | - } |
|
249 | - |
|
250 | - return $provider; |
|
251 | - } |
|
252 | - |
|
253 | - public function getAllProviders() { |
|
254 | - $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()]; |
|
255 | - $shareByMail = $this->getShareByMailProvider(); |
|
256 | - if ($shareByMail !== null) { |
|
257 | - $shares[] = $shareByMail; |
|
258 | - } |
|
259 | - $shareByCircle = $this->getShareByCircleProvider(); |
|
260 | - if ($shareByCircle !== null) { |
|
261 | - $shares[] = $shareByCircle; |
|
262 | - } |
|
263 | - |
|
264 | - return $shares; |
|
265 | - } |
|
146 | + $appManager = $this->serverContainer->getAppManager(); |
|
147 | + if (!$appManager->isEnabledForUser('sharebymail')) { |
|
148 | + return null; |
|
149 | + } |
|
150 | + |
|
151 | + $settingsManager = new SettingsManager($this->serverContainer->getConfig()); |
|
152 | + |
|
153 | + $this->shareByMailProvider = new ShareByMailProvider( |
|
154 | + $this->serverContainer->getDatabaseConnection(), |
|
155 | + $this->serverContainer->getSecureRandom(), |
|
156 | + $this->serverContainer->getUserManager(), |
|
157 | + $this->serverContainer->getLazyRootFolder(), |
|
158 | + $this->serverContainer->getL10N('sharebymail'), |
|
159 | + $this->serverContainer->getLogger(), |
|
160 | + $this->serverContainer->getMailer(), |
|
161 | + $this->serverContainer->getURLGenerator(), |
|
162 | + $this->serverContainer->getActivityManager(), |
|
163 | + $settingsManager, |
|
164 | + $this->serverContainer->query(Defaults::class), |
|
165 | + $this->serverContainer->getHasher(), |
|
166 | + $this->serverContainer->query(CapabilitiesManager::class) |
|
167 | + ); |
|
168 | + } |
|
169 | + |
|
170 | + return $this->shareByMailProvider; |
|
171 | + } |
|
172 | + |
|
173 | + |
|
174 | + /** |
|
175 | + * Create the circle share provider |
|
176 | + * |
|
177 | + * @return FederatedShareProvider |
|
178 | + */ |
|
179 | + protected function getShareByCircleProvider() { |
|
180 | + |
|
181 | + $appManager = $this->serverContainer->getAppManager(); |
|
182 | + if (!$appManager->isEnabledForUser('circles')) { |
|
183 | + return null; |
|
184 | + } |
|
185 | + |
|
186 | + |
|
187 | + if ($this->shareByCircleProvider === null) { |
|
188 | + |
|
189 | + $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider( |
|
190 | + $this->serverContainer->getDatabaseConnection(), |
|
191 | + $this->serverContainer->getSecureRandom(), |
|
192 | + $this->serverContainer->getUserManager(), |
|
193 | + $this->serverContainer->getLazyRootFolder(), |
|
194 | + $this->serverContainer->getL10N('circles'), |
|
195 | + $this->serverContainer->getLogger(), |
|
196 | + $this->serverContainer->getURLGenerator() |
|
197 | + ); |
|
198 | + } |
|
199 | + |
|
200 | + return $this->shareByCircleProvider; |
|
201 | + } |
|
202 | + |
|
203 | + |
|
204 | + /** |
|
205 | + * @inheritdoc |
|
206 | + */ |
|
207 | + public function getProvider($id) { |
|
208 | + $provider = null; |
|
209 | + if ($id === 'ocinternal') { |
|
210 | + $provider = $this->defaultShareProvider(); |
|
211 | + } else if ($id === 'ocFederatedSharing') { |
|
212 | + $provider = $this->federatedShareProvider(); |
|
213 | + } else if ($id === 'ocMailShare') { |
|
214 | + $provider = $this->getShareByMailProvider(); |
|
215 | + } else if ($id === 'ocCircleShare') { |
|
216 | + $provider = $this->getShareByCircleProvider(); |
|
217 | + } |
|
218 | + |
|
219 | + if ($provider === null) { |
|
220 | + throw new ProviderException('No provider with id .' . $id . ' found.'); |
|
221 | + } |
|
222 | + |
|
223 | + return $provider; |
|
224 | + } |
|
225 | + |
|
226 | + /** |
|
227 | + * @inheritdoc |
|
228 | + */ |
|
229 | + public function getProviderForType($shareType) { |
|
230 | + $provider = null; |
|
231 | + |
|
232 | + if ($shareType === \OCP\Share::SHARE_TYPE_USER || |
|
233 | + $shareType === \OCP\Share::SHARE_TYPE_GROUP || |
|
234 | + $shareType === \OCP\Share::SHARE_TYPE_LINK |
|
235 | + ) { |
|
236 | + $provider = $this->defaultShareProvider(); |
|
237 | + } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) { |
|
238 | + $provider = $this->federatedShareProvider(); |
|
239 | + } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) { |
|
240 | + $provider = $this->getShareByMailProvider(); |
|
241 | + } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) { |
|
242 | + $provider = $this->getShareByCircleProvider(); |
|
243 | + } |
|
244 | + |
|
245 | + |
|
246 | + if ($provider === null) { |
|
247 | + throw new ProviderException('No share provider for share type ' . $shareType); |
|
248 | + } |
|
249 | + |
|
250 | + return $provider; |
|
251 | + } |
|
252 | + |
|
253 | + public function getAllProviders() { |
|
254 | + $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()]; |
|
255 | + $shareByMail = $this->getShareByMailProvider(); |
|
256 | + if ($shareByMail !== null) { |
|
257 | + $shares[] = $shareByMail; |
|
258 | + } |
|
259 | + $shareByCircle = $this->getShareByCircleProvider(); |
|
260 | + if ($shareByCircle !== null) { |
|
261 | + $shares[] = $shareByCircle; |
|
262 | + } |
|
263 | + |
|
264 | + return $shares; |
|
265 | + } |
|
266 | 266 | } |