Barış Soner Uşaklı
6 years ago
parent
a3541d887b
commit
3cc7ec63e8
@ -1,80 +1,59 @@
|
||||
'use strict';
|
||||
|
||||
var async = require('async');
|
||||
const util = require('util');
|
||||
|
||||
var db = require('../../database');
|
||||
var user = require('../../user');
|
||||
var helpers = require('../helpers');
|
||||
var accountHelpers = require('./helpers');
|
||||
const db = require('../../database');
|
||||
const user = require('../../user');
|
||||
const helpers = require('../helpers');
|
||||
const accountHelpers = require('./helpers');
|
||||
|
||||
var sessionController = module.exports;
|
||||
const sessionController = module.exports;
|
||||
|
||||
sessionController.get = function (req, res, callback) {
|
||||
var userData;
|
||||
|
||||
async.waterfall([
|
||||
function (next) {
|
||||
accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, next);
|
||||
},
|
||||
function (_userData, next) {
|
||||
userData = _userData;
|
||||
sessionController.get = async function (req, res, next) {
|
||||
const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
|
||||
if (!userData) {
|
||||
return callback();
|
||||
return next();
|
||||
}
|
||||
|
||||
user.auth.getSessions(userData.uid, req.sessionID, next);
|
||||
},
|
||||
function (sessions) {
|
||||
userData.sessions = sessions;
|
||||
|
||||
userData.sessions = await user.auth.getSessions(userData.uid, req.sessionID);
|
||||
userData.title = '[[pages:account/sessions]]';
|
||||
userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[pages:account/sessions]]' }]);
|
||||
|
||||
res.render('account/sessions', userData);
|
||||
},
|
||||
], callback);
|
||||
};
|
||||
|
||||
sessionController.revoke = function (req, res, next) {
|
||||
const getSessionAsync = util.promisify(function (sid, callback) {
|
||||
db.sessionStore.get(sid, (err, sessionObj) => callback(err, sessionObj || null));
|
||||
});
|
||||
|
||||
sessionController.revoke = async function (req, res, next) {
|
||||
if (!req.params.hasOwnProperty('uuid')) {
|
||||
return next();
|
||||
}
|
||||
|
||||
var _id;
|
||||
var uid = res.locals.uid;
|
||||
async.waterfall([
|
||||
function (next) {
|
||||
try {
|
||||
const uid = await user.getUidByUserslug(req.params.userslug);
|
||||
if (!uid) {
|
||||
return next(new Error('[[error:no-session-found]]'));
|
||||
}
|
||||
db.getSortedSetRange('uid:' + uid + ':sessions', 0, -1, next);
|
||||
},
|
||||
function (sids, done) {
|
||||
async.eachSeries(sids, function (sid, next) {
|
||||
db.sessionStore.get(sid, function (err, sessionObj) {
|
||||
if (err) {
|
||||
return next(err);
|
||||
throw new Error('[[error:no-session-found]]');
|
||||
}
|
||||
const sids = await db.getSortedSetRange('uid:' + uid + ':sessions', 0, -1);
|
||||
let _id;
|
||||
for (const sid of sids) {
|
||||
/* eslint-disable no-await-in-loop */
|
||||
const sessionObj = await getSessionAsync(sid);
|
||||
if (sessionObj && sessionObj.meta && sessionObj.meta.uuid === req.params.uuid) {
|
||||
_id = sid;
|
||||
done();
|
||||
} else {
|
||||
next();
|
||||
break;
|
||||
}
|
||||
});
|
||||
}, next);
|
||||
},
|
||||
function (next) {
|
||||
}
|
||||
|
||||
if (!_id) {
|
||||
return next(new Error('[[error:no-session-found]]'));
|
||||
throw new Error('[[error:no-session-found]]');
|
||||
}
|
||||
|
||||
user.auth.revokeSession(_id, uid, next);
|
||||
},
|
||||
], function (err) {
|
||||
if (err) {
|
||||
await user.auth.revokeSession(_id, uid);
|
||||
} catch (err) {
|
||||
return res.status(500).send(err.message);
|
||||
}
|
||||
return res.sendStatus(200);
|
||||
});
|
||||
|
||||
res.sendStatus(200);
|
||||
};
|
||||
|
||||
@ -1,57 +1,40 @@
|
||||
'use strict';
|
||||
|
||||
const nconf = require('nconf');
|
||||
|
||||
var async = require('async');
|
||||
var nconf = require('nconf');
|
||||
const db = require('../../database');
|
||||
const helpers = require('../helpers');
|
||||
const meta = require('../../meta');
|
||||
const pagination = require('../../pagination');
|
||||
const accountHelpers = require('./helpers');
|
||||
|
||||
var db = require('../../database');
|
||||
var helpers = require('../helpers');
|
||||
var meta = require('../../meta');
|
||||
var pagination = require('../../pagination');
|
||||
var accountHelpers = require('./helpers');
|
||||
const uploadsController = module.exports;
|
||||
|
||||
var uploadsController = module.exports;
|
||||
|
||||
uploadsController.get = function (req, res, callback) {
|
||||
var userData;
|
||||
|
||||
var page = Math.max(1, parseInt(req.query.page, 10) || 1);
|
||||
var itemsPerPage = 25;
|
||||
|
||||
async.waterfall([
|
||||
function (next) {
|
||||
accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, next);
|
||||
},
|
||||
function (_userData, next) {
|
||||
userData = _userData;
|
||||
uploadsController.get = async function (req, res, next) {
|
||||
const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
|
||||
if (!userData) {
|
||||
return callback();
|
||||
return next();
|
||||
}
|
||||
|
||||
var start = (page - 1) * itemsPerPage;
|
||||
var stop = start + itemsPerPage - 1;
|
||||
async.parallel({
|
||||
itemCount: function (next) {
|
||||
db.sortedSetCard('uid:' + userData.uid + ':uploads', next);
|
||||
},
|
||||
uploadNames: function (next) {
|
||||
db.getSortedSetRevRange('uid:' + userData.uid + ':uploads', start, stop, next);
|
||||
},
|
||||
}, next);
|
||||
},
|
||||
function (results) {
|
||||
userData.uploads = results.uploadNames.map(function (uploadName) {
|
||||
const page = Math.max(1, parseInt(req.query.page, 10) || 1);
|
||||
const itemsPerPage = 25;
|
||||
const start = (page - 1) * itemsPerPage;
|
||||
const stop = start + itemsPerPage - 1;
|
||||
const [itemCount, uploadNames] = await Promise.all([
|
||||
db.sortedSetCard('uid:' + userData.uid + ':uploads'),
|
||||
db.getSortedSetRevRange('uid:' + userData.uid + ':uploads', start, stop),
|
||||
]);
|
||||
|
||||
userData.uploads = uploadNames.map(function (uploadName) {
|
||||
return {
|
||||
name: uploadName,
|
||||
url: nconf.get('upload_url') + uploadName,
|
||||
};
|
||||
});
|
||||
var pageCount = Math.ceil(results.itemCount / itemsPerPage);
|
||||
const pageCount = Math.ceil(itemCount / itemsPerPage);
|
||||
userData.pagination = pagination.create(page, pageCount, req.query);
|
||||
userData.privateUploads = meta.config.privateUploads === 1;
|
||||
userData.title = '[[pages:account/uploads, ' + userData.username + ']]';
|
||||
userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[global:uploads]]' }]);
|
||||
res.render('account/uploads', userData);
|
||||
},
|
||||
], callback);
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue