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

Ivan - Fix uploading of files

This commit is contained in:
ivan 2017-02-18 15:28:23 -03:00
parent f9ad440bf2
commit d4263d4b94
16 changed files with 106 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/app-components/ticket-event.js
View File

@ -223,26 +223,9 @@ class TicketEvent extends React.Component {
const fileName = filePath.replace(/^.*[\\\/]/, '');
return (
<span onClick={this.onFileClick.bind(this, filePath)}>{fileName}</span>
<a href={API.getFileLink(filePath)}>{fileName}</a>
)
}
onFileClick(filePath) {
API.call({
path: '/system/download',
plain: true,
data: {
file: filePath
}
}).then((result) => {
let contentType = 'application/octet-stream';
let link = document.createElement('a');
let blob = new Blob([result], {'type': contentType});
link.href = window.URL.createObjectURL(blob);
link.download = filePath;
link.click();
});
}
}
export default TicketEvent;

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

@ -323,6 +323,7 @@ class TicketViewer extends React.Component {
API.call({
path: '/ticket/comment',
dataAsForm: true,
data: _.extend({
ticketNumber: this.props.ticket.ticketNumber
}, formState)

3
client/src/app/admin/admin-login-page.js
View File

@ -3,6 +3,7 @@ import _ from 'lodash';
import {connect} from 'react-redux';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
import SessionActions from 'actions/session-actions';
import Form from 'core-components/form';
@ -16,7 +17,7 @@ class AdminLoginPage extends React.Component {
return (
<div className="admin-login-page">
<Widget className="admin-login-page__content">
<div className="admin-login-page__image"><img width="100%" src="/images/logo.png" alt="OpenSupports Admin Panel"/></div>
<div className="admin-login-page__image"><img width="100%" src={API.getURL() + '/images/logo.png'} alt="OpenSupports Admin Panel"/></div>
<div className="admin-login-page__login-form">
<Form onSubmit={this.onSubmit.bind(this)} loading={this.props.session.pending}>
<FormField name="email" label={i18n('EMAIL')} field="input" validation="EMAIL" fieldProps={{size:'large'}} required />

3
client/src/app/admin/panel/admin-panel-staff-widget.js
View File

@ -3,6 +3,7 @@ import classNames from 'classnames';
import {connect} from 'react-redux';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
import Button from 'core-components/button';
import SessionActions from 'actions/session-actions';
@ -24,7 +25,7 @@ class AdminPanelStaffWidget extends React.Component {
</div>
</div>
<div className="admin-panel-staff-widget__profile-pic-wrapper">
<img className="admin-panel-staff-widget__profile-pic" src={this.props.session.userProfilePic} />
<img className="admin-panel-staff-widget__profile-pic" src={(this.props.session.userProfilePic) ? API.getFileLink(this.props.session.userProfilePic) : (API.getURL() + '/images/logo.png')} />
</div>
</div>
);

1
client/src/app/admin/panel/admin-panel-staff-widget.scss
View File

@ -8,6 +8,7 @@
text-align: center;
&__profile-pic-wrapper {
background-color: white;
position: absolute;
top: 8px;
border: 4px solid $grey;

3
client/src/app/admin/panel/staff/staff-editor.js
View File

@ -73,7 +73,7 @@ class StaffEditor extends React.Component {
</div>
<label className={this.getPictureWrapperClass()}>
<div className="staff-editor__card-pic-background"></div>
<img className="staff-editor__card-pic" src={this.props.profilePic} />
<img className="staff-editor__card-pic" src={(this.props.profilePic) ? API.getFileLink(this.props.profilePic) : (API.getURL() + '/images/logo.png')} />
{(this.state.loadingPicture) ? <Loading className="staff-editor__card-pic-loading" size="large"/> : <Icon className="staff-editor__card-pic-icon" name="upload" size="4x"/>}
<input className="staff-editor__image-uploader" type="file" multiple={false} accept="image/x-png,image/gif,image/jpeg" onChange={this.onProfilePicChange.bind(this)}/>
</label>
@ -306,6 +306,7 @@ class StaffEditor extends React.Component {
API.call({
path: '/staff/edit',
dataAsForm: true,
data: {
staffId: this.props.staffId,
file: event.target.files[0]

10
client/src/app/admin/panel/staff/staff-editor.scss
View File

@ -2,6 +2,10 @@
.staff-editor {
&__image-uploader {
opacity: 0;
}
&__card {
background-color: $primary-red;
position: relative;
@ -11,10 +15,6 @@
border: 2px solid $grey;
margin-bottom: 20px;
&__image-uploader {
opacity: 0;
}
&-pic {
height: 100%;
position: absolute;
@ -45,7 +45,7 @@
&-wrapper {
transition: opacity 0.2s ease;
background-color: $grey;
background-color: white;
position: absolute;
top: 20px;
border: 4px solid $grey;

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

@ -119,6 +119,7 @@ class CreateTicketForm extends React.Component {
API.call({
path: '/ticket/create',
dataAsForm: true,
data: _.extend({}, formState, {
captcha: captcha && captcha.getValue(),
departmentId: SessionStore.getDepartments()[formState.departmentIndex].id

44
client/src/lib-app/api-call.js
View File

@ -2,19 +2,35 @@ const _ = require('lodash');
const APIUtils = require('lib-core/APIUtils');
const SessionStore = require('lib-app/session-store');
const root = 'http://localhost:3000/api';
const url = 'http://localhost:3000';
const apiUrl = 'http://localhost:3000/api';
function processData (data) {
return _.extend({
csrf_token: SessionStore.getSessionData().token,
csrf_userid: SessionStore.getSessionData().userId
}, data);
function processData (data, dataAsForm = false) {
let newData;
if(dataAsForm) {
newData = new FormData();
_.each(data, (value, key) => {
newData.append(key, value);
});
newData.append('csrf_token', SessionStore.getSessionData().token);
newData.append('csrf_userid', SessionStore.getSessionData().userId);
} else {
newData = _.extend({
csrf_token: SessionStore.getSessionData().token,
csrf_userid: SessionStore.getSessionData().userId
}, data)
}
return newData;
}
module.exports = {
call: function ({path, data, plain}) {
call: function ({path, data, plain, dataAsForm}) {
return new Promise(function (resolve, reject) {
APIUtils.post(root + path, processData(data))
APIUtils.post(apiUrl + path, processData(data, dataAsForm), dataAsForm)
.then(function (result) {
console.log(result);
@ -33,5 +49,17 @@ module.exports = {
});
});
});
},
getFileLink(filePath) {
return apiUrl + '/system/download?file=' + filePath;
},
getAPIUrl() {
return apiUrl;
},
getURL() {
return url;
}
};

26
client/src/lib-core/APIUtils.js
View File

@ -3,15 +3,25 @@ const $ = require('jquery');
const APIUtils = {
getPromise(path, method, data) {
getPromise(path, method, data, dataAsForm) {
return (resolve, reject) => {
$.ajax({
let options = {
url: path,
method: method,
data: data,
processData: false,
contentType: false
})
data: data
};
if(dataAsForm) {
options = {
url: path,
type: method,
data: data,
processData: false,
contentType: false
};
}
$.ajax(options)
.done(resolve)
.fail((jqXHR, textStatus) => {
reject(textStatus);
@ -23,8 +33,8 @@ const APIUtils = {
return new Promise(this.getPromise(path, 'GET'));
},
post(path, data) {
return new Promise(this.getPromise(path, 'POST', data));
post(path, data, dataAsForm) {
return new Promise(this.getPromise(path, 'POST', data, dataAsForm));
},
patch(path, data) {

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

@ -57,8 +57,7 @@ class EditStaffController extends Controller {
$this->staffInstance->sharedDepartmentList = $this->getDepartmentList();
}
if(Controller::request('file')) {
$fileUploader = $this->uploadFile();
if($fileUploader = $this->uploadFile()) {
$this->staffInstance->profilePic = ($fileUploader instanceof FileUploader) ? $fileUploader->getFileName() : null;
}

31
server/controllers/system/download.php
View File

@ -8,7 +8,7 @@ class DownloadController extends Controller {
public function validations() {
return [
'permission' => 'user',
'permission' => 'any',
'requestData' => [
'file' => [
'validation' => DataValidator::alnum('_.-')->noWhitespace(),
@ -20,23 +20,32 @@ class DownloadController extends Controller {
public function handler() {
$fileName = Controller::request('file');
$staffUser = Staff::getDataStore($fileName, 'profilePic');
$loggedUser = Controller::getLoggedUser();
$ticket = Ticket::getTicket($fileName, 'file');
if($staffUser->isNull()) {
$loggedUser = Controller::getLoggedUser();
if($ticket->isNull() || ($this->isNotAuthor($ticket, $loggedUser) && $this->isNotOwner($ticket, $loggedUser))) {
$ticketEvent = Ticketevent::getDataStore($fileName, 'file');
if($ticketEvent->isNull()) {
if($loggedUser->isNull()) {
print '';
return;
}
$ticket = $ticketEvent->ticket;
$ticket = Ticket::getTicket($fileName, 'file');
if($this->isNotAuthor($ticket, $loggedUser) && $this->isNotOwner($ticket, $loggedUser)) {
print '';
return;
if($ticket->isNull() || ($this->isNotAuthor($ticket, $loggedUser) && $this->isNotOwner($ticket, $loggedUser))) {
$ticketEvent = Ticketevent::getDataStore($fileName, 'file');
if($ticketEvent->isNull()) {
print '';
return;
}
$ticket = $ticketEvent->ticket;
if($this->isNotAuthor($ticket, $loggedUser) && $this->isNotOwner($ticket, $loggedUser)) {
print '';
return;
}
}
}

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

@ -116,7 +116,7 @@ class InitSettingsController extends Controller {
'name' => 'Emilia Clarke',
'email' => 'staff@opensupports.com',
'password' => Hashing::hashPassword('staff'),
'profilePic' => 'http://www.opensupports.com/profilepic.jpg',
'profilePic' => '',
'level' => 3,
'sharedDepartmentList' => Department::getAll(),
'sharedTicketList' => []

10
server/libs/Controller.php
View File

@ -33,10 +33,10 @@ abstract class Controller {
self::$dataRequester = function ($key) {
$app = self::getAppInstance();
$value = $app->request()->post($key);
if(!$value) {
if (Controller::getAppInstance()->request()->isGet()) {
$value = $app->request()->get($key);
} else {
$value = $app->request()->post($key);
}
return $value;
@ -55,9 +55,9 @@ abstract class Controller {
$session = Session::getInstance();
if ($session->isStaffLogged()) {
return Staff::getUser((int)self::request('csrf_userid'));
return Staff::getUser($session->getUserId());
} else {
return User::getUser((int)self::request('csrf_userid'));
return User::getUser($session->getUserId());
}
}

10
server/models/Response.php
View File

@ -9,8 +9,9 @@ class Response {
);
$app = \Slim\Slim::getInstance();
$app->response()->setBody(json_encode($response));
$app->response()->finalize();
$app->response->headers->set('Content-Type', 'application/json');
$app->response->setBody(json_encode($response));
$app->response->finalize();
}
public static function respondSuccess($data = null) {
@ -20,7 +21,8 @@ class Response {
);
$app = \Slim\Slim::getInstance();
$app->response()->setBody(json_encode($response));
$app->response()->finalize();
$app->response->headers->set('Content-Type', 'application/json');
$app->response->setBody(json_encode($response));
$app->response->finalize();
}
}

4
server/models/Session.php
View File

@ -39,6 +39,10 @@ class Session {
return $this->getStoredData('ticketNumber');
}
public function getUserId() {
return $this->getStoredData('userId');
}
public function getToken() {
return $this->getStoredData('token');
}