Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.gif
1 change: 1 addition & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@

['name' => 'system#get_site_users_and_groups', 'url' => '/siteusers/get', 'verb' => 'POST'],
['name' => 'system#validate_public_username', 'url' => '/check/username', 'verb' => 'POST'],
['name' => 'system#validate_email_address', 'url' => '/check/emailaddress/{emailAddress}', 'verb' => 'GET'],

// REST-API calls
['name' => 'poll_api#list', 'url' => '/api/v1.0/polls', 'verb' => 'GET'],
Expand Down
40 changes: 2 additions & 38 deletions lib/Controller/PreferencesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,17 @@

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;

class PreferencesController extends Controller {
private $userId;
private $preferencesMapper;

private $groupManager;
private $pollMapper;
private $anonymizer;
private $acl;

/**
* PreferencesController constructor.
* @param string $appName
Expand All @@ -62,13 +54,11 @@ public function __construct(
$this->preferencesMapper = $preferencesMapper;
}


/**
* get
* Read all preferences
* @NoAdminRequired
* @NoCSRFRequired
* @param integer $pollId
* @return DataResponse
*/
public function get() {
Expand All @@ -81,12 +71,9 @@ public function get() {

/**
* 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) {
Expand All @@ -109,27 +96,4 @@ public function write($settings) {

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);
//
// }
}
9 changes: 5 additions & 4 deletions lib/Controller/ShareController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
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;


Expand Down Expand Up @@ -92,7 +92,7 @@ public function add($pollId, $type, $userId = '', $userEmail = '') {
}

/**
* Add share
* Get share
* @NoAdminRequired
* @param int $pollId
* @param int $pollId
Expand All @@ -112,8 +112,9 @@ public function get($token) {
}

/**
* Add share
* Set email address
* @NoAdminRequired
* @PublicPage
* @param int $pollId
* @param int $pollId
* @param string $type
Expand Down Expand Up @@ -147,7 +148,7 @@ public function personal($token, $userName, $emailAddress = '') {
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
Expand Down
20 changes: 19 additions & 1 deletion lib/Controller/SystemController.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,24 @@ public function getSiteUsersAndGroups(
* @return DataResponse
*/
public function validatePublicUsername($pollId, $userName, $token) {
return new DataResponse(['result' => $this->systemService->validatePublicUsername($pollId, $userName, $token), 'name' => $userName], Http::STATUS_OK);
try {
return new DataResponse(['result' => $this->systemService->validatePublicUsername($pollId, $userName, $token), 'name' => $userName], Http::STATUS_OK);
} catch (\Exception $e) {
return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
}
}

/**
* Validate email address (simple validation)
* @NoAdminRequired
* @PublicPage
* @return DataResponse
*/
public function validateEmailAddress($emailAddress) {
try {
return new DataResponse(['result' => $this->systemService->validateEmailAddress($emailAddress), 'emailAddress' => $emailAddress], Http::STATUS_OK);
} catch (\Exception $e) {
return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@

use OCP\AppFramework\Http;

class InvalidUsername extends \Exception {
class InvalidEmailAddress extends \Exception {
/**
* InvalidUsername Constructor
* InvalidEmailAddress Constructor
* @param string $e exception message
*/
public function __construct($e = 'Invalid username') {
public function __construct($e = 'Invalid email address') {
parent::__construct($e);
}
public function getStatus() {
return Http::STATUS_CONFLICT;
return Http::STATUS_FORBIDDEN;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

use OCP\AppFramework\Http;

class UsernameInvalidException extends \Exception {
class InvalidUsernameException extends \Exception {
/**
* UsernameInvalidException Constructor
* InvalidUsernameException Constructor
* @param string $e exception message
*/
public function __construct($e = 'Username not allowed') {
Expand Down
2 changes: 1 addition & 1 deletion lib/Exceptions/NotAuthorizedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ public function __construct($e = 'Unauthorized') {
parent::__construct($e);
}
public function getStatus() {
return Http::STATUS_FORBIDDEN;
return Http::STATUS_UNAUTHORIZED;
}
}
33 changes: 16 additions & 17 deletions lib/Service/ShareService.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,18 @@
namespace OCA\Polls\Service;

use OCA\Polls\Exceptions\NotAuthorizedException;
use OCA\Polls\Exceptions\InvalidUsername;
use OCA\Polls\Exceptions\InvalidShareType;

use OCP\Security\ISecureRandom;

use OCA\Polls\Controller\SystemController;
use OCA\Polls\Db\ShareMapper;
use OCA\Polls\Db\Share;
use OCA\Polls\Model\Acl;

class ShareService {

/** @var SystemController */
private $systemController;
/** @var SystemService */
private $systemService;

/** @var ShareMapper */
private $shareMapper;
Expand All @@ -53,20 +51,20 @@ class ShareService {

/**
* ShareController constructor.
* @param SystemController $systemController
* @param SystemService $systemService
* @param ShareMapper $shareMapper
* @param Share $share
* @param MailService $mailService
* @param Acl $acl
*/
public function __construct(
SystemController $systemController,
SystemService $systemService,
ShareMapper $shareMapper,
Share $share,
MailService $mailService,
Acl $acl
) {
$this->systemController = $systemController;
$this->systemService = $systemService;
$this->shareMapper = $shareMapper;
$this->share = $share;
$this->mailService = $mailService;
Expand Down Expand Up @@ -142,12 +140,12 @@ public function add($pollId, $type, $userId, $userEmail = '') {
* @param string $token
* @param string $emailAddress
* @return Share
* @throws NotAuthorizedException
* @throws InvalidShareType
*/
public function setEmailAddress($token, $emailAddress) {
$this->share = $this->shareMapper->findByToken($token);
if ($this->share->getType() === 'external') {
// TODO: Simple validate email address
$this->systemService->validateEmailAddress($emailAddress);
$this->share->setUserEmail($emailAddress);
// TODO: Send confirmation
return $this->shareMapper->update($this->share);
Expand All @@ -164,17 +162,14 @@ public function setEmailAddress($token, $emailAddress) {
* @param string $userName
* @return Share
* @throws NotAuthorizedException
* @throws InvalidUsername
*/
public function personal($token, $userName, $emailAddress) {
public function personal($token, $userName, $emailAddress = '') {
$this->share = $this->shareMapper->findByToken($token);

// Return of validatePublicUsername is a DataResponse
$checkUsername = $this->systemController->validatePublicUsername($this->share->getPollId(), $userName, $token);
$this->systemService->validatePublicUsername($this->share->getPollId(), $userName, $token);

// if status is not 200, return DataResponse from validatePublicUsername
if ($checkUsername->getStatus() !== 200) {
throw new InvalidUsername;
if ($emailAddress) {
$this->systemService->validateEmailAddress($emailAddress);
}

if ($this->share->getType() === 'public') {
Expand All @@ -192,7 +187,11 @@ public function personal($token, $userName, $emailAddress) {
$this->share->setUserEmail($emailAddress);
$this->share->setInvitationSent(time());
$this->shareMapper->insert($this->share);
$this->mailService->sendInvitationMail($this->share->getToken());

if ($emailAddress) {
$this->mailService->sendInvitationMail($this->share->getToken());
}

return $this->share;
} elseif ($this->share->getType() === 'email') {
$this->share->setType('external');
Expand Down
29 changes: 23 additions & 6 deletions lib/Service/SystemService.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

use OCA\Polls\Exceptions\NotAuthorizedException;
use OCA\Polls\Exceptions\TooShortException;
use OCA\Polls\Exceptions\UsernameInvalidException;
use OCA\Polls\Exceptions\InvalidUsernameException;
use OCA\Polls\Exceptions\InvalidEmailAddress;

use OCP\IGroupManager;
use OCP\IUserManager;
Expand Down Expand Up @@ -69,11 +70,11 @@ public function __construct(
/**
* Validate string as email address
* @NoAdminRequired
* @param string $query
* @param string $emailAddress
* @return bool
*/
private function isValidEmail($email) {
return (!preg_match('/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/', $email)) ? false : true;
private function isValidEmail($emailAddress) {
return (!preg_match('/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/', $emailAddress)) ? false : true;
}


Expand Down Expand Up @@ -327,6 +328,22 @@ public function getSiteUsersAndGroups(
return $list;
}

/**
* Validate it the user name is reservrd
* return false, if this username already exists as a user or as
* a participant of the poll
* @NoAdminRequired
* @return Boolean
* @throws InvalidEmailAddress
*/
public function validateEmailAddress($emailAddress) {
if (!$this->isValidEmail($emailAddress)) {
throw new InvalidEmailAddress;
}
return true;
}


/**
* Validate it the user name is reservrd
* return false, if this username already exists as a user or as
Expand All @@ -335,7 +352,7 @@ public function getSiteUsersAndGroups(
* @return Boolean
* @throws NotAuthorizedException
* @throws TooShortException
* @throws UsernameInvalidException
* @throws InvalidUsernameException
*/
public function validatePublicUsername($pollId, $userName, $token) {

Expand Down Expand Up @@ -403,7 +420,7 @@ public function validatePublicUsername($pollId, $userName, $token) {
// return forbidden, if list contains requested username
foreach ($list as $element) {
if (strtolower(trim($userName)) === strtolower(trim($element['id'])) || strtolower(trim($userName)) === strtolower(trim($element['displayName']))) {
throw new UsernameInvalidException;
throw new InvalidUsernameException;
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/js/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ export default {
--icon-polls-handle: url('./assets/handle.svg');
--icon-polls-mail: url('./assets/mail.svg');
--icon-polls-sidebar-toggle: url('./assets/sidebar-toggle.svg');
--icon-polls-loading: url('./assets/loading-small.gif');

// filters to colorize background svg from black
// generated with https://codepen.io/jsm91/embed/ZEEawyZ?height=600&default-tab=result&embed-version=2
Expand Down Expand Up @@ -260,12 +261,19 @@ input {
border-color: var(--color-error);
background-color: var(--color-background-error);
background-image: var(--icon-polls-no);
color: var(--color-text-maxcontrast);
}

&.checking {
border-color: var(--color-warning);
background-image: var(--icon-polls-loading);
}

&.success, &.icon-confirm.success {
border-color: var(--color-success);
background-image: var(--icon-polls-yes);
background-color: var(--color-background-success) !important;
color: var(--color-text-maxcontrast);
}

&.icon {
Expand Down
Binary file added src/js/assets/loading-small.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading