tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix assigment issues, login widget issues, recover password issues. Emails always on lowercase.

This commit is contained in:
Ivan Diaz 2018-08-14 15:21:36 -03:00
parent c994d6bc8b
commit eef4c8622d
16 changed files with 83 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/app-components/password-recovery.js
View File

@ -25,10 +25,11 @@ class PasswordRecovery extends React.Component {
};
render() {
const { renderLogo, formProps, onBackToLoginClick } = this.props;
return (
<Widget {...this.props} className="password-recovery__content">
<Widget {...this.props} className={this.getClass()} title={!renderLogo && i18n('RECOVER_PASSWORD')}>
{this.renderLogo()}
<Form {...this.props.formProps}>
<Form {...formProps}>
<div className="password-recovery__inputs">
<FormField placeholder={i18n('EMAIL_LOWERCASE')} name="email" className="password-recovery__input" validation="EMAIL" required/>
</div>
@ -36,7 +37,7 @@ class PasswordRecovery extends React.Component {
<SubmitButton type="primary">{i18n('RECOVER_PASSWORD')}</SubmitButton>
</div>
</Form>
<Button className="password-recovery__forgot-password" type="link" onClick={this.props.onBackToLoginClick} onMouseDown={(event) => {event.preventDefault()}}>
<Button className="password-recovery__forgot-password" type="link" onClick={onBackToLoginClick} onMouseDown={(event) => {event.preventDefault()}}>
{i18n('BACK_LOGIN_FORM')}
</Button>
{this.renderRecoverStatus()}
@ -44,6 +45,13 @@ class PasswordRecovery extends React.Component {
);
}
getClass() {
return classNames({
'password-recovery__content': true,
[this.props.className]: (this.props.className)
});
}
renderLogo() {
let logo = null;

17
client/src/app-components/ticket-viewer.js
View File

@ -120,7 +120,7 @@ class TicketViewer extends React.Component {
<DropDown className="ticket-viewer__editable-dropdown" items={priorityList} selectedIndex={priorities[ticket.priority]} onChange={this.onPriorityDropdownChanged.bind(this)} />
</div>
<div className="col-md-4">
{this.renderEditableOwnerNode()}
{this.renderAssignStaffList()}
</div>
<div className="col-md-4">
{ticket.closed ?
@ -173,19 +173,6 @@ class TicketViewer extends React.Component {
);
}
renderEditableOwnerNode() {
let ownerNode = null;
let {ticket, userId} = this.props;
if (_.isEmpty(ticket.owner) || ticket.owner.id == userId) {
ownerNode = this.renderAssignStaffList();
} else {
ownerNode = (this.props.ticket.owner) ? this.props.ticket.owner.name : i18n('NONE')
}
return ownerNode;
}
renderOwnerNode() {
let ownerNode = null;
@ -205,8 +192,6 @@ class TicketViewer extends React.Component {
let selectedIndex = _.findIndex(items, {id: ownerId});
selectedIndex = (selectedIndex !== -1) ? selectedIndex : 0;
console.log(selectedIndex);
return (
<DropDown
className="ticket-viewer__editable-dropdown" items={items}

8
client/src/app/admin/panel/staff/admin-panel-staff-members.js
View File

@ -23,7 +23,7 @@ class AdminPanelStaffMembers extends React.Component {
static propTypes = {
staffList: React.PropTypes.array,
loading: React.PropTypes.boolean,
loading: React.PropTypes.bool,
}
static defaultProps = {
@ -37,7 +37,7 @@ class AdminPanelStaffMembers extends React.Component {
};
componentDidMount() {
this.props.dispatch(AdminDataActions.retrieveStaffMembers());
this.retrieveStaffMembers();
}
render() {
@ -107,6 +107,10 @@ class AdminPanelStaffMembers extends React.Component {
return departments;
}
retrieveStaffMembers() {
this.props.dispatch(AdminDataActions.retrieveStaffMembers());
}
}
export default connect((store) => {

1
client/src/app/main/dashboard/dashboard-create-ticket/dashboard-create-ticket-page.js
View File

@ -1,6 +1,7 @@
import React from 'react';
import classNames from 'classnames';
import {connect} from 'react-redux';
import history from 'lib-app/history';
import SessionActions from 'actions/session-actions';
import CreateTicketForm from 'app/main/dashboard/dashboard-create-ticket/create-ticket-form';

4
client/src/core-components/widget-transition.js
View File

@ -79,13 +79,13 @@ class WidgetTransition extends React.Component {
rotateY: (this.props.sideToShow === 'front') ? spring(0, [100, 20]) : spring(180, [100, 20])
};
}
moveFocusToCurrentSide() {
let currentWidget;
let previousWidget;
if (this.props.sideToShow === 'front') {
currentWidget = this.primaryWidget;
currentWidget = this.primaryWidget;
previousWidget = this.secondaryWidget;
} else {
currentWidget = this.secondaryWidget;

4
server/Makefile
View File

@ -28,7 +28,9 @@ stop:
@docker stop opensupports-db && docker rm opensupports-db || true
@docker stop opensupports-myadmin && docker rm opensupports-myadmin || true
@docker stop opensupports-fakesmtp && docker rm opensupports-fakesmtp || true
@docker stop opensupports-srv
@docker stop opensupports-srv || true
@rm -rf .fakemail || true
@mkdir .fakemail
db:
@docker exec -it opensupports-db bash -c "mysql -u root" || echo "${red}Please execute 'make run' first${reset}"

21
server/controllers/staff/edit.php
View File

@ -80,14 +80,31 @@ class EditStaffController extends Controller {
}
if(Controller::request('departments') && Controller::isStaffLogged(3)) {
$this->staffInstance->sharedDepartmentList = $this->getDepartmentList();
$departmentList = $this->getDepartmentList();
$ticketList = $this->staffInstance->sharedTicketList;
$this->staffInstance->sharedDepartmentList = $departmentList;
foreach($ticketList as $ticket) {
if(!$departmentList->includesId($ticket->department->id)) {
if($ticket->isOwner($this->staffInstance) ) {
$ticket->owner = null;
}
if(!$ticket->isAuthor($this->staffInstance)) {
$this->staffInstance->sharedTicketList->remove($ticket);
}
$ticket->store();
}
}
}
if($fileUploader = $this->uploadFile(true)) {
$this->staffInstance->profilePic = ($fileUploader instanceof FileUploader) ? $fileUploader->getFileName() : null;
}
if(Controller::request('sendEmailOnNewTicket') !== null && Controller::request('sendEmailOnNewTicket') !== '' && $this->isModifyingCurrentStaff()) {
if(Controller::request('sendEmailOnNewTicket') !== null && Controller::request('sendEmailOnNewTicket') !== '' && $this->isModifyingCurrentStaff()) {
$this->staffInstance->sendEmailOnNewTicket = intval(Controller::request('sendEmailOnNewTicket'));
}

2
server/controllers/staff/un-assign-ticket.php
View File

@ -46,7 +46,7 @@ class UnAssignStaffController extends Controller {
$owner = $ticket->owner;
if($ticket->isOwner($user) || $user->level > 2) {
if(!$ticket->isAuthor($user)) {
if(!$ticket->isAuthor($owner)) {
$owner->sharedTicketList->remove($ticket);
$owner->store();
}

4
server/controllers/ticket/get.php
View File

@ -32,7 +32,7 @@ class TicketGetController extends Controller {
public function validations() {
$session = Session::getInstance();
if (Controller::isUserSystemEnabled() || Controller::isStaffLogged()) {
return [
'permission' => 'user',
@ -78,6 +78,6 @@ class TicketGetController extends Controller {
$user = Controller::getLoggedUser();
return (!Controller::isStaffLogged() && (Controller::isUserSystemEnabled() && $this->ticket->author->id !== $user->id)) ||
(Controller::isStaffLogged() && (($this->ticket->owner && $this->ticket->owner->id !== $user->id) && !$user->sharedDepartmentList->includesId($this->ticket->department->id)));
(Controller::isStaffLogged() && (!$user->sharedTicketList->includesId($this->ticket->id) && !$user->sharedDepartmentList->includesId($this->ticket->department->id)));
}
}

9
server/controllers/ticket/re-open.php
View File

@ -63,8 +63,13 @@ class ReOpenController extends Controller {
private function shouldDenyPermission() {
$user = Controller::getLoggedUser();
return (!Controller::isStaffLogged() && $this->ticket->author->id !== $user->id) ||
(Controller::isStaffLogged() && $this->ticket->owner && $this->ticket->owner->id !== $user->id);
return !(
$this->ticket->isAuthor($user) ||
(
Controller::isStaffLogged() &&
$user->sharedDepartmentList->includesId($this->ticket->department->id)
)
);
}
private function markAsUnread() {

5
server/controllers/user/recover-password.php
View File

@ -41,7 +41,10 @@ class RecoverPasswordController extends Controller {
'permission' => 'any',
'requestData' => [
'email' => [
'validation' => DataValidator::email()->userEmail(),
'validation' => DataValidator::oneOf(
DataValidator::email()->userEmail(),
DataValidator::email()->staffEmail()
),
'error' => ERRORS::INVALID_EMAIL
],
'password' => [

7
server/controllers/user/send-recover-password.php
View File

@ -38,7 +38,10 @@ class SendRecoverPasswordController extends Controller {
'permission' => 'any',
'requestData' => [
'email' => [
'validation' => DataValidator::email()->userEmail(),
'validation' => DataValidator::oneOf(
DataValidator::email()->userEmail(),
DataValidator::email()->staffEmail()
),
'error' => ERRORS::INVALID_EMAIL
]
]
@ -66,7 +69,7 @@ class SendRecoverPasswordController extends Controller {
$recoverPassword->setProperties(array(
'email' => $email,
'token' => $this->token,
'staff' => $this->staff
'staff' => !!$this->staff
));
$recoverPassword->store();

3
server/index.php
View File

@ -47,9 +47,10 @@ spl_autoload_register(function ($class) {
}
});
//Load custom validations
// LOAD CUSTOM VALIDATIONS
include_once 'libs/validations/dataStoreId.php';
include_once 'libs/validations/userEmail.php';
include_once 'libs/validations/staffEmail.php';
include_once 'libs/validations/captcha.php';
include_once 'libs/validations/validLanguage.php';
include_once 'libs/validations/validTicketNumber.php';

4
server/libs/Controller.php
View File

@ -55,6 +55,10 @@ abstract class Controller {
public static function request($key, $secure = false) {
$result = call_user_func(self::$dataRequester, $key);
if($key === 'email' || $key === 'newEmail') {
return strtolower($result);
}
if($secure) {
$config = HTMLPurifier_Config::createDefault();
$purifier = new HTMLPurifier($config);

14
server/libs/validations/staffEmail.php Normal file
View File

@ -0,0 +1,14 @@
<?php
namespace CustomValidations;
use Respect\Validation\Rules\AbstractRule;
class StaffEmail extends AbstractRule {
public function validate($email) {
$user = \Staff::getUser($email, 'email');
return !$user->isNull();
}
}

2
tests/staff/edit.rb
View File

@ -16,7 +16,7 @@ describe'/staff/edit' do
row = $database.getRow('staff', 3, 'id')
(row['email']).should.equal('LittleLannister@opensupports.com')
(row['email']).should.equal('littlelannister@opensupports.com')
(row['level']).should.equal('1')
rows = $database.getRow('department_staff', 3, 'staff_id')