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

Merge branch 'master' into OS-149-delete-all-users 

Conflicts:
	server/controllers/system.php
This commit is contained in:
AntonyAntonio 2017-01-14 13:42:08 -03:00
parent 1d514dda58 9f1a1cb09c
commit a9b52d7ed9
24 changed files with 653 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
client/src/core-components/toggle-list.js Normal file
View File

@ -0,0 +1,63 @@
import React from 'react';
import _ from 'lodash';
import classNames from 'classnames';
class ToggleList extends React.Component {
static propTypes = {
items: React.PropTypes.arrayOf(React.PropTypes.shape({
content: React.PropTypes.node
})),
onChange: React.PropTypes.func
};
state = {
selected: []
};
render() {
return (
<div className="toggle-list">
{this.props.items.map(this.renderItem.bind(this))}
</div>
);
}
renderItem(obj, index) {
return (
<div className={this.getItemClass(index)} onClick={this.selectItem.bind(this, index)} key={index}>
{obj.content}
</div>
);
}
getItemClass(index) {
let classes = {
'toggle-list__item': true,
'toggle-list__first-item': (index === 0),
'toggle-list__selected': _.includes(this.state.selected, index)
};
return classNames(classes);
}
selectItem(index) {
let newSelected = _.clone(this.state.selected);
_.includes(this.state.selected, index) ? _.remove(newSelected, _index => _index == index) : newSelected.push(index);
this.setState({
selected: newSelected
});
if (this.props.onChange) {
this.props.onChange({
target: {
value: newSelected
}
});
}
}
}
export default ToggleList;

21
client/src/core-components/toggle-list.scss Normal file
View File

@ -0,0 +1,21 @@
@import "../scss/vars";
.toggle-list {
&__item {
border: 1px $light-grey solid;
border-left: none;
width: 180px;
height: 120px;
display: inline-block;
transition: background-color 0.4s ease;
}
&__selected {
background-color: $light-grey;
}
&__first-item {
border: 1px $light-grey solid;
}
}

8
server/controllers/system.php
View File

@ -9,8 +9,12 @@ require_once 'system/get-logs.php';
require_once 'system/get-mail-templates.php';
require_once 'system/edit-mail-template.php';
require_once 'system/recover-mail-template.php';
require_once 'system/get-stats.php';
require_once 'system/disable-registration.php';
require_once 'system/enable-registration.php';
require_once 'system/add-api-key.php';
require_once 'system/delete-api-key.php';
require_once 'system/get-all-keys.php';
require_once 'system/delete-all-users.php';
$systemControllerGroup = new ControllerGroup();
@ -28,6 +32,10 @@ $systemControllerGroup->addController(new EditMailTemplateController);
$systemControllerGroup->addController(new RecoverMailTemplateController);
$systemControllerGroup->addController(new DisableRegistrationController);
$systemControllerGroup->addController(new EnableRegistrationController);
$systemControllerGroup->addController(new GetStatsController);
$systemControllerGroup->addController(new AddAPIKeyController);
$systemControllerGroup->addController(new DeleteAPIKeyController);
$systemControllerGroup->addController(new GetAllKeyController);
$systemControllerGroup->addController(new DeleteAllUsersController);
$systemControllerGroup->finalize();

41
server/controllers/system/add-api-key.php Normal file
View File

@ -0,0 +1,41 @@
<?php
use Respect\Validation\Validator as DataValidator;
class AddAPIKeyController extends Controller {
const PATH = '/add-api-key';
public function validations() {
return [
'permission' => 'staff_3',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55)->alnum(),
'error' => ERRORS::INVALID_NAME
]
]
];
}
public function handler() {
$apiInstance = new APIKey();
$name = Controller::request('name');
$keyInstance = APIKey::getDataStore($name, 'name');
if($keyInstance->isNull()){
$token = Hashing::generateRandomToken();
$apiInstance->setProperties([
'name' => $name,
'token' => $token
]);
$apiInstance->store();
Response::respondSuccess($token);
} else {
Response::respondError(ERRORS::NAME_ALREADY_USED);
}
}
}

32
server/controllers/system/delete-api-key.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Respect\Validation\Validator as DataValidator;
class DeleteAPIKeyController extends Controller {
const PATH = '/delete-api-key';
public function validations() {
return [
'permission' => 'staff_3',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55)->alpha(),
'error' => ERRORS::INVALID_NAME
]
]
];
}
public function handler() {
$name = Controller::request('name');
$keyInstance = APIKey::getDataStore($name, 'name');
if($keyInstance->isNull()) {
Response::respondError(ERRORS::INVALID_NAME);
return;
}
$keyInstance->delete();
Response::respondSuccess();
}
}

