Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Conflicts:
	server/passport-providers.js

server/passport-providers.js

@@ -41,6 +41,7 @@ module.exports = {
   },
   'google-login': {
     provider: 'google',
+    authScheme: 'oauth2',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,
@@ -54,6 +55,7 @@ module.exports = {
   },
   'google-link': {
     provider: 'google',
+    authScheme: 'oauth2',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,
@@ -94,7 +96,7 @@ module.exports = {
   },
   'linkedin-login': {
     provider: 'linkedin',
-    authScheme: 'oauth',
+    authScheme: 'oauth2',
     module: 'passport-linkedin-oauth2',
     authPath: '/auth/linkedin',
     callbackURL: '/auth/linkedin/callback',
@@ -104,11 +106,14 @@ module.exports = {
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_basicprofile', 'r_emailaddress'],
+    authOptions: {
+      state: process.env.LINKEDIN_STATE
+    },
     failureFlash: true
   },
   'linkedin-link': {
     provider: 'linkedin',
-    authScheme: 'oauth',
+    authScheme: 'oauth2',
     module: 'passport-linkedin-oauth2',
     authPath: '/link/linkedin',
     callbackURL: '/link/linkedin/callback',
@@ -118,6 +123,9 @@ module.exports = {
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_basicprofile', 'r_emailaddress'],
+    authOptions: {
+      state: process.env.LINKEDIN_STATE
+    },
     failureFlash: true
   }
 };

server/server.js

@@ -257,8 +257,8 @@ R.keys(passportProviders).map(function(strategy) {
  * 500 Error Handler.
  */
 
-//if (process.env.NODE_ENV === 'development') {
-if (true) {
+// if (process.env.NODE_ENV === 'development') {
+if (true) { // eslint-disable-line
   app.use(errorHandler({
     log: true
   }));