gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(loopback/passport): Show flash messages on link

Browse Source
This commit is contained in:
Berkeley Martinez
2018-01-12 11:10:17 -08:00
parent 2bb27e8dc6
commit 307716f9c8
4 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@ -10924,24 +10924,13 @@
} }
}, },
"loopback-component-passport": { "loopback-component-passport": {
"version": "3.4.1", "version": "git+https://github.com/freeCodeCamp/loopback-component-passport.git#e158f6bbd631e00e0194515ae25b9971c58a1121",
"resolved": "https://registry.npmjs.org/loopback-component-passport/-/loopback-component-passport-3.4.1.tgz",
"integrity": "sha1-LHyB6iPHLkN56BFLmS16v5Af2IU=",
"requires": { "requires": {
"passport": "0.3.2", "passport": "0.4.0",
"strong-globalize": "2.10.0", "strong-globalize": "2.10.0",
"underscore": "1.8.3" "underscore": "1.8.3"
}, },
"dependencies": { "dependencies": {
"passport": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz",
"integrity": "sha1-ndAJ+RXo/glbASSgG4+C2gdRAQI=",
"requires": {
"passport-strategy": "1.0.0",
"pause": "0.0.1"
}
},
"underscore": { "underscore": {
"version": "1.8.3", "version": "1.8.3",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",

2
package.json
View File

@ -80,7 +80,7 @@
"lodash": "^4.1.0", "lodash": "^4.1.0",
"loopback": "^3.11.1", "loopback": "^3.11.1",
"loopback-boot": "^2.26.1", "loopback-boot": "^2.26.1",
"loopback-component-passport": "^3.4.1", "loopback-component-passport": "git+https://github.com/freeCodeCamp/loopback-component-passport.git#feat/freecodecamp",
"loopback-connector-mongodb": "^3.2.1", "loopback-connector-mongodb": "^3.2.1",
"method-override": "^2.3.0", "method-override": "^2.3.0",
"moment": "^2.10.2", "moment": "^2.10.2",

16
server/boot/home.js
View File

@ -1,6 +1,5 @@
import { defaultProfileImage } from '../../common/utils/constantStrings.json'; import { defaultProfileImage } from '../../common/utils/constantStrings.json';
import supportedLanguages from '../../common/utils/supported-languages'; import supportedLanguages from '../../common/utils/supported-languages';
import dedent from 'dedent';
const message = const message =
'Learn to Code and Help Nonprofits'; 'Learn to Code and Help Nonprofits';
@ -35,22 +34,9 @@ module.exports = function(app) {
if (!supportedLanguages[req._urlLang]) { if (!supportedLanguages[req._urlLang]) {
return next(); return next();
} }
const { referer = '' } = req.headers;
if (req.user) { if (req.user) {
if ((referer.indexOf('/settings') >= 1) && (req.user.isGithubCool)) { return res.redirect('/challenges/current-challenge');
const msg = dedent`
We've updated your profile based
on your your GitHub account.
`;
const username = req.user.username;
req.flash('info', { msg: msg});
return res.redirect(`/${username}`);
} else {
return res.redirect('/challenges/current-challenge');
}
} }
return res.render('home', { title: message }); return res.render('home', { title: message });

7
server/passport-providers.js
View File

@ -159,8 +159,9 @@ export default {
clientSecret: process.env.GITHUB_SECRET, clientSecret: process.env.GITHUB_SECRET,
link: true, link: true,
failureFlash: true, failureFlash: true,
successFlash: [ 'We\'ve updated your profile based ', successFlash: [
'on your your GitHub account.' 'We\'ve updated your profile based ',
].join('') 'on your your GitHub account.'
].join('')
} }
}; };