1
server/controllers/system/edit-settings.php
View File

@ -1,5 +1,4 @@
<?php
use Respect\Validation\Validator as DataValidator;
class EditSettingsController extends Controller {
const PATH = '/edit-settings';

19
server/controllers/system/get-all-keys.php Normal file
View File

@ -0,0 +1,19 @@
<?php
use Respect\Validation\Validator as DataValidator;
class GetAllKeyController extends Controller {
const PATH = '/get-all-keys';
public function validations() {
return [
'permission' => 'staff_3',
'requestData' => []
];
}
public function handler() {
$apiList = APIKey::getAll();
Response::respondSuccess($apiList->toArray());
}
}

141
server/controllers/system/get-stats.php Normal file
View File

@ -0,0 +1,141 @@
<?php
use Respect\Validation\Validator as DataValidator;
class GetStatsController extends Controller {
const PATH = '/get-stats';
public function validations() {
return [
'permission' => 'staff_1',
'requestData' => [
'period' => [
'validation' => DataValidator::in(['week', 'month', 'quarter', 'year']),
'error' => ERRORS::INVALID_PERIOD
]
]
];
}
public function handler() {
$this->generationNewStats();
$staffId = Controller::request('staffId');
if($staffId) {
if($staffId !== Controller::getLoggedUser()->id && !Controller::isStaffLogged(3)) {
Response::respondError(ERRORS::NO_PERMISSION);
return;
}
$this->getStaffStat();
} else {
$this->getGeneralStat();
}
}
public function generationNewStats() {
$lastStatDay = Setting::getSetting('last-stat-day');
$previousCurrentDate = floor(Date::getPreviousDate() / 10000);
$currentDate = floor(Date::getCurrentDate() / 10000);
if($lastStatDay->value !== $previousCurrentDate) {
$begin = new DateTime($lastStatDay->value);
$end = new DateTime($currentDate);
$interval = new DateInterval('P1D');
$dateRange = new DatePeriod($begin, $interval ,$end);
$staffList = Staff::getAll();
foreach($dateRange as $date) {
$this->generateGeneralStat('CREATE_TICKET', $date);
$this->generateGeneralStat('CLOSE', $date);
$this->generateGeneralStat('SIGNUP', $date);
$this->generateGeneralStat('COMMENT', $date);
foreach($staffList as $staff) {
$assignments = Ticketevent::count('type=? AND author_staff_id=? AND date LIKE ?',['ASSIGN',$staff->id, $date->format('Ymd') . '%']);
$closed = Ticketevent::count('type=? AND author_staff_id=? AND date LIKE ?',['CLOSE',$staff->id, $date->format('Ymd') . '%']);
$statAssign = new Stat();
$statAssign->setProperties([
'date' => $date->format('Ymd'),
'type' => 'ASSIGN',
'general' => 0,
'value' => $assignments,
]);
$statClose = new Stat();
$statClose->setProperties([
'date' => $date->format('Ymd'),
'type' => 'CLOSE',
'general' => 0,
'value' => $closed,
]);
$staff->ownStatList->add($statAssign);
$staff->ownStatList->add($statClose);
$staff->store();
}
}
$lastStatDay->value = $currentDate;
$lastStatDay->store();
}
}
public function generateGeneralStat($type, $date) {
$value = Log::count('type=? AND date LIKE ?',[$type, $date->format('Ymd') . '%']);
$stat = new Stat();
$stat->setProperties([
'date' => $date->format('Ymd'),
'type' => $type,
'general' => 1,
'value' => $value,
]);
$stat->store();
}
public function getGeneralStat() {
$daysToRetrieve = $this->getDaysToRetrieve();
$statList = Stat::find('general=\'1\' ORDER BY id desc LIMIT ? ', [4 * $daysToRetrieve]);
Response::respondSuccess($statList->toArray());
}
public function getStaffStat() {
$staffId = Controller::request('staffId');
$daysToRetrieve = $this->getDaysToRetrieve();
$statList = Stat::find('general=\'0\' AND staff_id=? ORDER BY id desc LIMIT ? ', [$staffId, 4 * $daysToRetrieve]);
Response::respondSuccess($statList->toArray());
}
public function getDaysToRetrieve() {
$period = Controller::request('period');
$daysToRetrieve = 0;
switch ($period) {
case 'week':
$daysToRetrieve = 7;
break;
case 'month':
$daysToRetrieve = 30;
break;
case 'quarter':
$daysToRetrieve = 90;
break;
case 'year':
$daysToRetrieve = 365;
break;
}
return $daysToRetrieve;
}
}

3
server/controllers/system/init-settings.php
View File

@ -41,7 +41,8 @@ class InitSettingsController extends Controller {
'max-size' => 0,
'title' => 'Support Center',
'url' => 'http://www.opensupports.com/support',
'registration' => true
'registration' => true,
'last-stat-day' => '20170101' //TODO: get current date
]);
}

