Commit Graph

273 Commits (4ec5c2e3d9515c40a0971d7eab55a54211a67721)

Author SHA1 Message Date
Mrugesh Mohapatra 65e5b26fa1 fix(donate): update default donation amounts
Closes #37787
2019-11-20 12:15:00 +05:30
Mrugesh Mohapatra f30f8072b0 chore(donate): unify donation config
This commit can be further optimised to DRY out values
2019-11-19 23:09:56 +05:30
Mrugesh Mohapatra aeec1bb9e6 feat(donate): integrate servicebot 2019-11-19 23:09:53 +05:30
Oliver Eyton-Williams e72855dad3 fix: handle invalid Algolia keys gracefully in dev (#37088)
Invalid keys throw an error in production, but just cause invalid
PropTypes and build warnings in development.
2019-10-08 01:19:43 -07:00
mrugesh 4889e0fdc6
fix(client,tools): update proxy and location paths (#37106) 2019-10-07 16:42:07 -07:00
Oliver Eyton-Williams 1130a1c0df
chore: update to beta of react-instantsearch-dom (#36843)
* chore: update to beta of react-instantsearch-dom

* feat: use .env variables for search keys
2019-10-04 18:03:20 +02:00
Mrugesh Mohapatra ac50216949 fix: NODE_ENV conflicts on pipelines 2019-08-19 01:37:32 +05:30
Bouncey e417f3f0d4 chore: Apply linting fixes 2019-02-19 14:30:27 +05:30
Mrugesh Mohapatra 6b7c7d6033 fix(donate): update styling and refactor components 2019-02-14 14:14:10 +00:00
Bouncey 0369dfbf37 fix: Add news to the env file 2019-02-06 04:00:52 +05:30
Bouncey d79f9f4899 feat(docker): Prep master for docker deploys 2019-02-04 20:13:51 +05:30
Stuart Taylor d327a5c36b Feat: News in the client app (#34392) 2018-11-29 15:12:15 +03:00
Bouncey c08bb95ea8 fix(auth): Fix auth flow for the client app 2018-10-24 18:27:34 +05:30
Bouncey aa668ca30e feat(langs): Prep Spanish challenges for parsing 2018-10-11 02:15:05 +05:30
Mrugesh Mohapatra 9aad55f8af fix(scripts): adjust npm run scripts 2018-09-27 12:28:31 +05:30
Bouncey eb5dee1cbb fix(build): Make build unrelient on root level deps (take 2) 2018-09-06 16:07:03 +01:00
Bouncey a70fb9ba01 fix(build): Make build unrelient on root level deps 2018-09-06 16:07:03 +01:00
Bouncey 9224613a74 fix(build): Ensure env for build 2018-09-06 16:07:03 +01:00
Bouncey 435e856cdb feat(env): Make env vars available to client app 2018-09-06 16:07:03 +01:00
Bouncey fec10caf67 feat(api): Add api location as an env var 2018-08-30 20:43:55 +05:30
Bouncey ef18f5a931 fix(api): Use /internal for API entry 2018-08-30 20:43:55 +05:30
Stuart Taylor 4f77da02be feat(donate): Add donate api (#17459)
* feat(donate): Add donate api

* feat(donation): Add ability to track donations via email
2018-06-07 16:35:06 -05:00
Stuart Taylor 4d4b964e2c fix(scripts): Run generate-migration-map after seed events (#17234)
* fix(scripts): Run generate-migration-map after seed events

* fix(only-once): Run 'ensure-env' on prelint
2018-05-27 15:27:18 +05:30
mrugesh mohapatra a2076ce1ec fix(auth): on-boarding, signup and welcome flows (#16882)
* fix(auth): Route should have specific targets

* fix(signup): Redirection should be to signup

Closes #16945

* feat(redirect): All fallback redirects to signin

* fix: send back to originating route

* fix(server,secrets): Specify profile field for LinkedIn provider.

* fix(profile): Add route to react profile page
2018-04-13 15:48:10 +01:00
Eric Leung 4ad9fbd8da Remove unused authentication methods 2016-06-12 16:32:17 -07:00
Berkeley Martinez f0128ebd9f remvoe old passport file 2015-08-01 20:14:31 -07:00
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Berkeley Martinez 72fe9c2463 Add cookie secrets to env 2015-06-04 12:42:13 -07:00
Berkeley Martinez 279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00
Quincy Larson acc1236d42 remove vestigial mention of camp counselor team 2015-06-01 12:18:45 -07:00
terakilobyte b626c811d0 Add initial I need help button and slack webhook integration 2015-05-23 02:26:29 -04:00
Quincy Larson 1e866868f5 Merge branch 'challenge-restructure' of github.com:FreeCodeCamp/freecodecamp into challenge-restructure 2015-05-18 23:32:34 -07:00
terakilobyte ba29f0533a Updated to show how json should be modeled, fleshed out resources to load new challengeMap stub 2015-05-18 22:03:27 -04:00
Quincy Larson 80ceb15714 fix linkedin issue 2015-05-15 13:39:12 -07:00
A. Drake ffa2404993 Added API endpoint for twitter calls to use in codepen. NOTE added tokens to env file 2015-04-29 08:00:57 -04:00
Michael Q Larson e3acdb9ebb add slack key to secrets.js 2015-04-08 21:53:08 -07:00
Michael Q Larson a60c5eb92c refactor passport so that emails aren't fired if there are errors in save actions 2015-03-31 15:07:34 -07:00
Michael Q Larson a24ad9b993 update the welcome mailer and change fontsize on bonfire helpful links 2015-03-31 10:00:30 -07:00
Michael Q Larson 6c929b8375 Revert "start adding error handling to passport"
This reverts commit 89ee552a12.
2015-03-22 22:23:46 -07:00
Berkeley Martinez 940dbea622 Handle err in config/passport 2015-03-22 22:07:58 -07:00
Michael Q Larson 8e8711d947 add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users 2015-03-11 23:58:16 -07:00
Nathan Leniz 8608f48d8c Delete seed tasks, email signup now defaults a picture 2015-03-09 06:51:47 +09:00
Michael Q Larson 4bdc3d34ad Add blogger API to FCC and list 5 most recent blog posts on about page 2015-01-12 21:28:58 -08:00
Michael Q Larson 4e91e94463 fix firefox CDN issue and ensure twitter handle, email and username are lowercase 2015-01-09 15:10:34 -08:00
Michael Q Larson 61204f61be auto populate twitter attribute if you log in with twitter 2015-01-09 14:31:49 -08:00
Michael Q Larson d533e07edd debug auth in production 2015-01-09 14:02:21 -08:00
Michael Q Larson 503d6ada8a remove redundant github auth 2015-01-09 13:54:38 -08:00
Michael Q Larson d46ac080dd make twitter photo higher resolution on login. remove twitter redirect middleware 2015-01-09 13:02:00 -08:00
Michael Q Larson f243367774 Remove noisy logs, add new camp counselors and add github auth back in 2015-01-04 12:26:45 -08:00
Michael Q Larson 35847faaac revert passport.js to original hackathon starter implementation 2015-01-01 00:26:09 -08:00
Michael Q Larson a8d08b1ff9 Revert "Revert "modify twitter auth to fail if mismatch between selected user and current user""
This reverts commit df335b0087.
2014-12-30 20:49:25 -08:00
Michael Q Larson df335b0087 Revert "modify twitter auth to fail if mismatch between selected user and current user"
This reverts commit f75d305939.
2014-12-30 16:55:54 -08:00
Michael Q Larson f75d305939 modify twitter auth to fail if mismatch between selected user and current user 2014-12-30 14:55:42 -08:00
Michael Q Larson a5fa27466c Clean up views, remove API controller views, add the gmail-shortcuts, control-shortcuts and deploy-a-website static views. Move all resource controller views to a resources view folder and update routes 2014-12-26 00:05:00 -08:00
Michael Q Larson fc2031062b add back in generic secrets.js file 2014-12-24 09:46:51 -08:00
Michael Q Larson d39804053c finished with profile page for now 2014-12-24 00:07:20 -08:00
Michael Q Larson fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
Berkeley Martinez 86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson a06744038a revert to previous form and attempt to get working later 2014-12-07 21:14:32 -08:00
Michael Q Larson f1bedbdecf some more blind tinkering 2014-12-07 21:08:33 -08:00
Michael Q Larson e173b35c2b add mailer back in 2014-12-07 21:00:21 -08:00
Michael Q Larson 64f12f8ee1 add debug stuff 2014-12-07 20:56:02 -08:00
Michael Q Larson 2777259af9 attempt to add new user mailer 2014-12-07 20:50:53 -08:00
Michael Q Larson 36ff713087 comment problematic code 2014-12-03 23:44:28 -08:00
Michael Q Larson f93801a1d4 thrashing 2014-12-03 23:42:13 -08:00
Michael Q Larson 711904d1c1 start making improvements to auth and get email from Twitter users 2014-12-03 23:28:10 -08:00
Michael Q Larson 01e86c74bc update other authentication methods 2014-12-03 18:34:42 -08:00
Michael Q Larson 6ca7bc5879 attempt to make facebook not overwrite 2014-12-03 18:17:21 -08:00
Michael Q Larson 9179c1ee06 make all oauth options flexible 2014-12-01 21:13:39 -08:00
Michael Q Larson 835c69d6b4 attempt to allow facebook login even with used email 2014-12-01 21:06:19 -08:00
Michael Q Larson a2259c937c fix passport js maybe 2014-11-29 22:30:02 -08:00
Berkeley Martinez 7c1ae2f450 Adds auth check to linked path. Removes unused routes. 2014-11-19 15:30:36 -08:00
Michael Q Larson 308461d4ec create bootstrap file 2014-10-16 16:18:26 -07:00
Michael Q Larson 30212e5f5b update passport.js 2014-10-15 14:53:36 -07:00
Michael Q Larson 2106cbdbf2 twitter username now persisted 2014-10-13 21:38:10 -07:00
Michael Q Larson 254740c065 socket io is connecting 2014-10-13 18:00:37 -07:00
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
Sahat Yalkabov b21b53a09e If user is already logged in, link google oauth with that existing account 2013-12-13 00:28:29 -05:00
Sahat Yalkabov 734c4e6741 Added missing tokenSecret when new twitter account is created 2013-12-10 01:56:43 -05:00
Sahat Yalkabov 37392d1fae passport isAuthorized middleware. Fixed headers already sent errors. 2013-12-08 04:30:43 -05:00
Sahat Yalkabov 7b4549b368 Refactoring 2013-12-08 03:58:56 -05:00
Sahat Yalkabov 195f916f56 Added isAuthorized middleware to tumblr and foursquare routes 2013-12-08 02:23:59 -05:00
Sahat Yalkabov 51001a0497 Created isAuthorized middleware 2013-12-08 02:10:49 -05:00
Sahat Yalkabov 4da392f736 Added oauth2 foursquare passport strategy 2013-12-07 12:30:54 -05:00
Sahat Yalkabov d3fb6a30a4 Modified the rest of strategies to use new token schema 2013-12-07 02:21:20 -05:00
Sahat Yalkabov 73d26e4a7f Send user instead of req.user 2013-12-07 02:18:26 -05:00
Sahat Yalkabov c03d62da08 Changed tokens from an object of objects to just an array, Tumblr strategy now pushes a new token in addition to tokenSecret as well as token kind 2013-12-07 02:17:46 -05:00
Sahat Yalkabov cbc9ec3506 removed admin middleware, also provider is now dynamically set on unauthorized page button url 2013-12-07 02:08:53 -05:00
Sahat Yalkabov 3871e7c0ec Inline tumblr callback instead of placing it in passportConfig 2013-12-07 01:05:19 -05:00
Sahat Yalkabov 435b006967 Refactoring tumblr authorization 2013-12-07 00:50:37 -05:00
Sahat Yalkabov 6751de2c26 Added passReqToCallback to tumblr oauth strategy to get currently logged in user 2013-12-07 00:29:32 -05:00
Sahat Yalkabov e05f2eaf7f Tumblr OAuth strategy 2013-12-06 22:49:40 -05:00
Sahat Yalkabov 074352ceed Multiple vars instead of 1 var per multiple libs 2013-12-06 22:21:46 -05:00
Sahat Yalkabov b2bb32332d Cleaned up and refactored passport configuration file 2013-12-06 20:16:39 -05:00
Sahat Yalkabov 62a87a8542 Facebook strategy refactoring 2013-12-06 01:51:50 -05:00
Sahat Yalkabov 8de4c4369e Refactored github strategy 2013-12-06 01:44:45 -05:00
Sahat Yalkabov 67636b2462 Refactored twitter strategy 2013-12-06 01:24:12 -05:00
Sahat Yalkabov ce3a8c78ec Added gender to user schema and radio buttons to account page 2013-12-06 00:18:39 -05:00
Sahat Yalkabov 3ecd3ad148 Simplified local strategy signup process, email is now a username 2013-12-05 22:48:09 -05:00
Sahat Yalkabov 298e0f02e3 New foursquare authentication token request UI 2013-12-04 15:25:57 -05:00