@@ -32,7 +32,6 @@ |
||
| 32 | 32 | use OCP\IGroupManager; |
| 33 | 33 | use OCP\IURLGenerator; |
| 34 | 34 | use OCP\IUserManager; |
| 35 | -use OCP\Security\ISecureRandom; |
|
| 36 | 35 | use OCP\Share\IManager; |
| 37 | 36 | use OCP\IL10N; |
| 38 | 37 | use OCP\Util; |
@@ -189,6 +189,9 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | + /** |
|
| 193 | + * @param string $shareToken |
|
| 194 | + */ |
|
| 192 | 195 | public function updateToRemoteToken(Wopi $wopi, $shareToken, $remoteServer, $remoteServerToken, $remoteWopi) { |
| 193 | 196 | $uid = $remoteWopi['editorUid'] . '@' . $remoteServer; |
| 194 | 197 | $wopi->setEditorUid($shareToken); |
@@ -200,6 +203,10 @@ discard block |
||
| 200 | 203 | return $wopi; |
| 201 | 204 | } |
| 202 | 205 | |
| 206 | + /** |
|
| 207 | + * @param string $userId |
|
| 208 | + * @param integer $templateDestination |
|
| 209 | + */ |
|
| 203 | 210 | public function getTokenForTemplate(File $file, $userId, $templateDestination, $direct = false) { |
| 204 | 211 | $owneruid = $userId; |
| 205 | 212 | $editoruid = $userId; |
@@ -11,10 +11,8 @@ |
||
| 11 | 11 | |
| 12 | 12 | namespace OCA\Richdocuments\Controller; |
| 13 | 13 | |
| 14 | -use OCA\Richdocuments\Db\WopiMapper; |
|
| 15 | 14 | use OCA\Richdocuments\Service\FederationService; |
| 16 | 15 | use OCA\Richdocuments\TokenManager; |
| 17 | -use OCA\Richdocuments\WOPI\Parser; |
|
| 18 | 16 | use \OCP\AppFramework\Controller; |
| 19 | 17 | use OCP\AppFramework\Http; |
| 20 | 18 | use OCP\AppFramework\Http\JSONResponse; |
@@ -26,11 +26,8 @@ |
||
| 26 | 26 | use \OCP\AppFramework\OCSController; |
| 27 | 27 | use OCA\Richdocuments\Db\WopiMapper; |
| 28 | 28 | use OCP\AppFramework\Http\DataResponse; |
| 29 | -use OCP\AppFramework\OCS\OCSNotFoundException; |
|
| 30 | -use OCP\Files\NotFoundException; |
|
| 31 | 29 | use OCP\IConfig; |
| 32 | 30 | use OCP\IRequest; |
| 33 | -use OCP\Share\Exceptions\ShareNotFound; |
|
| 34 | 31 | use OCP\Share\IManager; |
| 35 | 32 | |
| 36 | 33 | class FederationController extends OCSController { |
@@ -196,6 +196,9 @@ |
||
| 196 | 196 | return new JSONResponse($response); |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | + /** |
|
| 200 | + * @param Wopi $wopi |
|
| 201 | + */ |
|
| 199 | 202 | private function setFederationFileInfo($wopi, $response) { |
| 200 | 203 | $remoteUserId = $wopi->getGuestDisplayname(); |
| 201 | 204 | $cloudID = \OC::$server->getCloudIdManager()->resolveCloudId($remoteUserId); |
@@ -126,6 +126,7 @@ |
||
| 126 | 126 | |
| 127 | 127 | /** |
| 128 | 128 | * @param File $item |
| 129 | + * @param \OCA\Richdocuments\Db\Direct $direct |
|
| 129 | 130 | * @return string|null |
| 130 | 131 | * @throws NotFoundException |
| 131 | 132 | * @throws InvalidPathException |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCA\Federation\TrustedServers; |
| 28 | 28 | use OCA\Files_Sharing\External\Storage as SharingExternalStorage; |
| 29 | 29 | use OCA\Richdocuments\TokenManager; |
| 30 | -use OCP\AppFramework\Http\RedirectResponse; |
|
| 31 | 30 | use OCP\AppFramework\QueryException; |
| 32 | 31 | use OCP\Files\File; |
| 33 | 32 | use OCP\Files\InvalidPathException; |