3
server/controllers/user/signup.php
View File

@ -37,6 +37,7 @@ class SignUpController extends Controller {
public function handler() {
$this->storeRequestData();
$apiKey = APIKey::getDataStore(Controller::request('apiKey'), 'token');
$existentUser = User::getUser($this->userEmail, 'email');
@ -51,7 +52,7 @@ class SignUpController extends Controller {
return;
}
if (!Setting::getSetting('registration')->value) {
if (!Setting::getSetting('registration')->value && $apiKey->isNull() ) {
Response::respondError(ERRORS::NO_PERMISSION);
return;
}

2
server/data/ERRORS.php
View File

@ -35,4 +35,6 @@ class ERRORS {
const INVALID_TEMPLATE = 'INVALID_TEMPLATE';
const INVALID_SUBJECT = 'INVALID_SUBJECT';
const INVALID_BODY = 'INVALID_BODY';
const INVALID_PERIOD = 'INVALID_PERIOD';
const NAME_ALREADY_USED = 'NAME_ALREADY_USED';
}

4
server/libs/Date.php
View File

@ -3,4 +3,8 @@ class Date {
public static function getCurrentDate() {
return date('YmdHi');
}
public static function getPreviousDate() {
return date('YmdHi', strtotime(' -1 day '));
}
}

3
server/libs/validations/captcha.php
View File

@ -8,8 +8,9 @@ class Captcha extends AbstractRule {
public function validate($reCaptchaResponse) {
$reCaptchaPrivateKey = \Setting::getSetting('recaptcha-private')->getValue();
$apiKey = \APIKey::getDataStore(\Controller::request('apiKey'), 'token');
if (!$reCaptchaPrivateKey) return true;
if (!$reCaptchaPrivateKey || !$apiKey->isNull()) return true;
$reCaptcha = new \ReCaptcha\ReCaptcha($reCaptchaPrivateKey);
$reCaptchaValidation = $reCaptcha->verify($reCaptchaResponse, $_SERVER['REMOTE_ADDR']);

18
server/models/APIKey.php Normal file
View File

@ -0,0 +1,18 @@
<?php
class APIKey extends DataStore {
const TABLE = 'apikey';
public static function getProps() {
return [
'name',
'token'
];
}
public function toArray() {
return [
'name' => $this->name,
'token' => $this->token
];
}
}

9
server/models/Log.php
View File

@ -9,7 +9,8 @@ class Log extends DataStore {
'type',
'authorUser',
'authorStaff',
'to'
'to',
'date'
];
}
@ -22,7 +23,8 @@ class Log extends DataStore {
$log->setProperties(array(
'type' => $type,
'to' => $to
'to' => $to,
'date' => Date::getCurrentDate()
));
if($author instanceof User) {
@ -44,7 +46,8 @@ class Log extends DataStore {
'name' => $author->name,
'id' => $author->id,
'staff' => $author instanceof Staff
]
],
'date' => $this->date
];
}
}

6
server/models/Staff.php
View File

@ -18,13 +18,15 @@ class Staff extends DataStore {
'level',
'sharedDepartmentList',
'sharedTicketList',
'lastLogin'
'lastLogin',
'ownStatList'
];
}
public function getDefaultProps() {
return [
'level' => 1
'level' => 1,
'ownStatList' => new DataStoreList()
];
}

25
server/models/Stat.php Normal file
View File

@ -0,0 +1,25 @@
<?php
class Stat extends DataStore {
const TABLE = 'stat';
public static function getProps() {
return array (
'date',
'type',
'general',
'value'
);
}
public function getDefaultProps() {
return array();
}
public function toArray() {
return [
'date' => $this->date,
'type' => $this->type,
'general' => $this->general,
'value' => $this->value
];
}
}

5
tests/init.rb
View File

@ -5,6 +5,7 @@ require 'uri'
require 'mysql'
require 'json'
require 'mechanize'
require 'date'
require './libs.rb'
require './scripts.rb'
@ -53,3 +54,7 @@ require './system/edit-mail-template.rb'
require './system/recover-mail-template.rb'
require './system/disable-registration.rb'
require './system/enable-registration.rb'
require './system/get-stats.rb'
require './system/add-api-key.rb'
require './system/delete-api-key.rb'
require './system/get-all-keys.rb'

4
tests/libs.rb
View File

@ -29,6 +29,10 @@ class Database
return queryResponse.fetch_hash
end
def query(query_string)
return @connection.query(query_string);
end
end
$database = Database.new

8
tests/scripts.rb
View File

@ -44,4 +44,12 @@ class Scripts
result['data']
end
def self.createAPIKey(name)
result = request('/system/add-api-key', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
name: name
})
end
end

