From 73411a03b0d0c806c43433bf8a47c61d7f5874e5 Mon Sep 17 00:00:00 2001
From: Sahat Yalkabov <sakhat@gmail.com>
Date: Wed, 5 Feb 2014 19:45:05 -0500
Subject: [PATCH] Merge branch 'KarlJakober-master'

* KarlJakober-master:
  Add profile information and owned games to Steam template
  Steam API template display achievements
  Steam API code refactoring, added ownedGames API call
  removes steam auth, sets up steam api requests in async
  Adds Steam auth and API

Conflicts:
	views/api/index.jade
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   README.md
#	modified:   app.js
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   controllers/api.js
#	modified:   models/User.js
#	new file:   views/api/steam.jade
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   models/User.js
#	modified:   views/api/index.jade
#
---
 config/passport.js   | 8 --------
 models/User.js       | 1 -
 views/api/index.jade | 2 ++
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/config/passport.js b/config/passport.js
index 26056214b4..2983b30462 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -205,10 +205,6 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre
   }
 }));
 
-/**
- * Sign in with Tumblr.
- */
-
 passport.use('tumblr', new OAuthStrategy({
     requestTokenURL: 'http://www.tumblr.com/oauth/request_token',
     accessTokenURL: 'http://www.tumblr.com/oauth/access_token',
@@ -228,10 +224,6 @@ passport.use('tumblr', new OAuthStrategy({
   }
 ));
 
-/**
- * Sign in with Foursquare.
- */
-
 passport.use('foursquare', new OAuth2Strategy({
     authorizationURL: 'https://foursquare.com/oauth2/authorize',
     tokenURL: 'https://foursquare.com/oauth2/access_token',
diff --git a/models/User.js b/models/User.js
index 013bb29064..543a393a6e 100644
--- a/models/User.js
+++ b/models/User.js
@@ -10,7 +10,6 @@ var userSchema = new mongoose.Schema({
   twitter: { type: String, unique: true, sparse: true },
   google: { type: String, unique: true, sparse: true },
   github: { type: String, unique: true, sparse: true },
-
   tokens: Array,
 
   profile: {
diff --git a/views/api/index.jade b/views/api/index.jade
index 8232a45c3f..60e6bf3e9b 100644
--- a/views/api/index.jade
+++ b/views/api/index.jade
@@ -22,6 +22,8 @@ block content
     li
       i.fa.fa-lock
       a(href='/api/paypal') PayPal
+    li
+      a(href='/api/steam') Steam
     li
       i.fa.fa-lock
       a(href='/api/tumblr') Tumblr