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

Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master

Browse Source 
* 'master' of https://github.com/KarlJakober/hackathon-starter:
  removes steam auth, sets up steam api requests in async
This commit is contained in:
Sahat Yalkabov
2014-02-05 17:13:43 -05:00
parent 20621d535d 1687440588
commit a2f4ffbf2b
6 changed files with 47 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
config/passport.js
View File

@@ -6,7 +6,6 @@ var FacebookStrategy = require('passport-facebook').Strategy;
var TwitterStrategy = require('passport-twitter').Strategy;
var GitHubStrategy = require('passport-github').Strategy;
var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
var SteamStrategy = require('passport-steam').Strategy;
var User = require('../models/User');
var secrets = require('./secrets');
var _ = require('underscore');
@@ -206,43 +205,6 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre
}
}));
/**
* Sign in with Steam.
*/
passport.use(new SteamStrategy(secrets.steam, function(req, identifier, profile, done) {
identifier = identifier.match('http://steamcommunity.com/openid/id/([0-9]{17,25})');
var steam_id = identifier[1];
if (req.user) {
User.findOne({ steam: steam_id }, function(err, existingUser) {
if (existingUser) {
req.flash('errors', { msg: 'There is already a Steam account that belongs to you. Sign in with that account or delete it, then link it with your current account.' });
done(err);
} else {
User.findById(req.user.id, function(err, user) {
user.steam = steam_id;
user.tokens.push({ kind: 'steam', accessToken: steam_id });
user.save(function(err) {
req.flash('info', { msg: 'Steam account has been linked.' });
done(err, user);
});
});
}
});
} else {
User.findOne({ steam: steam_id }, function(err, existingUser) {
if (existingUser) return done(null, existingUser);
var user = new User();
user.steam = steam_id;
user.tokens.push({ kind: 'steam', steam_id: steam_id });
user.save(function(err) {
done(err, user);
});
});
}
}));
/**
* Sign in with Tumblr.
*/