30
tests/system/add-api-key.rb Normal file
View File

@ -0,0 +1,30 @@
describe'system/add-api-key' do
request('/user/logout')
Scripts.login($staff[:email], $staff[:password], true)
it 'should add API key' do
result= request('/system/add-api-key', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
name: 'new API'
})
(result['status']).should.equal('success')
row = $database.getRow('apikey', 1, 'id')
(row['name']).should.equal('new API')
(result['data']).should.equal(row['token'])
end
it 'should not add API key' do
result= request('/system/add-api-key', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
name: 'new API'
})
(result['status']).should.equal('fail')
(result['message']).should.equal('NAME_ALREADY_USED')
end
end

30
tests/system/delete-api-key.rb Normal file
View File

@ -0,0 +1,30 @@
describe'system/delete-api-key' do
request('/user/logout')
Scripts.login($staff[:email], $staff[:password], true)
it 'should not delete API key' do
result= request('/system/delete-api-key', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
name: 'new PIA'
})
(result['status']).should.equal('fail')
(result['message']).should.equal('INVALID_NAME')
end
it 'should delete API key' do
result= request('/system/delete-api-key', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
name: 'new API'
})
(result['status']).should.equal('success')
row = $database.getRow('apikey', 1, 'id')
(row).should.equal(nil)
end
end

26
tests/system/get-all-keys.rb Normal file
View File

@ -0,0 +1,26 @@
describe'system/get-all-keys' do
request('/user/logout')
Scripts.login($staff[:email], $staff[:password], true)
it 'should get all API keys' do
Scripts.createAPIKey('namekey1')
Scripts.createAPIKey('namekey2')
Scripts.createAPIKey('namekey3')
Scripts.createAPIKey('namekey4')
Scripts.createAPIKey('namekey5')
result= request('/system/get-all-keys', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
})
(result['status']).should.equal('success')
(result['data'][0]['name']).should.equal('namekey1')
(result['data'][1]['name']).should.equal('namekey2')
(result['data'][2]['name']).should.equal('namekey3')
(result['data'][3]['name']).should.equal('namekey4')
(result['data'][4]['name']).should.equal('namekey5')
end
end

160
tests/system/get-stats.rb Normal file
View File

