Merge pull request #145 from vevinkirk/main

updating to use new passport-slack-oauth2

Author: paul-ion

trainingportal/auth.js

@@ -55,7 +55,7 @@ catch(ex){/*Do nothing*/}
 
 
 var GoogleStrategy = require('passport-google-oauth20').Strategy;
-var SlackStrategy = require('passport-slack').Strategy;
+var SlackStrategy = require('passport-slack-oauth2').Strategy;
 var LocalStrategy = require('passport-local').Strategy;
 var SamlStrategy = require('passport-saml').Strategy;
 var LdapStrategy = require('passport-ldapauth').Strategy;
@@ -600,4 +600,4 @@ module.exports = {
     processAuthCallback,
     registerLocalUser,
     updateLocalUser
-}
+}

trainingportal/package-lock.json

@@ -40,6 +40,7 @@
     "passport-local": "^1.0.0",
     "passport-saml": "^2.2.0",
     "passport-slack": "0.0.7",
+    "passport-slack-oauth2": "^1.2.0",
     "popper": "^1.0.1",
     "sqlite3": "^5.1.2",
     "uid-safe": "^2.1.4",

trainingportal/package.json

@@ -170,10 +170,10 @@ app.get( '/public/google/callback', passport.authenticate( 'google', {
 
 
 // path for slack auth
-app.get('/public/slack', passport.authenticate('slack'));
+app.get('/public/slack', passport.authenticate('Slack'));
 
 // OAuth callback url 
-app.get( '/public/slack/callback', passport.authenticate( 'slack', { 
+app.get( '/public/slack/callback', passport.authenticate( 'Slack', { 
 		successRedirect: '/main',
 		failureRedirect: '/public/authFail.html'
 }));