completed move to v1 API, made specific API request class, started plugging in API authorization methodology
parent
d329522091
commit
f3339089ff
@ -1,115 +0,0 @@
|
||||
import DateUtils from '../../utils/tools/DateUtils';
|
||||
import StringUtils from '../../utils/tools/StringUtils';
|
||||
import * as DataEvent from '../../utils/events/DataEvent';
|
||||
import sanitize from 'sanitize-html';
|
||||
import RightsManager, {
|
||||
TASK_CREATE,
|
||||
TASK_UPDATE,
|
||||
OBJECT_POST
|
||||
} from '../../utils/tools/RightsManager';
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const multer = require('multer');
|
||||
const md = require('markdown-it')('commonmark');
|
||||
const fs = require('fs-extra');
|
||||
const dateUtils = new DateUtils();
|
||||
const rightsManager = new RightsManager();
|
||||
const uploadPath =
|
||||
'./public/assets/images/blog/' +
|
||||
dateUtils.getDate('year', new Date()) +
|
||||
'/' +
|
||||
dateUtils.getDate('month', new Date());
|
||||
const Sequelize = require('sequelize');
|
||||
const Op = Sequelize.Op;
|
||||
const _ = require('lodash');
|
||||
fs.ensureDir(uploadPath, () => {
|
||||
//console.log(err) // => null
|
||||
// dir has now been created, including the directory it is to be placed in
|
||||
});
|
||||
var storage = multer.diskStorage({
|
||||
destination: function(req, file, cb) {
|
||||
cb(null, uploadPath);
|
||||
},
|
||||
filename: function(req, file, cb) {
|
||||
var splice = file.originalname.split(':');
|
||||
cb(null, splice[0]);
|
||||
}
|
||||
});
|
||||
|
||||
var feature_upload = multer({
|
||||
storage: storage
|
||||
}).array('feature_image');
|
||||
var post_upload = multer({
|
||||
storage: storage
|
||||
}).array('post_image');
|
||||
//** SYNC POSTS */
|
||||
router.post('/sync', (req, res) => {
|
||||
let payload = req.body;
|
||||
});
|
||||
router.get('/json/:filter?', function(req, res) {
|
||||
var filter = req.params.filter;
|
||||
});
|
||||
/***
|
||||
POST IMAGE
|
||||
*/
|
||||
router.post('/add-post-image', function(req, res) {
|
||||
//console.log(req.body);
|
||||
if (!req.session.user)
|
||||
return res.json({
|
||||
message: 'You need to be logged in, champ.'
|
||||
});
|
||||
Models.User.findById(req.session.user.id).then(user => {
|
||||
if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) {
|
||||
post_upload(req, res, function(err) {
|
||||
if (err) {
|
||||
//console.log('Error in Saving Entry: ' + err);
|
||||
res.json({
|
||||
message: err
|
||||
});
|
||||
throw err;
|
||||
} else {
|
||||
var postImage = req.files[0].path;
|
||||
return res.json({
|
||||
message: DataEvent.POST_IMAGE_ADDED,
|
||||
url: postImage.substr(7, postImage.length)
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
res.json({
|
||||
message: "Nah. You can't do that. Talk to the admin, sport."
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
router.post('/add-feature-image', function(req, res) {
|
||||
//console.log(req.body);
|
||||
if (!req.session.user)
|
||||
return res.json({
|
||||
message: 'You need to be logged in, champ.'
|
||||
});
|
||||
Models.User.findById(req.session.user.id).then(user => {
|
||||
if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) {
|
||||
feature_upload(req, res, function(err) {
|
||||
if (err) {
|
||||
//console.log('Error in Saving Entry: ' + err);
|
||||
res.json({
|
||||
message: err
|
||||
});
|
||||
throw err;
|
||||
} else {
|
||||
var postImage = req.files[0].path;
|
||||
return res.json({
|
||||
message: DataEvent.FEATURE_IMAGE_ADDED,
|
||||
url: postImage.substr(7, postImage.length)
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
res.json({
|
||||
message: "Nah. You can't do that. Talk to the admin, sport."
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
module.exports = router;
|
@ -1,203 +0,0 @@
|
||||
import DateUtils from '../../utils/tools/DateUtils';
|
||||
import * as DataEvent from '../../utils/events/DataEvent';
|
||||
import RightsManager, {
|
||||
TASK_CREATE,
|
||||
TASK_UPDATE,
|
||||
OBJECT_POST,
|
||||
OBJECT_SETTINGS
|
||||
} from '../../utils/tools/RightsManager';
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const multer = require('multer');
|
||||
const fs = require('fs-extra');
|
||||
const dateUtils = new DateUtils();
|
||||
const rightsManager = new RightsManager();
|
||||
const uploadPath =
|
||||
'./public/assets/images/user/' +
|
||||
dateUtils.getDate('year', new Date()) +
|
||||
'/' +
|
||||
dateUtils.getDate('month', new Date());
|
||||
fs.ensureDir(uploadPath, () => {
|
||||
//console.log(err) // => null
|
||||
// dir has now been created, including the directory it is to be placed in
|
||||
});
|
||||
var storage = multer.diskStorage({
|
||||
destination: function(req, file, cb) {
|
||||
cb(null, uploadPath);
|
||||
},
|
||||
filename: function(req, file, cb) {
|
||||
var splice = file.originalname.split(':');
|
||||
cb(null, splice[0]);
|
||||
}
|
||||
});
|
||||
var avatar_upload = multer({
|
||||
storage: storage
|
||||
}).array('avatar_upload');
|
||||
var background_upload = multer({
|
||||
storage: storage
|
||||
}).array('background_upload');
|
||||
//** SYNC POSTS */
|
||||
router.post('/sync', (req, res) => {
|
||||
let payload = req.body;
|
||||
if (rightsManager.check(user.role, OBJECT_SETTINGS, TASK_UPDATE)) {
|
||||
fs.readJson('config/site-settings.json')
|
||||
.then(obj => {
|
||||
if (user.hande != payload.handle || user.email != payload.email) {
|
||||
user.update({
|
||||
handle: payload.handle,
|
||||
email: payload.email
|
||||
})
|
||||
.then(() => {
|
||||
//console.log('UPDATED');
|
||||
})
|
||||
.catch(() => {
|
||||
//console.log('ERR', err);
|
||||
});
|
||||
} else {
|
||||
//console.log('USER NOT UPDATED');
|
||||
}
|
||||
obj.url = payload.url;
|
||||
obj.title = payload.title;
|
||||
obj.description = payload.descriptions;
|
||||
obj.private = payload.private;
|
||||
obj.theme = payload.theme;
|
||||
obj.background = payload.background; //TODO: make this url relative
|
||||
//mail stuff
|
||||
obj.email.active = payload.mailSettings.activeProtocol;
|
||||
obj.email.smtp.domain = payload.mailSettings.smtp.domain;
|
||||
obj.email.smtp.email = payload.mailSettings.smtp.email;
|
||||
obj.email.smtp.password = payload.mailSettings.smtp.password;
|
||||
obj.email.mailgun.domain = payload.mailSettings.mailgun.domain;
|
||||
obj.email.mailgun['api-key'] = payload.mailSettings.mailgun.key;
|
||||
fs.writeJson('config/site-settings.json', obj)
|
||||
.then(() => {
|
||||
res.json({
|
||||
message: DataEvent.SETTINGS_UPDATED
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
//console.error(err);
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
//console.error(err);
|
||||
});
|
||||
} else {
|
||||
res.json({
|
||||
message: "Nah. You can't do that. Talk to the admin, sport."
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
router.get('/nav', function(req, res) {
|
||||
fs.readJson('config/site-settings.json')
|
||||
.then(obj => {
|
||||
fs.writeJson('config/site-settings.json', obj)
|
||||
.then(() => {
|
||||
res.json(obj.menu);
|
||||
})
|
||||
.catch(() => {
|
||||
//console.error(err);
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
//console.error(err);
|
||||
});
|
||||
});
|
||||
|
||||
router.post('/nav-sync', (req, res) => {
|
||||
let payload = req.body;
|
||||
if (rightsManager.check(user.role, OBJECT_SETTINGS, TASK_UPDATE)) {
|
||||
fs.readJson('config/site-settings.json')
|
||||
.then(obj => {
|
||||
obj.menu = payload;
|
||||
fs.writeJson('config/site-settings.json', obj)
|
||||
.then(() => {
|
||||
res.json({
|
||||
message: DataEvent.SETTINGS_UPDATED
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
//console.error(err);
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
//console.error(err);
|
||||
});
|
||||
} else {
|
||||
res.json({
|
||||
message: "Nah. You can't do that. Talk to the admin, sport."
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
/***
|
||||
UPLOAD AVATAR
|
||||
*/
|
||||
router.post('/add-avatar', function(req, res) {
|
||||
//console.log(req.body);
|
||||
if (!req.session.user)
|
||||
return res.json({
|
||||
message: 'You need to be logged in, champ.'
|
||||
});
|
||||
if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) {
|
||||
avatar_upload(req, res, function(err) {
|
||||
if (err) {
|
||||
res.json({
|
||||
message: err
|
||||
});
|
||||
throw err;
|
||||
} else {
|
||||
var avatar = req.files[0].path;
|
||||
user.update({
|
||||
avatar: avatar.substr(7, avatar.length)
|
||||
})
|
||||
.then(updated => {
|
||||
req.session.user = updated;
|
||||
})
|
||||
.catch(() => {
|
||||
//console.log('ERR', err);
|
||||
});
|
||||
return res.json({
|
||||
message: DataEvent.AVATAR_UPLOADED,
|
||||
url: avatar.substr(7, avatar.length)
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
res.json({
|
||||
message: "Nah. You can't do that. Talk to the admin, sport."
|
||||
});
|
||||
}
|
||||
});
|
||||
/***
|
||||
UPLOAD FEATURE BACKGROUND
|
||||
*/
|
||||
router.post('/add-feature-background', function(req, res) {
|
||||
//console.log(req.body);
|
||||
if (!req.session.user)
|
||||
return res.json({
|
||||
message: 'You need to be logged in, champ.'
|
||||
});
|
||||
if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) {
|
||||
background_upload(req, res, function(err) {
|
||||
if (err) {
|
||||
res.json({
|
||||
message: err
|
||||
});
|
||||
throw err;
|
||||
} else {
|
||||
var bgImage = req.files[0].path;
|
||||
return res.json({
|
||||
message: DataEvent.SITE_BACKGROUND_UPLOADED,
|
||||
url: bgImage.substr(7, bgImage.length)
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
res.json({
|
||||
message: "Nah. You can't do that. Talk to the admin, sport."
|
||||
});
|
||||
}
|
||||
});
|
||||
module.exports = router;
|
@ -0,0 +1,77 @@
|
||||
export const REQUEST_TYPE_POST = 'POST';
|
||||
export const REQUEST_TYPE_GET = 'GET';
|
||||
export const REQUEST_TYPE_PUT = 'PUT';
|
||||
export const REQUEST_TYPE_DELETE = 'DELETE';
|
||||
export const CONTENT_TYPE_JSON = 'json';
|
||||
export const CONTENT_TYPE_FORM = 'x-www-form-urlencoded';
|
||||
import * as DataEvent from '../events/DataEvent';
|
||||
export default class APIUtils {
|
||||
//--------------------------
|
||||
// constructor
|
||||
//--------------------------
|
||||
constructor() {
|
||||
this.percentComplete = 0;
|
||||
this.token = null;
|
||||
}
|
||||
//--------------------------
|
||||
// methods
|
||||
//--------------------------
|
||||
authStatus() {
|
||||
this.request('/api/v1/auth/status').then(r => {
|
||||
let response = JSON.parse(r.request['response']);
|
||||
if (response.type === DataEvent.API_REQUEST_GOOD) {
|
||||
this.token = response.token;
|
||||
} else {
|
||||
//don't set token
|
||||
}
|
||||
});
|
||||
}
|
||||
request(
|
||||
requestURL,
|
||||
eventType,
|
||||
requestType = REQUEST_TYPE_GET,
|
||||
contentType = CONTENT_TYPE_JSON,
|
||||
requestData = null
|
||||
) {
|
||||
var self = this;
|
||||
return new Promise(function(resolve, reject) {
|
||||
var request = new XMLHttpRequest();
|
||||
request.upload.onprogress = self.handleLoadProgress;
|
||||
request.open(requestType, requestURL, true);
|
||||
request.onload = () => {
|
||||
if (request.status == 200) {
|
||||
resolve({
|
||||
request,
|
||||
eventType
|
||||
});
|
||||
} else {
|
||||
reject({
|
||||
request,
|
||||
eventType
|
||||
});
|
||||
}
|
||||
};
|
||||
if (requestType == REQUEST_TYPE_PUT || requestType == REQUEST_TYPE_POST) {
|
||||
switch (contentType) {
|
||||
case CONTENT_TYPE_JSON:
|
||||
request.setRequestHeader('Content-type', 'application/' + contentType);
|
||||
request.send(JSON.stringify(requestData));
|
||||
break;
|
||||
case CONTENT_TYPE_FORM:
|
||||
request.send(requestData);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
request.send();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//--------------------------
|
||||
// event handlers
|
||||
//--------------------------
|
||||
handleLoadProgress(e) {
|
||||
this.percentComplete = Math.ceil((e.loaded / e.total) * 100);
|
||||
//this.emitEvent(DataEvent.UPLOAD_PROGRESS);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue