36ff713087
comment problematic code
2014-12-03 23:44:28 -08:00
f93801a1d4
thrashing
2014-12-03 23:42:13 -08:00
711904d1c1
start making improvements to auth and get email from Twitter users
2014-12-03 23:28:10 -08:00
01e86c74bc
update other authentication methods
2014-12-03 18:34:42 -08:00
6ca7bc5879
attempt to make facebook not overwrite
2014-12-03 18:17:21 -08:00
9179c1ee06
make all oauth options flexible
2014-12-01 21:13:39 -08:00
835c69d6b4
attempt to allow facebook login even with used email
2014-12-01 21:06:19 -08:00
a2259c937c
fix passport js maybe
2014-11-29 22:30:02 -08:00
7c1ae2f450
Adds auth check to linked path. Removes unused routes.
2014-11-19 15:30:36 -08:00
308461d4ec
create bootstrap file
2014-10-16 16:18:26 -07:00
30212e5f5b
update passport.js
2014-10-15 14:53:36 -07:00
2106cbdbf2
twitter username now persisted
2014-10-13 21:38:10 -07:00
254740c065
socket io is connecting
2014-10-13 18:00:37 -07:00
a5985cd73d
start building out views
2014-10-13 14:14:51 -07:00
05c31ba15d
firechat and firepad installed but not fully working
2014-10-12 01:51:55 -07:00
886b1d2d0d
use https profile image url in twitter auth
2014-09-01 12:12:53 -07:00
04c5262bea
windows-cr line endings commit
2014-07-01 17:05:49 -04:00
b05c12d6d4
Replaced _.findWhere with .find function
2014-06-06 16:02:37 -04:00
2cbf836041
Switched from underscore to lodash library
2014-06-06 15:43:49 -04:00
a5e1830d5f
Fix instagram email
2014-05-04 10:19:11 +03:00
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
fc55e385e4
Added Instagram authentication
2014-04-22 15:00:27 -04:00
48792ce753
Code cleanup
2014-04-15 11:10:54 -04:00
6eb9b631ce
Updated comment style to make it easier to generate the code using multiline strings
2014-04-13 00:28:11 -04:00
36a02ac982
Added a brief comment explanation of how passport strategy works
2014-03-03 16:32:13 -05:00
4d52dbd013
Updated LinkedIn error flash message
2014-02-27 17:57:13 -05:00
c95ee75eee
Add LinkedIn passport strategy
2014-02-27 13:08:26 -05:00
5833a206f3
Updated formatting
2014-02-14 12:28:01 -05:00
6b49d10fc3
Check if there is an account with provided email when linking with Facebook strategy
2014-02-14 12:26:47 -05:00
3016af41e5
Update Google Strategy
2014-02-14 12:24:23 -05:00
52276b3755
Check if there is an account with a given email address when linking GitHub strategy.
2014-02-14 12:23:50 -05:00
2ba1bee9ec
Updated flash message in Google Strategy
2014-02-14 12:02:07 -05:00
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
0d8cdd38f1
Added comments explaining what each authentication strategy is used for.
2014-02-14 11:29:28 -05:00
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
862ddb33fd
Add Venmo oauth2 strategy
2014-02-10 19:20:45 -05:00
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
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
1687440588
removes steam auth, sets up steam api requests in async
2014-02-05 21:04:02 +00:00
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
aa36ad9fbb
Adds Steam auth and API
2014-02-05 16:37:48 +00:00
1cc0bb4526
Safe reference Facebook profile location
2014-02-04 13:28:27 -05:00
7121cbfe83
Better approach to Twitter email and Facebook location
2014-02-04 08:23:52 -08:00
ea573672fb
Update comments
2014-02-01 00:03:05 -05:00
8fdf42928f
Flash notifications for Facebook, Github, Twitter auth link
2014-01-31 23:58:59 -05:00
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
9d982b3f27
Update merging strategies
2014-01-31 23:23:14 -05:00
6d85931422
Add Twitter merging strategy
2014-01-31 23:17:58 -05:00
dfeb12d6ce
Add Google and Github merge strategies
2014-01-31 22:39:13 -05:00
90c5278bbc
Update profile picture in Facebook strategy
2014-01-31 22:23:19 -05:00
Michael Q Larson
Berkeley Martinez
Sahat Yalkabov
Sergey Gavruk
Robert Johnson
Karl Jakober
Dan Stroot