Peps
/
v3.0.0
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrote token handling and upload.js

This commit is contained in:
kanadeko 2017-01-17 16:54:25 -03:00
parent 79e786f3b8
commit a114d298d0
5 changed files with 140 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
controllers/tokenController.js Normal file
View File

@ -0,0 +1,27 @@
const config = require('../config.js')
const db = require('knex')(config.database)
let tokenController = {}
tokenController.verify = function(req, res, next){
let type = req.headers.type
let token = req.headers.token
if(type === undefined) return res.json({ success: false, description: 'No type provided.' })
if(token === undefined) return res.json({ success: false, description: 'No token provided.' })
if(type !== 'client' && type !== 'admin') return res.json({ success: false, description: 'Wrong type provided.' })
if(type === 'client'){
if(token !== config.clientToken) return res.json({ success: false, description: 'Token mismatch.' })
return res.json({ success: true })
}
if(type === 'admin'){
if(token !== config.adminToken) return res.json({ success: false, description: 'Token mismatch.' })
return res.json({ success: true })
}
return res.json({ success: false, description: '(╯°□°）╯︵ ┻━┻' })
}
module.exports = tokenController

2
pages/home.html
View File

@ -45,8 +45,6 @@
<div class="column"></div>
</div>
<div id="uploads">
<div id="template" class="columns">
<div class="column">

2
public/js/panel.js
View File

@ -34,7 +34,7 @@ window.onload = function () {
// xhr.responseText
}
}
xhr.open('GET', '/api/verify', true);
xhr.open('GET', '/api/token/verify', true);
xhr.setRequestHeader('type', 'admin');
xhr.setRequestHeader('token', document.getElementById('token').value);
xhr.send(null);

116
public/js/upload.js
View File

@ -1,36 +1,77 @@
var upload = {};
window.onload = function () {
upload.isPrivate = true;
upload.token = localStorage.token;
var USINGTOKEN;
var maxSize = '512';
// First check to see if the service is using token or not
upload.checkIfPublic = function(){
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if (xhr.readyState == XMLHttpRequest.DONE) {
USINGTOKEN = JSON.parse(xhr.responseText).private;
prepareTokenThing();
upload.isPublic = JSON.parse(xhr.responseText).private;
upload.preparePage();
}
}
xhr.open('GET', '/api/check', true);
xhr.send(null);
}
function prepareTokenThing(){
if(!USINGTOKEN) return getInfo();
if(!localStorage.token){
upload.preparePage = function(){
if(!upload.isPrivate) return upload.prepareUpload();
if(!upload.token){
document.getElementById('tokenSubmit').addEventListener('click', function(){
getInfo(document.getElementById('token').value)
upload.verifyToken(document.getElementById('token').value)
});
return document.getElementById('tokenContainer').style.display = 'flex';
document.getElementById('tokenContainer').style.display = 'flex';
return;
}
upload.verifyToken(upload.token, true);
}
upload.verifyToken = function(token, reloadOnError = false){
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if (xhr.readyState == XMLHttpRequest.DONE) {
var json = JSON.parse(xhr.responseText);
if(json.success === false){
alert(json.description);
if(reloadOnError){
localStorage.removeItem("token");
location.reload();
}
return;
}
getInfo(localStorage.token);
localStorage.token = token;
upload.token = token;
return upload.prepareUpload();
}
}
xhr.open('GET', '/api/token/verify', true);
xhr.setRequestHeader('type', 'client');
xhr.setRequestHeader('token', token);
xhr.send(null);
}
function prepareDropzone(){
upload.prepareUpload = function(){
div = document.createElement('div');
div.id = 'dropzone';
div.innerHTML = 'Click here or drag and drop files';
div.style.display = 'flex';
document.getElementById('btnGithub').style.display = 'none';
document.getElementById('tokenContainer').style.display = 'none';
document.getElementById('uploadContainer').appendChild(div);
document.getElementById('panel').style.display = 'block';
upload.prepareDropzone();
}
upload.prepareDropzone = function(){
var previewNode = document.querySelector('#template');
previewNode.id = '';
@ -40,7 +81,6 @@ window.onload = function () {
var dropzone = new Dropzone('div#dropzone', {
url: '/api/upload',
paramName: 'files[]',
maxFilesize: maxSize,
parallelUploads: 2,
uploadMultiple: false,
previewsContainer: 'div#uploads',
@ -84,44 +124,8 @@ window.onload = function () {
});
}
}
function getInfo(token) {
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if (xhr.readyState == XMLHttpRequest.DONE) {
if(xhr.responseText === 'not-authorized')
return notAuthorized();
div = document.createElement('div');
div.id = 'dropzone';
div.innerHTML = 'Click here or drag and drop files';
div.style.display = 'flex';
document.getElementById('btnGithub').style.display = 'none';
document.getElementById('tokenContainer').style.display = 'none';
document.getElementById('uploadContainer').appendChild(div);
document.getElementById('panel').style.display = 'block';
if(xhr.responseText.maxFileSize) maxSize = JSON.parse(xhr.responseText).maxFileSize;
if(token) localStorage.token = token;
prepareDropzone();
}
}
xhr.open('GET', '/api/info', true);
if(token !== undefined)
xhr.setRequestHeader('auth', token);
xhr.send(null);
}
function notAuthorized() {
localStorage.removeItem("token");
location.reload();
}
window.onload = function () {
upload.checkIfPublic();
};

24
routes/api.js
View File

@ -2,33 +2,12 @@ const config = require('../config.js')
const routes = require('express').Router()
const uploadController = require('../controllers/uploadController')
const galleryController = require('../controllers/galleryController')
const tokenController = require('../controllers/tokenController')
routes.get ('/check', (req, res, next) => {
return res.json({ private: config.private })
})
routes.get ('/verify', (req, res, next) => {
let type = req.headers.type
let token = req.headers.token
if(type === undefined) return res.json({ success: false, description: 'No type provided.' })
if(token === undefined) return res.json({ success: false, description: 'No token provided.' })
if(type !== 'client' && type !== 'admin') return res.json({ success: false, description: 'Wrong type provided.' })
if(type === 'client'){
if(token !== config.clientToken) return res.json({ success: false, description: 'Token mismatch.' })
return res.json({ success: true })
}
if(type === 'admin'){
if(token !== config.adminToken) return res.json({ success: false, description: 'Token mismatch.' })
return res.json({ success: true })
}
return res.json({ success: false, description: '(╯°□°）╯︵ ┻━┻' })
})
routes.get('/info', (req, res, next) => {
if(config.private === true)
@ -44,5 +23,6 @@ routes.get ('/uploads', (req, res, next) => uploadController.list(req, res))
routes.post ('/upload', (req, res, next) => uploadController.upload(req, res, next))
routes.get ('/gallery', (req, res, next) => galleryController.list(req, res, next))
routes.get ('/gallery/test', (req, res, next) => galleryController.test(req, res, next))
routes.get ('/token/verify', (req, res, next) => tokenController.verify(req, res))
module.exports = routes