wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-04 18:50:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into quiet-logs

Browse Source
This commit is contained in:
Wyatt Johnson
2018-02-23 11:55:25 -07:00
committed by GitHub
parent e33ccb57b6 3a04e492c2
commit ecf040ebf7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-facebook-auth/server/router.js
+3 -3
View File
@@ -2,7 +2,7 @@ module.exports = router => {
const { passport, HandleAuthPopupCallback } = require('services/passport');
/**
* Facebook auth endpoint, this will redirect the user immediatly to facebook
* Facebook auth endpoint, this will redirect the user immediately to Facebook
* for authorization.
*/
router.get(
@@ -15,8 +15,8 @@ module.exports = router => {
);
/**
* Facebook callback endpoint, this will send the user a html page designed to
* send back the user credentials upon sucesfull login.
* 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) => {
// Perform the facebook login flow and pass the data back through the opener.
plugins/talk-plugin-google-auth/server/router.js
+3 -3
View File
@@ -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 },