Validate email address and improve register dialog

3 files changed, 17 insertions, 41 deletions

diff --git a/lib/Controller/PreferencesController.php b/lib/Controller/PreferencesController.php
index f0ee44ab..26d6832f 100644
--- a/lib/Controller/PreferencesController.php
+++ b/lib/Controller/PreferencesController.php
@@ -25,13 +25,10 @@ namespace OCA\Polls\Controller;
 
 use OCP\AppFramework\Db\DoesNotExistException;
 
-
 use OCP\IRequest;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
-
-
 use OCA\Polls\Db\Preferences;
 use OCA\Polls\Db\PreferencesMapper;
 
@@ -39,11 +36,6 @@ class PreferencesController extends Controller {
 	private $userId;
 	private $preferencesMapper;
 
-	private $groupManager;
-	private $pollMapper;
-	private $anonymizer;
-	private $acl;
-
 	/**
 	 * PreferencesController constructor.
 	 * @param string $appName
@@ -62,13 +54,11 @@ class PreferencesController extends Controller {
 		$this->preferencesMapper = $preferencesMapper;
 	}
 
-
 	/**
 	 * get
 	 * Read all preferences
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
-	 * @param integer $pollId
 	 * @return DataResponse
 	 */
 	public function get() {
@@ -81,12 +71,9 @@ class PreferencesController extends Controller {
 
 	/**
 	 * write
-	 * Write a new comment to the db and returns the new comment as array
+	 * Write wreferences
 	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param int $pollId
-	 * @param string $userId
-	 * @param string $message
+	 * @param int $settings
 	 * @return DataResponse
 	 */
 	public function write($settings) {
@@ -110,26 +97,4 @@ class PreferencesController extends Controller {
 		return new DataResponse($preferences, Http::STATUS_OK);
 	}
 
-	// /**
-	//  * delete
-	//  * Delete Preferences
-	//  * @NoAdminRequired
-	//  * @param int $pollId
-	//  * @param string $message
-	//  * @return DataResponse
-	//  */
-	// public function delete($userId) {
-	// 	if (!\OC::$server->getUserSession()->isLoggedIn()) {
-	// 		return new DataResponse(null, Http::STATUS_UNAUTHORIZED);
-	// 	}
-	//
-	// 	try {
-	// 		$this->preferencesMapper->delete($userId);
-	// 	} catch (\Exception $e) {
-	// 		return new DataResponse($e, Http::STATUS_CONFLICT);
-	// 	}
-	//
-	// 	return new DataResponse(['deleted' => $userId], Http::STATUS_OK);
-	//
-	// }
 }
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index c3b0527e..a64f9f58 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -26,7 +26,7 @@ namespace OCA\Polls\Controller;
 use Exception;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCA\Polls\Exceptions\NotAuthorizedException;
-use OCA\Polls\Exceptions\InvalidUsername;
+use OCA\Polls\Exceptions\InvalidUsernameException;
 use OCA\Polls\Exceptions\InvalidShareType;
 
 
@@ -92,7 +92,7 @@ class ShareController extends Controller {
 	}
 
 	/**
-	 * Add share
+	 * Get share
 	 * @NoAdminRequired
 	 * @param int $pollId
 	 * @param int $pollId
@@ -112,8 +112,9 @@ class ShareController extends Controller {
 	}
 
 	/**
-	 * Add share
+	 * Set email address
 	 * @NoAdminRequired
+	 * @PublicPage
 	 * @param int $pollId
 	 * @param int $pollId
 	 * @param string $type
@@ -147,7 +148,7 @@ class ShareController extends Controller {
 			return new DataResponse($this->shareService->personal($token, $userName, $emailAddress), Http::STATUS_CREATED);
 		} catch (NotAuthorizedException $e) {
 			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
-		} catch (InvalidUsername $e) {
+		} catch (InvalidUsernameException $e) {
 			return new DataResponse(['error' => $userName . ' is not valid'], Http::STATUS_CONFLICT);
 		} catch (DoesNotExistException $e) {
 			// return forbidden in all not catched error cases
diff --git a/lib/Controller/SystemController.php b/lib/Controller/SystemController.php
index 1d2c6dfb..ea3a0be1 100644
--- a/lib/Controller/SystemController.php
+++ b/lib/Controller/SystemController.php
@@ -131,4 +131,14 @@ class SystemController extends Controller {
 	public function validatePublicUsername($pollId, $userName, $token) {
 		return new DataResponse(['result' => $this->systemService->validatePublicUsername($pollId, $userName, $token), 'name' => $userName], Http::STATUS_OK);
 	}
+
+	/**
+	 * Validate email address (simple validation)
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @return DataResponse
+	 */
+	public function validateEmailAddress($emailAddress) {
+		return new DataResponse(['result' => $this->systemService->validateEmailAddress($emailAddress), 'emailAddress' => $emailAddress], Http::STATUS_OK);
+	}
 }