gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,326 Commits 9 Branches 0 Tags
a5985cd73dc501c6a04bb1c72ca6d10fc09caf2a
Commit Graph

96 Commits

Author SHA1 Message Date
Michael Q Larson
a5985cd73d start building out views 2014-10-13 14:14:51 -07:00
Michael Q Larson
05c31ba15d firechat and firepad installed but not fully working 2014-10-12 01:51:55 -07:00
Sahat Yalkabov
886b1d2d0d use https profile image url in twitter auth 2014-09-01 12:12:53 -07:00
Sahat Yalkabov
04c5262bea windows-cr line endings commit 2014-07-01 17:05:49 -04:00
Sahat Yalkabov
b05c12d6d4 Replaced _.findWhere with .find function 2014-06-06 16:02:37 -04:00
Sahat Yalkabov
2cbf836041 Switched from underscore to lodash library 2014-06-06 15:43:49 -04:00
Sergey Gavruk
a5e1830d5f Fix instagram email 2014-05-04 10:19:11 +03:00
Sahat Yalkabov
5e5b8efa4f Updated sign-in strategies. 
Removed email check when trying to link multipel accounts. Otherwise trying to link facebook and google that use the same e-mail is impossible.
 2014-04-25 14:33:54 -04:00
Sahat Yalkabov
fc55e385e4 Added Instagram authentication 2014-04-22 15:00:27 -04:00
Sahat Yalkabov
48792ce753 Code cleanup 2014-04-15 11:10:54 -04:00
Sahat Yalkabov
6eb9b631ce Updated comment style to make it easier to generate the code using multiline strings 2014-04-13 00:28:11 -04:00
Sahat Yalkabov
36a02ac982 Added a brief comment explanation of how passport strategy works 2014-03-03 16:32:13 -05:00
Sahat Yalkabov
4d52dbd013 Updated LinkedIn error flash message 2014-02-27 17:57:13 -05:00
Sahat Yalkabov
c95ee75eee Add LinkedIn passport strategy 2014-02-27 13:08:26 -05:00
Sahat Yalkabov
5833a206f3 Updated formatting 2014-02-14 12:28:01 -05:00
Sahat Yalkabov
6b49d10fc3 Check if there is an account with provided email when linking with Facebook strategy 2014-02-14 12:26:47 -05:00
Sahat Yalkabov
3016af41e5 Update Google Strategy 2014-02-14 12:24:23 -05:00
Sahat Yalkabov
52276b3755 Check if there is an account with a given email address when linking GitHub strategy. 2014-02-14 12:23:50 -05:00
Sahat Yalkabov
2ba1bee9ec Updated flash message in Google Strategy 2014-02-14 12:02:07 -05:00
Sahat Yalkabov
66637842fc Merge branch 'master' of https://github.com/robjohnson189/hackathon-starter into robjohnson189-master 
* 'master' of https://github.com/robjohnson189/hackathon-starter:
  Check if there is already an account that isn't linked to a google account but uses the google accounts email address
 2014-02-14 11:54:47 -05:00
Sahat Yalkabov
0d8cdd38f1 Added comments explaining what each authentication strategy is used for. 2014-02-14 11:29:28 -05:00
Robert Johnson
077154056c Check if there is already an account that isn't linked to a google account but uses the google accounts email address 2014-02-13 20:54:09 -06:00
Sahat Yalkabov
862ddb33fd Add Venmo oauth2 strategy 2014-02-10 19:20:45 -05:00
Sahat Yalkabov
73411a03b0 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
#
 2014-02-05 19:45:05 -05:00
Sahat Yalkabov
a2f4ffbf2b Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master 
* 'master' of https://github.com/KarlJakober/hackathon-starter:
  removes steam auth, sets up steam api requests in async
 2014-02-05 17:13:43 -05:00
Karl Jakober
1687440588 removes steam auth, sets up steam api requests in async 2014-02-05 21:04:02 +00:00
Sahat Yalkabov
20621d535d Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master 
* 'master' of https://github.com/KarlJakober/hackathon-starter:
  Adds Steam auth and API
 2014-02-05 12:26:23 -05:00
Karl Jakober
aa36ad9fbb Adds Steam auth and API 2014-02-05 16:37:48 +00:00
Sahat Yalkabov
1cc0bb4526 Safe reference Facebook profile location 2014-02-04 13:28:27 -05:00
Dan Stroot
7121cbfe83 Better approach to Twitter email and Facebook location 2014-02-04 08:23:52 -08:00
Sahat Yalkabov
ea573672fb Update comments 2014-02-01 00:03:05 -05:00
Sahat Yalkabov
8fdf42928f Flash notifications for Facebook, Github, Twitter auth link 2014-01-31 23:58:59 -05:00
Sahat Yalkabov
5f20608207 Instead of merging display flash messages notifying the user that account with another OAuth provider already exists. 2014-01-31 23:56:50 -05:00
Sahat Yalkabov
9d982b3f27 Update merging strategies 2014-01-31 23:23:14 -05:00
Sahat Yalkabov
6d85931422 Add Twitter merging strategy 2014-01-31 23:17:58 -05:00
Sahat Yalkabov
dfeb12d6ce Add Google and Github merge strategies 2014-01-31 22:39:13 -05:00
Sahat Yalkabov
90c5278bbc Update profile picture in Facebook strategy 2014-01-31 22:23:19 -05:00
Sahat Yalkabov
2f1e394334 Add Merge strategy for Facebook so far 2014-01-31 16:28:12 -05:00
Sahat Yalkabov
11f9c12b1e Add Login route express validations 2014-01-23 22:47:21 -05:00
Sahat Yalkabov
3dc90ac05b Updated error messages 2014-01-12 15:31:17 -05:00
Sahat Yalkabov
3004cdb36e All 4 strategies will now create an email field (for local login) if the user is not logged in and it's the first time. 2014-01-07 16:04:28 -05:00
Sahat Yalkabov
8c115135b0 Local strategy now uses email as username field 2014-01-07 15:48:21 -05:00
Sahat Yalkabov
1be6217a84 passport strategy refactoring 2014-01-07 15:19:54 -05:00
Sahat Yalkabov
30a610be2c Cleaned up code + simplified 2013-12-20 14:12:29 -05:00
Sahat Yalkabov
36ba87ce09 Code refactoring, renamed token to accessToken in user schema, comment strings for routes, 2013-12-20 13:48:33 -05:00
Sahat Yalkabov
a9ac61e063 Renamed config.js to secrets.js to better match the intents of the file 2013-12-20 01:31:16 -05:00
Sahat Yalkabov
74f1675e0e Github profile image is properly set when linked with account that does not have a picture 2013-12-14 16:51:23 -05:00
Sahat Yalkabov
b635207440 Facebook oauth2 checks if user is already logged in (for linking with existing account) 2013-12-14 01:32:33 -05:00
Sahat Yalkabov
8596b8187b Github oauth2 has a check for authenticated user now as well 2013-12-14 01:29:49 -05:00
Sahat Yalkabov
19a8fa3024 Detect if user is logged in on twitter oauth2 strategy 2013-12-14 01:27:10 -05:00