@ -0,0 +1,160 @@
describe'/system/get-stats' do
request('/user/logout')
Scripts.login($staff[:email], $staff[:password], true)
it 'should get stats' do
d = Date.today.prev_day
yesterday = d.strftime("%Y%m%d%H%M")
d = Date.today.prev_day.prev_day
yesterday2 = d.strftime("%Y%m%d%H%M")
d = Date.today.prev_day.prev_day.prev_day
yesterday3 = d.strftime("%Y%m%d%H%M")
#day 1
for i in 0..5
$database.query("INSERT INTO log VALUES('', 'SIGNUP', NULL, " + yesterday3 + ", NULL, NULL);")
end
for i in 0..0
$database.query("INSERT INTO log VALUES('', 'CREATE_TICKET', NULL, " + yesterday3 + ", NULL, NULL);")
end
for i in 0..1
$database.query("INSERT INTO log VALUES('', 'CLOSE', NULL, " + yesterday3 + ", NULL, NULL);")
end
for i in 0..2
$database.query("INSERT INTO log VALUES('', 'COMMENT', NULL, " + yesterday3 + ", NULL, NULL);")
end
for i in 0..8
$database.query("INSERT INTO ticketevent VALUES('', 'CLOSE', NULL, " + yesterday3 + ", NULL, NULL, 1);")
end
for i in 0..4
$database.query("INSERT INTO ticketevent VALUES('', 'ASSIGN', NULL, " + yesterday3 + ", NULL, NULL, 1);")
end
#day 2
for i in 0..7
$database.query("INSERT INTO log VALUES('', 'SIGNUP', NULL, " + yesterday2 + ", NULL, NULL);")
end
for i in 0..2
$database.query("INSERT INTO log VALUES('', 'CREATE_TICKET', NULL, " + yesterday2 + ", NULL, NULL);")
end
for i in 0..9
$database.query("INSERT INTO log VALUES('', 'CLOSE', NULL, " + yesterday2 + ", NULL, NULL);")
end
for i in 0..2
$database.query("INSERT INTO log VALUES('', 'COMMENT', NULL, " + yesterday2 + ", NULL, NULL);")
end
for i in 0..10
$database.query("INSERT INTO ticketevent VALUES('', 'CLOSE', NULL, " + yesterday2 + ", NULL, NULL, 1);")
end
for i in 0..2
$database.query("INSERT INTO ticketevent VALUES('', 'ASSIGN', NULL, " + yesterday2 + ", NULL, NULL, 1);")
end
#day 3
for i in 0..0
$database.query("INSERT INTO log VALUES('', 'SIGNUP', NULL, " + yesterday + ", NULL, NULL);")
end
for i in 0..1
$database.query("INSERT INTO log VALUES('', 'CREATE_TICKET', NULL, " + yesterday + ", NULL, NULL);")
end
for i in 0..4
$database.query("INSERT INTO log VALUES('', 'CLOSE', NULL, " + yesterday + ", NULL, NULL);")
end
for i in 0..7
$database.query("INSERT INTO log VALUES('', 'COMMENT', NULL, " + yesterday + ", NULL, NULL);")
end
for i in 0..3
$database.query("INSERT INTO ticketevent VALUES('', 'CLOSE', NULL, " + yesterday + ", NULL, NULL, 1);")
end
for i in 0..7
$database.query("INSERT INTO ticketevent VALUES('', 'ASSIGN', NULL, " + yesterday + ", NULL, NULL, 1);")
end
@result = request('/system/get-stats', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
period: 'week'
})
def assertData(position, date, type, value)
(@result['data'][position]['date']).should.equal(date)
(@result['data'][position]['type']).should.equal(type)
(@result['data'][position]['value']).should.equal(value)
end
d = Date.today.prev_day
yesterday = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day
yesterday2 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day
yesterday3 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day
yesterday4 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day.prev_day
yesterday5 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day
yesterday6 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day
yesterday7 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day
yesterday8 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day
yesterday9 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day
yesterday10 = d.strftime("%Y%m%d")
d = Date.today.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day.prev_day
yesterday11 = d.strftime("%Y%m%d")
assertData(11, yesterday3, 'CREATE_TICKET', '1')
assertData(10, yesterday3, 'CLOSE', '2')
assertData(9, yesterday3, 'SIGNUP', '6')
assertData(8, yesterday3, 'COMMENT', '3')
assertData(7, yesterday2, 'CREATE_TICKET', '3')
assertData(6, yesterday2, 'CLOSE', '10')
assertData(5, yesterday2, 'SIGNUP', '8')
assertData(4, yesterday2, 'COMMENT', '3')
assertData(3, yesterday, 'CREATE_TICKET', '2')
assertData(2, yesterday, 'CLOSE', '5')
assertData(1, yesterday, 'SIGNUP', '1')
assertData(0, yesterday, 'COMMENT', '8')
@result = request('/system/get-stats', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
period: 'week',
staffId: '1'
})
assertData(0, yesterday, 'CLOSE', '4')
assertData(1, yesterday, 'ASSIGN', '8')
assertData(2, yesterday2, 'CLOSE', '11')
assertData(3, yesterday2, 'ASSIGN', '3')
assertData(4, yesterday3, 'CLOSE', '9')
assertData(5, yesterday3, 'ASSIGN', '5')
assertData(6, yesterday4, 'CLOSE', '0')
assertData(7, yesterday4, 'ASSIGN', '0')
assertData(8, yesterday5, 'CLOSE', '0')
assertData(9, yesterday5, 'ASSIGN', '0')
assertData(10, yesterday6, 'CLOSE', '0')
assertData(11, yesterday6, 'ASSIGN', '0')
assertData(12, yesterday7, 'CLOSE', '0')
assertData(13, yesterday7, 'ASSIGN', '0')
assertData(14, yesterday8, 'CLOSE', '0')
assertData(15, yesterday8, 'ASSIGN', '0')
assertData(16, yesterday9, 'CLOSE', '0')
assertData(17, yesterday9, 'ASSIGN', '0')
assertData(18, yesterday10, 'CLOSE', '0')
assertData(19, yesterday10, 'ASSIGN', '0')
assertData(20, yesterday11, 'CLOSE', '0')
assertData(21, yesterday11, 'ASSIGN', '0')
end
end