Skip to content

Commit 8cee84c

Browse files
committedMay 2, 2018
adds all user data into airtable
relates #96
1 parent 7c89173 commit 8cee84c

File tree

2 files changed

+34
-12
lines changed

2 files changed

+34
-12
lines changed
 

‎client/src/components/auth/UserInformationForm.js

-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ class UserInformationForm extends Component {
154154
}
155155

156156
handleFormSubmit(values) {
157-
console.log("values", values);
158157
this.props.registerUser(values, this.props.newApt);
159158
}
160159
}

‎server/controllers/auth.js

+34-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
1-
const queries = require('../database/db_queries');
2-
const airtable = require('../airtable/airtable_helpers');
3-
const { hashPassword } = require('../services/bcrypt');
4-
const jwt = require('jwt-simple');
1+
const queries = require("../database/db_queries");
2+
const airtable = require("../airtable/airtable_helpers");
3+
const { hashPassword } = require("../services/bcrypt");
4+
const jwt = require("jwt-simple");
55

66
const userToken = id => {
77
const timestamp = new Date().getTime();
88
return jwt.encode({ sub: id, iat: timestamp }, process.env.SECRET);
99
};
1010

1111
exports.signUp = (req, res) => {
12-
const { name, email, password, confirmPassword, postcode } = req.body;
12+
const {
13+
name,
14+
email,
15+
password,
16+
confirmPassword,
17+
postcode,
18+
dob,
19+
ethnicity,
20+
gender,
21+
sexuality
22+
} = req.body;
1323

14-
if (!name || !email || !password || !confirmPassword || !postcode) {
24+
const userObject = req.body;
25+
26+
if (
27+
!name ||
28+
!email ||
29+
!password ||
30+
!confirmPassword ||
31+
!postcode ||
32+
!dob ||
33+
!ethnicity ||
34+
!gender ||
35+
!sexuality
36+
) {
1537
return res
1638
.status(422)
17-
.send({ error: 'You must provide a name, email, location and password' });
39+
.send({ error: "You must provide a name, email, location and password" });
1840
} else if (password !== confirmPassword) {
1941
return res.status(422).send({ error: "Your passwords don't match!" });
2042
} else {
@@ -23,16 +45,17 @@ exports.signUp = (req, res) => {
2345
.then(user => {
2446
return new Promise((resolve, reject) => {
2547
if (user) {
26-
res.status(422).send({ error: 'Email is in use. Please log in.' });
27-
reject('Email is in use. Please log in');
48+
res.status(422).send({ error: "Email is in use. Please log in." });
49+
reject("Email is in use. Please log in");
2850
} else resolve(hashPassword(password));
2951
});
3052
})
3153
.then(hash => {
3254
return queries.addUser(name, email, hash);
3355
})
34-
.then(user => {
35-
return airtable.addUser(user);
56+
.then(userDb => {
57+
const userObject = { ...req.body, id: userDb.id };
58+
return airtable.addUser(userObject);
3659
})
3760
.then(userId => {
3861
res.json({ token: userToken(userId) });

0 commit comments

Comments
 (0)
Please sign in to comment.