ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 18:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed index.js and refactored it.

Browse Source
This commit is contained in:
Clayton Wilson 2019-10-01 15:27:24 -04:00
parent 311e8b3716
commit cc98fa7884
2 changed files with 143 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
functions/handlers/users.js
View File

@ -1,7 +1,138 @@
/* eslint-disable promise/catch-or-return */ /* eslint-disable promise/catch-or-return */
const {db} = require('../util/admin'); const {admin, db} = require('../util/admin');
const config = require('../util/config');
const {validateUpdateProfileInfo} = require('../util/validator'); const {validateUpdateProfileInfo} = require('../util/validator');
const firebase = require('firebase');
firebase.initializeApp(config);
exports.signup = (req, res) => {
const newUser = {
email: req.body.email,
handle: req.body.handle,
password: req.body.password,
confirmPassword: req.body.confirmPassword,
time: new Date().toISOString()
};
// console.log(newUser);
let errors = {};
const emailRegEx = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@(([[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
//Email check
if(newUser.email.trim() === '') {
errors.email = 'Email must not be blank.';
}
else if(!newUser.email.match(emailRegEx)) {
errors.email = 'Email is invalid.';
}
//handle check
if(newUser.handle.trim() === '') {
errors.handle = 'Username must not be blank.';
}
else if(newUser.handle.length < 4 || newUser.handle.length > 30) {
errors.handle = 'Username must be between 4-30 characters long.';
}
//Password check
if(newUser.password.trim() === '') {
errors.password = 'Password must not be blank.';
}
else if(newUser.password.length < 8 || newUser.password.length > 20) {
errors.password = 'Password must be between 8-20 characters long.';
}
//Confirm password check
if(newUser.confirmPassword !== newUser.password) {
errors.confirmPassword = 'Passwords must match.';
}
//Overall check
if(Object.keys(errors).length > 0) {
return res.status(400).json(errors);
}
let idToken, userId;
db.doc(`/users/${newUser.handle}`).get()
.then(doc => {
if(doc.exists) {
return res.status(400).json({ handle: 'This username is already taken.' });
}
return firebase.auth().createUserWithEmailAndPassword(newUser.email, newUser.password);
})
.then(data => {
userId = data.user.uid;
return data.user.getIdToken();
})
.then(token => {
idToken = token;
const userCred = {
email: req.body.email,
handle: newUser.handle,
time: newUser.time,
userId
}
return db.doc(`/users/${newUser.handle}`).set(userCred);
})
.then(() => {
return res.status(201).json({ idToken });
})
.catch(err => {
console.error(err);
if(err.code === 'auth/email-already-in-use') {
return res.status(500).json({ email: 'This email is already taken.' });
}
return res.status(500).json({ error: err.code });
});
};
exports.login = (req, res) => {
const user = {
email: req.body.email,
password: req.body.password
}
//Auth validation
let invalidCred = {};
//Email check
if(user.email.trim() === '') {
invalidCred.email = 'Email must not be blank.';
}
//Password check
if(user.password.trim() === '') {
invalidCred.password = 'Password must not be blank.';
}
//Overall check
if(Object.keys(invalidCred).length > 0) {
return res.status(400).json(errors);
}
firebase.auth().signInWithEmailAndPassword(user.email, user.password)
.then(data => {
return data.user.getIdToken();
})
.then(token => {
return res.json({token});
})
.catch(err => {
console.error(err);
if(err.code === 'auth/wrong-password') {
return res.status(403).json({ general: 'Invalid credentials. Please try again.' });
}
return res.status(500).json({ error: err.code });
});
};
exports.getProfileInfo = (req, res) => { exports.getProfileInfo = (req, res) => {
// FIXME: Delete this after login is implemented // FIXME: Delete this after login is implemented
req.user = {}; req.user = {};

228
functions/index.js
View File

@ -4,236 +4,26 @@ const app = require('express')();
const cors = require('cors'); const cors = require('cors');
app.use(cors()); app.use(cors());
var config = { const fbAuth = require('./util/fbAuth');
apiKey: "AIzaSyCvsWetg4qFdsPGfJ3LCw_QaaYzoan7Q34",
authDomain: "twistter-e4649.firebaseapp.com",
databaseURL: "https://twistter-e4649.firebaseio.com",
projectId: "twistter-e4649",
storageBucket: "twistter-e4649.appspot.com",
messagingSenderId: "20131817365",
appId: "1:20131817365:web:633c95fb08b16d4526b89c"
};
const firebase = require('firebase'); const {db} = require('./util/admin');
firebase.initializeApp(config);
// Acts as a middleman between the client and any function that you use it with // const firebase = require('firebase');
// The function will only execute if the user is logged in, or rather, they have // firebase.initializeApp(config);
// a valid token
const firebaseAuth = (req, res, next) => {
let idToken;
if (req.headers.authorization && req.headers.authorization.startsWith('Bearer ')) {
idToken = req.headers.authorization.split('Bearer ')[1];
} else {
console.error('No token found');
return res.status(403).json({ error: 'Unauthorized' });
}
admin.auth().verifyIdToken(idToken)
.then(decodedToken => {
req.user = decodedToken;
console.log(decodedToken);
return db.collection('users')
.where('userId', '==', req.user.uid)
.limit(1)
.get();
})
.then(data => {
req.user.username = data.docs[0].data().username;
return next();
})
.catch(err => {
console.error("Token verfication failed.", err);
return res.status(403).json(err);
});
};
app.post('/scream', firebaseAuth, (req, res) => {
const newScream = {
username: req.user.username,
body: req.body.body,
numLikes: 0,
numComments: 0,
time: new Date().toISOString()
};
let invalidCred = {};
//Body check
if(req.body.body.trim() === '') {
invalidCred.body = 'Body must not be blank';
}
//Overall check
if(Object.keys(invalidCred).length > 0) {
return res.status(400).json(errors);
}
db
.collection('screams')
.add(newScream)
.then(doc => {
res.json({ message: `Document ${doc.id} created successfully!` });
})
.catch(err => {
console.error(err);
return res.status(500).json({ error: 'Someting went wrong.' });
});
});
app.get('/screams', (req, res) => {
db
.collection('screams')
.orderBy('time', 'desc')
.get()
.then(data => {
let screams = [];
data.forEach(doc => {
screams.push({
username: doc.data().username,
body: doc.data().body,
numLikes: doc.data().numLikes,
numComments: doc.data().numComments,
time: doc.data().time,
screamId: doc.id
});
});
return res.json(screams);
})
.catch(err => {
console.error(err);
return res.status(500).json({ error: err.code });
});
});
app.post('/signup', (req, res) => {
const newUser = {
email: req.body.email,
username: req.body.username,
password: req.body.password,
confirmPassword: req.body.confirmPassword,
time: new Date().toISOString()
};
let invalidCred = {};
const emailRegEx = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
//Email check
if(newUser.email.trim() === '') {
invalidCred.email = 'Email must not be blank.';
}
else if(!newUser.email.match(emailRegEx)) {
invalidCred.email = 'Email is invalid.';
}
//Username check
if(newUser.username.trim() === '') {
invalidCred.username = 'Username must not be blank.';
}
else if(newUser.username.length < 4 || newUser.username.length > 30) {
invalidCred.username = 'Username must be between 4-30 characters long.';
}
//Password check
if(newUser.password.trim() === '') {
invalidCred.password = 'Password must not be blank.';
}
else if(newUser.password.length < 8 || newUser.password.length > 20) {
invalidCred.password = 'Password must be between 8-20 characters long.';
}
//Confirm password check
if(newUser.confirmPassword !== newUser.password) {
invalidCred.confirmPassword = 'Passwords must match.';
}
//Overall check
if(Object.keys(invalidCred).length > 0) {
return res.status(400).json(errors);
}
let idToken, userId;
db.doc(`/users/${newUser.username}`).get()
.then(doc => {
if(doc.exists) {
return res.status(400).json({ username: 'This username is already taken.' });
}
return firebase.auth().createUserWithEmailAndPassword(newUser.email, newUser.password);
})
.then(data => {
userId = data.user.uid;
return data.user.getIdToken();
})
.then(token => {
idToken = token;
const userCred = {
email: req.body.email,
username: newUser.username,
time: newUser.time,
userId
}
return db.doc(`/users/${newUser.username}`).set(userCred);
})
.then(() => {
return res.status(201).json({ idToken });
})
.catch(err => {
console.error(err);
if(err.code === 'auth/email-already-in-use') {
return res.status(500).json({ email: 'This email is already taken.' });
}
return res.status(500).json({ error: err.code });
});
});
app.post('/login', (req, res) => {
const user = {
email: req.body.email,
password: req.body.password
}
//Auth validation
let invalidCred = {};
//Email check
if(user.email.trim() === '') {
invalidCred.email = 'Email must not be blank.';
}
//Password check
if(user.password.trim() === '') {
invalidCred.password = 'Password must not be blank.';
}
//Overall check
if(Object.keys(invalidCred).length > 0) {
return res.status(400).json(errors);
}
firebase.auth().signInWithEmailAndPassword(user.email, user.password)
.then(data => {
return data.user.getIdToken();
})
.then(token => {
return res.json({token});
})
.catch(err => {
console.error(err);
if(err.code === 'auth/wrong-password') {
return res.status(403).json({ general: 'Invalid credentials. Please try again.' });
}
return res.status(500).json({ error: err.code });
});
});
/*------------------------------------------------------------------* /*------------------------------------------------------------------*
* handlers/users.js * * handlers/users.js *
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
const {getUserDetails, getProfileInfo, updateProfileInfo} = require('./handlers/users'); const {getUserDetails, getProfileInfo, updateProfileInfo, signup, login} = require('./handlers/users');
app.post('/signup', signup);
app.post('/login', login);
app.get('/getUser/:handle', getUserDetails); app.get('/getUser/:handle', getUserDetails);