Vue Rerender function
This commit is contained in:
+17
-7
@@ -12,6 +12,16 @@ const ldap = require ('./ldap_ohm'),
|
||||
const serverVisibleSession = { user: true, name: true, type: true, mail: true, roles: true, gender: true, deactivated: true, host: true };
|
||||
const clientVisibleSession = { user: true, name: true, type: true, mail: true, roles: true, gender: true };
|
||||
|
||||
// Return user role, query from found.mail
|
||||
function getUserRole(found) {
|
||||
var roles = "user";
|
||||
var mail = found.mail;
|
||||
if (!/\d/.test(mail)) {
|
||||
// Mail contains no number
|
||||
roles += ',"author"';
|
||||
}
|
||||
return roles;
|
||||
}
|
||||
|
||||
// Fill in session object
|
||||
function fillSession (req, user, roles, cb) {
|
||||
@@ -22,7 +32,7 @@ function fillSession (req, user, roles, cb) {
|
||||
req.session.regenerate (function (err) {
|
||||
if (user !== undefined && ! err) {
|
||||
common.shallowCopy (user, serverVisibleSession, {roles: true}, req.session);
|
||||
console.info(req.session);
|
||||
// console.info(req.session);
|
||||
if (user._id) {
|
||||
req.session.user = user._id;
|
||||
}
|
||||
@@ -37,7 +47,7 @@ function fillSession (req, user, roles, cb) {
|
||||
|
||||
// Save found user into DB, if not already exists
|
||||
function saveFoundToDB(found, cb) {
|
||||
console.info(found);
|
||||
// console.info(found);
|
||||
Users.findById(found.user)
|
||||
.exec(function(err, result){
|
||||
if (err) {
|
||||
@@ -52,15 +62,15 @@ function saveFoundToDB(found, cb) {
|
||||
mail: found.mail,
|
||||
type: found.type,
|
||||
gender: found.gender,
|
||||
// abos: '',
|
||||
// bookmarks: '',
|
||||
roles: 'user',
|
||||
abos: '',
|
||||
bookmarks: '',
|
||||
roles: getUserRole(found),
|
||||
}, function(err, done) {
|
||||
if (err) {
|
||||
console.error("User creation: Failed");
|
||||
console.error(err);
|
||||
} else {
|
||||
console.info("New User created!");
|
||||
console.info("User created: "+ found.user);
|
||||
}
|
||||
if (done == null) {
|
||||
console.error("Can not create user.");
|
||||
@@ -158,7 +168,7 @@ const authorization = {
|
||||
console.error(err);
|
||||
}
|
||||
});
|
||||
console.info(req.session);
|
||||
// console.info(req.session);
|
||||
return res.json ({});
|
||||
});
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user