tforgione/adejs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Error if user already exists, clean user

Browse Source
This commit is contained in:
Thomas Forgione
2017-09-29 10:30:19 +02:00
parent dff2c4bbb8
commit aa88b397d8
6 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/auth/views.js
View File

@@ -61,6 +61,11 @@ module.exports.signupTarget = function(req, res, render) {
require('crypto').randomBytes(48, function(err, buffer) {
user.activationKey = buffer.toString('hex');
user.save((err) => {
if (err !== undefined) {
return res.redirect(getUrl('signup'));
}
res.locals.user = user;
let baseUrl =

2
controllers/index/templates/index.pug
View File

@@ -2,7 +2,7 @@ extends ../../../templates/base.pug
block content
.jumbotron
h1.display-3 Welcome#{session.user !== undefined ? ', ' + session.user._username.value : ' on ADEjs'}!
h1.display-3 Welcome#{session.user !== undefined ? ', ' + session.user.username : ' on ADEjs'}!
if session.user === undefined
p.lead.
On this site, you can subscribe, set your calendar information

8
controllers/settings/templates/settings.pug
View File

@@ -6,25 +6,25 @@ block content
.col-2
label.col-2.col-form-label(for="username") Username
.col-6
input.form-control(type="text", value=session.user._username.value, disabled, name="username", id="username")
input.form-control(type="text", value=session.user.username, disabled, name="username", id="username")
.col-2
.form-group.row
.col-2
label.col-2.col-form-label(for="email") Email
.col-6
input.form-control(type="email", value=session.user._email.value, disabled, name="email", id="email")
input.form-control(type="email", value=session.user.email, disabled, name="email", id="email")
.col-2
.form-group.row
.col-2
label.col-2.col-form-label(for="resources") Resources
.col-6
input.form-control(type="number", value=session.user._resources.value, name="resources", id="resources")
input.form-control(type="number", value=session.user.resources, name="resources", id="resources")
.col-2
.form-group.row
.col-2
label.col-2.col-form-label(for="projectId") Project id
.col-6
input.form-control(type="number", value=session.user._projectId.value, name="projectId", id="projectId")
input.form-control(type="number", value=session.user.projectId, name="projectId", id="projectId")
.col-2
.form-group.row

2
controllers/settings/views.js
View File

@@ -15,7 +15,7 @@ module.exports.settingsTarget = function(req, res, render) {
return res.redirect(getUrl("settings"));
}
User.getById(req.session.user._id.value, (err, user) => {
User.getById(req.session.user.id, (err, user) => {
user.projectId = projectId;
user.resources = resources;