-
Notifications
You must be signed in to change notification settings - Fork 5
#174864453 builds user up/in using Facebook OAuth #35
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Augusta-E
wants to merge
294
commits into
develop
Choose a base branch
from
ft-facebook-user-singup/in-oauth-174864453
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 250 commits
Commits
Show all changes
294 commits
Select commit
Hold shift + click to select a range
fcc597e
Merge branch 'ft-user-sign-up-174566160' of https://github.com/devcar…
donaldcrane 7789ca4
Resolve conflictss
Extremophile-ai be0dd28
Resolve conflictss
Extremophile-ai 2be55c0
Resolve conflict
Extremophile-ai a26dd13
feature(setup):create user account
Extremophile-ai ee13585
Resolve conflict
Extremophile-ai ea804de
fix conflicts
Extremophile-ai d44c3f8
fix conflicts in src/controllers/user.js
Extremophile-ai 8260969
modify eslint
Extremophile-ai 761a681
modify eslint
Extremophile-ai 0e7e00d
fix conflicts package.json
Extremophile-ai e496461
fix conflicts package.json
Extremophile-ai 9ab936d
fix conflicts in models
Extremophile-ai d0974ff
fix conflicts in coverage
Extremophile-ai 11c7f4e
fix coverage
Extremophile-ai e6f281f
resolve merge conflict
Extremophile-ai 1bb0234
rebase develop
Extremophile-ai 9c70cf7
fix conflicts
Extremophile-ai 30aa778
fix undefined error
Extremophile-ai f916bf8
fix undefined error
Extremophile-ai d84d9cf
rearrange folder
Extremophile-ai c5cd252
Merge branch 'ft-user-sign-up-174566160' of https://github.com/devcar…
donaldcrane dea3e8e
modified sign-in feature
donaldcrane 0993a9b
resolved conflict
donaldcrane 84d76fc
add email conflict test
Extremophile-ai ca70e8e
resolved conflict
donaldcrane 5a6ba69
add validation
Extremophile-ai 0cb3b24
resolve conflicts
Extremophile-ai 33f6f5b
rebase and fix conflicts
Extremophile-ai 7f5b7d7
resolve conflicts
Extremophile-ai 71d2a37
feature(setup):create user account
Extremophile-ai ef0dfba
resolve conflicts
Extremophile-ai e2f6821
feature(setup):crea user account
Extremophile-ai 6a1129f
feature(setup):create user account
Extremophile-ai 0a9556e
refactored
Extremophile-ai 392cae0
include tests for user sign-up
Extremophile-ai 3f5860e
modify config/config.js
Extremophile-ai bc30f94
resolve conflicts
Extremophile-ai 7757801
feature(setup):create user account
Extremophile-ai 9c6c6d6
Resolve conflictss
Extremophile-ai b924556
Resolve conflictss
Extremophile-ai c06e86a
Resolve conflict
Extremophile-ai 9e27373
feature(setup):create user account
Extremophile-ai 78d7a2a
Resolve conflict
Extremophile-ai 59e7a67
fix conflicts
Extremophile-ai 5170efd
fix conflicts in src/controllers/user.js
Extremophile-ai 0f9d825
modify eslint
Extremophile-ai 8823f7b
modify eslint
Extremophile-ai 82bb292
fix conflicts package.json
Extremophile-ai 4d5700a
fix conflicts package.json
Extremophile-ai 1dd160b
fix conflicts in models
Extremophile-ai 960f15c
resolve conflicts
Extremophile-ai 7954e62
resolve conflicts
Extremophile-ai d471bdb
resolve conflict
Extremophile-ai a64e079
fix conflicts
Extremophile-ai 87e2ece
rebase develop
Extremophile-ai 3e6c59b
fix conflicts
Extremophile-ai 62fe889
gitnored coverage
donaldcrane aa7c3bb
fix conflicts
Extremophile-ai fea195f
feature(setup):create user account
Extremophile-ai c77e6b4
fix conflicts
Extremophile-ai a5ff6f4
fix conflicts
Extremophile-ai 5cb0623
feature(setup):create user account
Extremophile-ai 04a65df
conflict resolution
Extremophile-ai 87b03df
conflict resolution
Extremophile-ai eaddb02
modify config/config.js
Extremophile-ai abde059
feature(setup):create user account
Extremophile-ai e4e387c
fix conflicts
Extremophile-ai 1a9e56d
fix conflicts
Extremophile-ai 8db4ecf
fix conflicts
Extremophile-ai e704c98
feature(setup):create user account
Extremophile-ai 7d43ac1
fix conflicts
Extremophile-ai 009e1e4
fix conflicts
Extremophile-ai 054d63d
modify eslint
Extremophile-ai a663710
fix conflicts
Extremophile-ai 64752fd
fix conflicts
Extremophile-ai 522609e
refactor user models
Extremophile-ai 0046a5a
models/user.js
Extremophile-ai 51b4729
fix conflicts
Extremophile-ai 97eeae8
fix conflicts
Extremophile-ai 8a671a6
fix undefined error
Extremophile-ai 73c7d8e
resolved user authentication
donaldcrane d828687
fix conflicts
Extremophile-ai bfa813b
fix conflicts
Extremophile-ai 3b98867
add validation
Extremophile-ai b6729ae
resolved code climate error
donaldcrane 1433af6
resolved code climate
donaldcrane 1c5a527
Add User Validation
Extremophile-ai 543d8e5
Add User Validation
Extremophile-ai 39c362d
resolved code climate conflict
donaldcrane e74d371
edit .github
Extremophile-ai 80188bd
resolved conflict
donaldcrane f54ece8
resolved conflict
donaldcrane 2682f0d
fix coverage script in package.json
Extremophile-ai 674c1e7
change coveralls token
Extremophile-ai 1588af4
change coveralls token
Extremophile-ai b624a62
finished user sign-in feature
donaldcrane 484aaf1
fixed code climate
donaldcrane 789732f
resolved conflict
donaldcrane af51498
feat(facebook signup): A user can signup/in wth fb
Augusta-E 4153a9e
resolved comment.js
donaldcrane 0175f58
added tlds domain name
donaldcrane f5c0a39
resolving conflicts
Extremophile-ai 9e87f29
feature(setup):create user account
Extremophile-ai 87eab33
resolving conflicts
Extremophile-ai f578d07
feature(setup):crea user account
Extremophile-ai f51f7d4
feature(setup):create user account
Extremophile-ai bc4d422
refactored
Extremophile-ai c7d181d
include tests for user sign-up
Extremophile-ai b14a7d6
modify config/config.js
Extremophile-ai a633a51
resolving conflicts
Extremophile-ai 7335340
feature(setup):create user account
Extremophile-ai f487bdb
resolving conflicts
Extremophile-ai 2401c83
Resolve conflictss
Extremophile-ai 06dabb1
Resolve conflict
Extremophile-ai 7ade479
feature(setup):create user account
Extremophile-ai 360974e
Resolve conflict
Extremophile-ai b6a90a9
fix conflicts
Extremophile-ai 2a134ad
fix conflicts in src/controllers/user.js
Extremophile-ai 3a3f2e7
modify eslint
Extremophile-ai 7a97b05
modify eslint
Extremophile-ai e9a0d5e
resolving conflicts
Extremophile-ai 84845da
fix conflicts package.json
Extremophile-ai e033ca1
fix conflicts in models
Extremophile-ai a435cf8
resolving conflicts
Extremophile-ai 1f8a0e1
resolving conflicts
Extremophile-ai 8cf66e4
resolving conflicts
Extremophile-ai 9980613
feature(setup):create user account
Extremophile-ai dbe37e1
fix conflicts
Extremophile-ai ca81060
fix conflicts
Extremophile-ai 3c066ba
feature(setup):create user account
Extremophile-ai 4236fdb
conflict resolution
Extremophile-ai f0d30d0
conflict resolution
Extremophile-ai e3486f8
modify config/config.js
Extremophile-ai 7549167
feature(setup):create user account
Extremophile-ai ff75c95
fix conflicts
Extremophile-ai 2542b15
fix conflicts
Extremophile-ai 89b6301
fix conflicts
Extremophile-ai 8a8f611
feature(setup):create user account
Extremophile-ai 9a3b09c
fix conflicts
Extremophile-ai b0b3471
fix conflicts
Extremophile-ai 57b66ed
modify eslint
Extremophile-ai e451e1c
fix conflicts
Extremophile-ai 97a04a1
refactor user models
Extremophile-ai e27f702
models/user.js
Extremophile-ai e1451e9
resolving conflicts
Extremophile-ai 5a02caf
resolving conflicts
Extremophile-ai 4996ea1
resolving conflicts
Extremophile-ai 57f65cf
resolving conflicts
Extremophile-ai abf7b2f
fix undefined error
Extremophile-ai 839fa50
resolving conflicts
Extremophile-ai 13c08dd
resolving conflicts
Extremophile-ai 649b1b1
resolving conflicts
Extremophile-ai 2b206e1
Add User Validation
Extremophile-ai d47f2b4
resolving conflicts
Extremophile-ai de928aa
resolving conflicts
Extremophile-ai 7739066
feature(setup):create user account
Extremophile-ai 69f6eb2
resolving conflicts
Extremophile-ai 4bf9e44
resolving conflicts
Extremophile-ai 247f92e
feature(setup):create user account
Extremophile-ai 6bcb0b7
resolving conflicts
Extremophile-ai a54a9bb
resolving conflicts
Extremophile-ai bb99722
resolving conflicts
Extremophile-ai 7a40bea
feature(setup):create user account
Extremophile-ai 31c9b81
resolving conflicts
Extremophile-ai 4efd331
Resolve conflictss
Extremophile-ai 2a219c1
Resolve conflict
Extremophile-ai a57d62e
feature(setup):create user account
Extremophile-ai fe9f7f6
Resolve conflict
Extremophile-ai 388e6a8
fix conflicts
Extremophile-ai 896e532
fix conflicts in src/controllers/user.js
Extremophile-ai 411775c
modify eslint
Extremophile-ai 5286761
modify eslint
Extremophile-ai 3dc3d6f
resolving conflicts
Extremophile-ai ece72b6
resolving conflicts
Extremophile-ai b7279e9
fix conflicts in models
Extremophile-ai 194a1d6
resolving conflicts
Extremophile-ai 4cc24ef
resolving conflicts
Extremophile-ai 1b0c89c
resolving conflicts
Extremophile-ai 702ddf8
resolving conflicts
Extremophile-ai eac4b66
feature(setup):create user account
Extremophile-ai c184f0e
resolving conflicts
Extremophile-ai 30659f8
resolving conflicts
Extremophile-ai 2bb10b0
resolving conflicts
Extremophile-ai bab64a0
feature(setup):create user account
Extremophile-ai 2403de5
resolving conflicts
Extremophile-ai 58a96ad
resolving conflicts
Extremophile-ai 6cfa271
modify config/config.js
Extremophile-ai 5601f54
resolving conflicts
Extremophile-ai 446477b
fix conflicts
Extremophile-ai bc1475e
feature(setup):create user account
Extremophile-ai 8c1647f
resolving conflicts
Extremophile-ai f4c9cde
resolving conflicts
Extremophile-ai cc28a9e
resolving conflicts
Extremophile-ai f087c22
feature(setup):create user account
Extremophile-ai fedeb60
resolving conflicts
Extremophile-ai ccf9ce0
resolving conflicts
Extremophile-ai a0f346d
modify config/config.js
Extremophile-ai 10510f5
resolving conflicts
Extremophile-ai 030681f
modify eslint
Extremophile-ai 8bd11f3
resolving conflicts
Extremophile-ai ff5ed02
resolving conflicts
Extremophile-ai c9311d8
resolving conflicts
Extremophile-ai 373a069
resolving conflicts
Extremophile-ai 6580cc8
resolving conflicts
Extremophile-ai 09c8fec
resolving conflicts
Extremophile-ai 1434191
resolving conflicts
Extremophile-ai 16c9530
resolving conflicts
Extremophile-ai 3530019
resolving conflicts
Extremophile-ai c3f6c81
change coveralls token
Extremophile-ai a1a86af
package.json
Extremophile-ai fe4acfc
fix conflicts
Extremophile-ai c7890d0
finish resolving conflicts
Extremophile-ai edb319a
feat:Build user sign up
Extremophile-ai a69667a
modified user-sign-in.js
donaldcrane 4fd0d14
modified tests folder
donaldcrane 6e4235f
add clientID
Augusta-E 8567262
fix src/models/index
Extremophile-ai d238a69
added user sign in test files
donaldcrane e6c9c51
refactor code
Augusta-E 7e6a05d
fix validation error message [wip]
Extremophile-ai abc6e99
fix validation error and hash seeders password
Extremophile-ai 2a54154
fix codeclimate line-exceeded-error
Extremophile-ai 6ee8877
one commit
Augusta-E 1794fce
add route
Augusta-E 09b10d5
route
Augusta-E 3dded96
resolve conflicts
Augusta-E c69949c
resolve conflict
Augusta-E ff0ab0b
add test
Augusta-E abe34a7
refactor code
Augusta-E 7bca037
refactor
Augusta-E 9a8ec3f
resolve conflict
Augusta-E 214c1c7
add test
Augusta-E 04cef05
add test
Augusta-E 45e6d2d
add test
Augusta-E fbbbf00
resolve conflict
Augusta-E a3569b8
resolve conflict
Augusta-E f5c4a9a
resolve conflict
Augusta-E 657cba0
resolve conflict
Augusta-E 023bec8
resolve conflict
Augusta-E d12edc8
add test
Augusta-E 2873d92
make changes
Augusta-E c2bb105
Merge branch 'develop' of https://github.com/devcareer/code-jammers-b…
Augusta-E f092054
resolve conflict
Augusta-E 50a0c01
Merge branch 'develop' of https://github.com/devcareer/code-jammers-b…
Augusta-E 8bcccd0
resolve conflict
Augusta-E 56675de
make changes
Augusta-E 0e0607e
resolve conflict
Augusta-E 7cdec03
resolve conflict
Augusta-E 3b5afb7
refactor code
Augusta-E File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import dotenv from "dotenv"; | ||
| import FacebookStrategy from "passport-facebook"; | ||
| import database from "../../models"; | ||
| import User from "../../services/UserService/User"; | ||
|
|
||
| dotenv.config(); | ||
|
|
||
| const fbStrategy = new FacebookStrategy({ | ||
| clientID: process.env.FACEBOOK_CLIENT_ID, | ||
| clientSecret: process.env.FACEBOOK_CLIENT_SECRET, | ||
| callbackURL: process.env.FACEBOOK_CALLBACK_URL, | ||
| profileFields: ["id", "name", "email", "displayName"] | ||
| }, | ||
| async (accessToken, refreshToken, profile, done) => { | ||
| try { | ||
| const username = (profile.displayName).toLowerCase(); | ||
| const email = profile.emails[0].value; | ||
|
|
||
| // check if user already exists in our database | ||
| const userExist = await database.Users.findOne( | ||
| { where: { facebookId: profile.id } } | ||
| ); | ||
| if (userExist) { | ||
| return done(null, userExist); | ||
| } | ||
| const emailExist = await database.Users.findOne({ where: { email } }); | ||
| if (emailExist) { | ||
| return done( | ||
| null, "Email already exist, please sign in with your email and password" | ||
| ); | ||
|
|
||
| } | ||
| if (!userExist) { | ||
| const newUser = { | ||
| email, | ||
| username, | ||
| facebookId: profile.id, | ||
| password: "", | ||
| role: "User", | ||
| verified: "true" | ||
| }; | ||
| await User.createUser(newUser); | ||
| return done(null, newUser); | ||
| } | ||
| } catch (err) { | ||
| return done(err, false); | ||
| } | ||
| }); | ||
|
|
||
| export { fbStrategy }; | ||
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import chai from "chai"; | ||
| import chaiHttp from "chai-http"; | ||
| import server from "../app"; | ||
|
|
||
| chai.should(); | ||
|
|
||
| chai.use(chaiHttp); | ||
|
|
||
| describe("Signin a user with facebook oauth", () => { | ||
| it("it should signin a user with facebook oauth", done => { | ||
| chai.request(server).get("/auth/facebook/callback"); | ||
| done(); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use classes and static methods for consistency