Merge branch 'master' into events

This commit is contained in:
Wyatt Johnson
2018-02-23 15:09:32 -07:00
18 changed files with 1300 additions and 82 deletions
@@ -1,6 +1,6 @@
module.exports = router => {
/**
* Facebook auth endpoint, this will redirect the user immediately to facebook
* Facebook auth endpoint, this will redirect the user immediately to Facebook
* for authorization.
*/
router.get('/api/v1/auth/facebook', (req, res, next) => {
@@ -16,7 +16,7 @@ module.exports = router => {
});
/**
* Facebook callback endpoint, this will send the user a html page designed to
* Facebook callback endpoint, this will send the user a HTML page designed to
* send back the user credentials upon successful login.
*/
router.get('/api/v1/auth/facebook/callback', (req, res, next) => {
@@ -2,7 +2,7 @@ module.exports = router => {
const { passport, HandleAuthPopupCallback } = require('services/passport');
/**
* Google auth endpoint, this will redirect the user immediatly to google
* Google auth endpoint, this will redirect the user immediately to Google
* for authorization.
*/
router.get(
@@ -16,10 +16,10 @@ module.exports = router => {
/**
* Google callback endpoint, this will send the user a html page designed to
* send back the user credentials upon sucesfull login.
* send back the user credentials upon successful login.
*/
router.get('/api/v1/auth/google/callback', (req, res, next) => {
// Perform the google login flow and pass the data back through the opener.
// Perform the Google login flow and pass the data back through the opener.
passport.authenticate(
'google',
{ session: false },