Move sending link e-mail to OCS

Signed-off-by: Roeland Jago Douma <[email protected]>
nextcloud · Oct 19, 2016 · 74aee46 · 74aee46
1 parent e072057
commit 74aee46
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 24 deletions.
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
@@ -69,6 +69,11 @@
 			'url'  => '/api/v1/shares/{id}',
 			'verb' => 'DELETE',
 		],
+		[
+			'name' => 'ShareAPI#emailLink',
+			'url'  => '/api/v1/shares/{id}/emailLink',
+			'verb' => 'POST',
+		],
 		/*
 		 * OCS Sharee API
 		 */

diff --git a/apps/files_sharing/lib/API/Share20OCS.php b/apps/files_sharing/lib/API/Share20OCS.php
@@ -23,6 +23,8 @@
  */
 namespace OCA\Files_Sharing\API;
 
+use OC\Share\MailNotifications;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSException;
@@ -699,6 +701,51 @@ public function updateShare(
 		return new DataResponse($this->formatShare($share));
 	}
 
+	/**
+	 * Send a notification e-mail for a given share
+	 *
+	 * @param int $id
+	 * @oaran string $toaddress Email of recipient
+	 *
+	 * @throws OCSNotFoundException
+	 * @throws OCSForbiddenException
+	 *
+	 * @return DataResponse
+	 */
+	public function emailLink($id, $toaddress) {
+		try {
+			$share = $this->getShareById($id);
+		} catch (ShareNotFound $e) {
+			throw new OCSNotFoundException('Share not found');
+		}
+
+		if ($share->getShareType() !== \OCP\Share::SHARE_TYPE_LINK) {
+			throw new OCSForbiddenException('Can\'t send link for non link share');
+		}
+
+		$mailer = new MailNotifications(
+			$this->currentUser,
+			\OC::$server->getL10N('core'),
+			\OC::$server->getMailer(),
+			\OC::$server->getLogger(),
+			new \OCP\Defaults(),
+			$this->urlGenerator
+		);
+
+		$failed = $mailer->sendLinkShareMail(
+			$toaddress,
+			$share->getNode()->getName(),
+			$this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]),
+			$share->getExpirationDate() !== null ? $share->getExpirationDate()->getTimestamp() : null
+		);
+
+		if ($failed === []) {
+			return new DataResponse([]);
+		} else {
+			return new DataResponse([], Http::STATUS_FORBIDDEN);
+		}
+	}
+
 	/**
 	 * @param \OCP\Share\IShare $share
 	 * @return bool

diff --git a/core/js/sharedialogmailview.js b/core/js/sharedialogmailview.js
@@ -131,6 +131,9 @@
 
 			var $emailField = this.$el.find('.emailField');
 			if (isLinkShare && $emailField.length !== 0) {
+				/*
+				 * TODO: Need new API to search for autocomplete
+				 *
 				$emailField.autocomplete({
 					minLength: 1,
 					source: function (search, response) {
@@ -154,6 +157,7 @@
 						.append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
 						.appendTo( ul );
 				};
+				*/
 			}
 			this.delegateEvents();
 

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
@@ -460,33 +460,17 @@
 		 *
 		 * @param {string} recipientEmail recipient email address
 		 */
-		sendEmailPrivateLink: function(recipientEmail) {
-			var deferred = $.Deferred();
-			var itemType = this.get('itemType');
-			var itemSource = this.get('itemSource');
-			var linkShare = this.get('linkShare');
+		sendEmailPrivateLink: function(recipientEmail, options) {
+			var shareId = this.get('linkShare').id;
 
-			$.post(
-				OC.generateUrl('core/ajax/share.php'), {
-					action: 'email',
-					toaddress: recipientEmail,
-					link: linkShare.link,
-					itemType: itemType,
-					itemSource: itemSource,
-					file: this.fileInfoModel.get('name'),
-					expiration: linkShare.expiration || ''
+			return $.ajax({
+				type: 'POST',
+				url: this._getUrl('shares/' + encodeURIComponent(shareId) + '/emailLink'),
+				data: {
+					toaddress: recipientEmail
 				},
-				function(result) {
-					if (!result || result.status !== 'success') {
-						// FIXME: a model should not show dialogs
-						OC.dialogs.alert(result.data.message, t('core', 'Error while sending notification'));
-						deferred.reject();
-					} else {
-						deferred.resolve();
-					}
+				dataType: 'json'
 			});
-
-			return deferred.promise();
 		},
 
 		/**