Skip to content
Open
Show file tree
Hide file tree
Changes from all 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 Sep 16, 2020
7789ca4
Resolve conflictss
Extremophile-ai Sep 16, 2020
be0dd28
Resolve conflictss
Extremophile-ai Sep 16, 2020
2be55c0
Resolve conflict
Extremophile-ai Sep 16, 2020
a26dd13
feature(setup):create user account
Extremophile-ai Sep 7, 2020
ee13585
Resolve conflict
Extremophile-ai Sep 16, 2020
ea804de
fix conflicts
Extremophile-ai Sep 16, 2020
d44c3f8
fix conflicts in src/controllers/user.js
Extremophile-ai Sep 16, 2020
8260969
modify eslint
Extremophile-ai Sep 11, 2020
761a681
modify eslint
Extremophile-ai Sep 11, 2020
0e7e00d
fix conflicts package.json
Extremophile-ai Sep 16, 2020
e496461
fix conflicts package.json
Extremophile-ai Sep 16, 2020
9ab936d
fix conflicts in models
Extremophile-ai Sep 16, 2020
d0974ff
fix conflicts in coverage
Extremophile-ai Sep 16, 2020
11c7f4e
fix coverage
Extremophile-ai Sep 16, 2020
e6f281f
resolve merge conflict
Extremophile-ai Sep 16, 2020
1bb0234
rebase develop
Extremophile-ai Sep 16, 2020
9c70cf7
fix conflicts
Extremophile-ai Sep 16, 2020
30aa778
fix undefined error
Extremophile-ai Sep 16, 2020
f916bf8
fix undefined error
Extremophile-ai Sep 16, 2020
d84d9cf
rearrange folder
Extremophile-ai Sep 17, 2020
c5cd252
Merge branch 'ft-user-sign-up-174566160' of https://github.com/devcar…
donaldcrane Sep 17, 2020
dea3e8e
modified sign-in feature
donaldcrane Sep 17, 2020
0993a9b
resolved conflict
donaldcrane Sep 17, 2020
84d76fc
add email conflict test
Extremophile-ai Sep 17, 2020
ca70e8e
resolved conflict
donaldcrane Sep 17, 2020
5a6ba69
add validation
Extremophile-ai Sep 17, 2020
0cb3b24
resolve conflicts
Extremophile-ai Sep 16, 2020
33f6f5b
rebase and fix conflicts
Extremophile-ai Sep 17, 2020
7f5b7d7
resolve conflicts
Extremophile-ai Sep 17, 2020
71d2a37
feature(setup):create user account
Extremophile-ai Sep 7, 2020
ef0dfba
resolve conflicts
Extremophile-ai Sep 17, 2020
e2f6821
feature(setup):crea user account
Extremophile-ai Sep 9, 2020
6a1129f
feature(setup):create user account
Extremophile-ai Sep 7, 2020
0a9556e
refactored
Extremophile-ai Sep 9, 2020
392cae0
include tests for user sign-up
Extremophile-ai Sep 10, 2020
3f5860e
modify config/config.js
Extremophile-ai Sep 10, 2020
bc30f94
resolve conflicts
Extremophile-ai Sep 17, 2020
7757801
feature(setup):create user account
Extremophile-ai Sep 7, 2020
9c6c6d6
Resolve conflictss
Extremophile-ai Sep 16, 2020
b924556
Resolve conflictss
Extremophile-ai Sep 16, 2020
c06e86a
Resolve conflict
Extremophile-ai Sep 16, 2020
9e27373
feature(setup):create user account
Extremophile-ai Sep 7, 2020
78d7a2a
Resolve conflict
Extremophile-ai Sep 16, 2020
59e7a67
fix conflicts
Extremophile-ai Sep 16, 2020
5170efd
fix conflicts in src/controllers/user.js
Extremophile-ai Sep 16, 2020
0f9d825
modify eslint
Extremophile-ai Sep 11, 2020
8823f7b
modify eslint
Extremophile-ai Sep 11, 2020
82bb292
fix conflicts package.json
Extremophile-ai Sep 16, 2020
4d5700a
fix conflicts package.json
Extremophile-ai Sep 16, 2020
1dd160b
fix conflicts in models
Extremophile-ai Sep 16, 2020
960f15c
resolve conflicts
Extremophile-ai Sep 17, 2020
7954e62
resolve conflicts
Extremophile-ai Sep 17, 2020
d471bdb
resolve conflict
Extremophile-ai Sep 17, 2020
a64e079
fix conflicts
Extremophile-ai Sep 17, 2020
87e2ece
rebase develop
Extremophile-ai Sep 16, 2020
3e6c59b
fix conflicts
Extremophile-ai Sep 17, 2020
62fe889
gitnored coverage
donaldcrane Sep 17, 2020
aa7c3bb
fix conflicts
Extremophile-ai Sep 17, 2020
fea195f
feature(setup):create user account
Extremophile-ai Sep 7, 2020
c77e6b4
fix conflicts
Extremophile-ai Sep 17, 2020
a5ff6f4
fix conflicts
Extremophile-ai Sep 17, 2020
5cb0623
feature(setup):create user account
Extremophile-ai Sep 7, 2020
04a65df
conflict resolution
Extremophile-ai Sep 17, 2020
87b03df
conflict resolution
Extremophile-ai Sep 17, 2020
eaddb02
modify config/config.js
Extremophile-ai Sep 10, 2020
abde059
feature(setup):create user account
Extremophile-ai Sep 7, 2020
e4e387c
fix conflicts
Extremophile-ai Sep 17, 2020
1a9e56d
fix conflicts
Extremophile-ai Sep 17, 2020
8db4ecf
fix conflicts
Extremophile-ai Sep 17, 2020
e704c98
feature(setup):create user account
Extremophile-ai Sep 7, 2020
7d43ac1
fix conflicts
Extremophile-ai Sep 17, 2020
009e1e4
fix conflicts
Extremophile-ai Sep 17, 2020
054d63d
modify eslint
Extremophile-ai Sep 11, 2020
a663710
fix conflicts
Extremophile-ai Sep 17, 2020
64752fd
fix conflicts
Extremophile-ai Sep 17, 2020
522609e
refactor user models
Extremophile-ai Sep 14, 2020
0046a5a
models/user.js
Extremophile-ai Sep 14, 2020
51b4729
fix conflicts
Extremophile-ai Sep 17, 2020
97eeae8
fix conflicts
Extremophile-ai Sep 17, 2020
8a671a6
fix undefined error
Extremophile-ai Sep 16, 2020
73c7d8e
resolved user authentication
donaldcrane Sep 17, 2020
d828687
fix conflicts
Extremophile-ai Sep 17, 2020
bfa813b
fix conflicts
Extremophile-ai Sep 17, 2020
3b98867
add validation
Extremophile-ai Sep 17, 2020
b6729ae
resolved code climate error
donaldcrane Sep 17, 2020
1433af6
resolved code climate
donaldcrane Sep 17, 2020
1c5a527
Add User Validation
Extremophile-ai Sep 17, 2020
543d8e5
Add User Validation
Extremophile-ai Sep 17, 2020
39c362d
resolved code climate conflict
donaldcrane Sep 17, 2020
e74d371
edit .github
Extremophile-ai Sep 17, 2020
80188bd
resolved conflict
donaldcrane Sep 17, 2020
f54ece8
resolved conflict
donaldcrane Sep 17, 2020
2682f0d
fix coverage script in package.json
Extremophile-ai Sep 17, 2020
674c1e7
change coveralls token
Extremophile-ai Sep 17, 2020
1588af4
change coveralls token
Extremophile-ai Sep 17, 2020
b624a62
finished user sign-in feature
donaldcrane Sep 18, 2020
484aaf1
fixed code climate
donaldcrane Sep 18, 2020
789732f
resolved conflict
donaldcrane Sep 18, 2020
af51498
feat(facebook signup): A user can signup/in wth fb
Augusta-E Sep 18, 2020
4153a9e
resolved comment.js
donaldcrane Sep 18, 2020
0175f58
added tlds domain name
donaldcrane Sep 18, 2020
f5c0a39
resolving conflicts
Extremophile-ai Sep 20, 2020
9e87f29
feature(setup):create user account
Extremophile-ai Sep 7, 2020
87eab33
resolving conflicts
Extremophile-ai Sep 20, 2020
f578d07
feature(setup):crea user account
Extremophile-ai Sep 9, 2020
f51f7d4
feature(setup):create user account
Extremophile-ai Sep 7, 2020
bc4d422
refactored
Extremophile-ai Sep 9, 2020
c7d181d
include tests for user sign-up
Extremophile-ai Sep 10, 2020
b14a7d6
modify config/config.js
Extremophile-ai Sep 10, 2020
a633a51
resolving conflicts
Extremophile-ai Sep 20, 2020
7335340
feature(setup):create user account
Extremophile-ai Sep 7, 2020
f487bdb
resolving conflicts
Extremophile-ai Sep 20, 2020
2401c83
Resolve conflictss
Extremophile-ai Sep 16, 2020
06dabb1
Resolve conflict
Extremophile-ai Sep 16, 2020
7ade479
feature(setup):create user account
Extremophile-ai Sep 7, 2020
360974e
Resolve conflict
Extremophile-ai Sep 16, 2020
b6a90a9
fix conflicts
Extremophile-ai Sep 16, 2020
2a134ad
fix conflicts in src/controllers/user.js
Extremophile-ai Sep 16, 2020
3a3f2e7
modify eslint
Extremophile-ai Sep 11, 2020
7a97b05
modify eslint
Extremophile-ai Sep 11, 2020
e9a0d5e
resolving conflicts
Extremophile-ai Sep 20, 2020
84845da
fix conflicts package.json
Extremophile-ai Sep 16, 2020
e033ca1
fix conflicts in models
Extremophile-ai Sep 16, 2020
a435cf8
resolving conflicts
Extremophile-ai Sep 20, 2020
1f8a0e1
resolving conflicts
Extremophile-ai Sep 20, 2020
8cf66e4
resolving conflicts
Extremophile-ai Sep 20, 2020
9980613
feature(setup):create user account
Extremophile-ai Sep 7, 2020
dbe37e1
fix conflicts
Extremophile-ai Sep 17, 2020
ca81060
fix conflicts
Extremophile-ai Sep 17, 2020
3c066ba
feature(setup):create user account
Extremophile-ai Sep 7, 2020
4236fdb
conflict resolution
Extremophile-ai Sep 17, 2020
f0d30d0
conflict resolution
Extremophile-ai Sep 17, 2020
e3486f8
modify config/config.js
Extremophile-ai Sep 10, 2020
7549167
feature(setup):create user account
Extremophile-ai Sep 7, 2020
ff75c95
fix conflicts
Extremophile-ai Sep 17, 2020
2542b15
fix conflicts
Extremophile-ai Sep 17, 2020
89b6301
fix conflicts
Extremophile-ai Sep 17, 2020
8a8f611
feature(setup):create user account
Extremophile-ai Sep 7, 2020
9a3b09c
fix conflicts
Extremophile-ai Sep 17, 2020
b0b3471
fix conflicts
Extremophile-ai Sep 17, 2020
57b66ed
modify eslint
Extremophile-ai Sep 11, 2020
e451e1c
fix conflicts
Extremophile-ai Sep 17, 2020
97a04a1
refactor user models
Extremophile-ai Sep 14, 2020
e27f702
models/user.js
Extremophile-ai Sep 14, 2020
e1451e9
resolving conflicts
Extremophile-ai Sep 20, 2020
5a02caf
resolving conflicts
Extremophile-ai Sep 20, 2020
4996ea1
resolving conflicts
Extremophile-ai Sep 20, 2020
57f65cf
resolving conflicts
Extremophile-ai Sep 20, 2020
abf7b2f
fix undefined error
Extremophile-ai Sep 16, 2020
839fa50
resolving conflicts
Extremophile-ai Sep 20, 2020
13c08dd
resolving conflicts
Extremophile-ai Sep 20, 2020
649b1b1
resolving conflicts
Extremophile-ai Sep 20, 2020
2b206e1
Add User Validation
Extremophile-ai Sep 17, 2020
d47f2b4
resolving conflicts
Extremophile-ai Sep 20, 2020
de928aa
resolving conflicts
Extremophile-ai Sep 20, 2020
7739066
feature(setup):create user account
Extremophile-ai Sep 7, 2020
69f6eb2
resolving conflicts
Extremophile-ai Sep 20, 2020
4bf9e44
resolving conflicts
Extremophile-ai Sep 20, 2020
247f92e
feature(setup):create user account
Extremophile-ai Sep 7, 2020
6bcb0b7
resolving conflicts
Extremophile-ai Sep 20, 2020
a54a9bb
resolving conflicts
Extremophile-ai Sep 20, 2020
bb99722
resolving conflicts
Extremophile-ai Sep 20, 2020
7a40bea
feature(setup):create user account
Extremophile-ai Sep 7, 2020
31c9b81
resolving conflicts
Extremophile-ai Sep 20, 2020
4efd331
Resolve conflictss
Extremophile-ai Sep 16, 2020
2a219c1
Resolve conflict
Extremophile-ai Sep 16, 2020
a57d62e
feature(setup):create user account
Extremophile-ai Sep 7, 2020
fe9f7f6
Resolve conflict
Extremophile-ai Sep 16, 2020
388e6a8
fix conflicts
Extremophile-ai Sep 16, 2020
896e532
fix conflicts in src/controllers/user.js
Extremophile-ai Sep 16, 2020
411775c
modify eslint
Extremophile-ai Sep 11, 2020
5286761
modify eslint
Extremophile-ai Sep 11, 2020
3dc3d6f
resolving conflicts
Extremophile-ai Sep 20, 2020
ece72b6
resolving conflicts
Extremophile-ai Sep 20, 2020
b7279e9
fix conflicts in models
Extremophile-ai Sep 16, 2020
194a1d6
resolving conflicts
Extremophile-ai Sep 20, 2020
4cc24ef
resolving conflicts
Extremophile-ai Sep 20, 2020
1b0c89c
resolving conflicts
Extremophile-ai Sep 20, 2020
702ddf8
resolving conflicts
Extremophile-ai Sep 20, 2020
eac4b66
feature(setup):create user account
Extremophile-ai Sep 7, 2020
c184f0e
resolving conflicts
Extremophile-ai Sep 20, 2020
30659f8
resolving conflicts
Extremophile-ai Sep 20, 2020
2bb10b0
resolving conflicts
Extremophile-ai Sep 20, 2020
bab64a0
feature(setup):create user account
Extremophile-ai Sep 7, 2020
2403de5
resolving conflicts
Extremophile-ai Sep 20, 2020
58a96ad
resolving conflicts
Extremophile-ai Sep 20, 2020
6cfa271
modify config/config.js
Extremophile-ai Sep 10, 2020
5601f54
resolving conflicts
Extremophile-ai Sep 20, 2020
446477b
fix conflicts
Extremophile-ai Sep 11, 2020
bc1475e
feature(setup):create user account
Extremophile-ai Sep 7, 2020
8c1647f
resolving conflicts
Extremophile-ai Sep 20, 2020
f4c9cde
resolving conflicts
Extremophile-ai Sep 21, 2020
cc28a9e
resolving conflicts
Extremophile-ai Sep 21, 2020
f087c22
feature(setup):create user account
Extremophile-ai Sep 7, 2020
fedeb60
resolving conflicts
Extremophile-ai Sep 21, 2020
ccf9ce0
resolving conflicts
Extremophile-ai Sep 21, 2020
a0f346d
modify config/config.js
Extremophile-ai Sep 10, 2020
10510f5
resolving conflicts
Extremophile-ai Sep 21, 2020
030681f
modify eslint
Extremophile-ai Sep 11, 2020
8bd11f3
resolving conflicts
Extremophile-ai Sep 21, 2020
ff5ed02
resolving conflicts
Extremophile-ai Sep 21, 2020
c9311d8
resolving conflicts
Extremophile-ai Sep 21, 2020
373a069
resolving conflicts
Extremophile-ai Sep 21, 2020
6580cc8
resolving conflicts
Extremophile-ai Sep 21, 2020
09c8fec
resolving conflicts
Extremophile-ai Sep 21, 2020
1434191
resolving conflicts
Extremophile-ai Sep 21, 2020
16c9530
resolving conflicts
Extremophile-ai Sep 21, 2020
3530019
resolving conflicts
Extremophile-ai Sep 21, 2020
c3f6c81
change coveralls token
Extremophile-ai Sep 17, 2020
a1a86af
package.json
Extremophile-ai Sep 20, 2020
fe4acfc
fix conflicts
Extremophile-ai Sep 21, 2020
c7890d0
finish resolving conflicts
Extremophile-ai Sep 21, 2020
edb319a
feat:Build user sign up
Extremophile-ai Sep 21, 2020
a69667a
modified user-sign-in.js
donaldcrane Sep 21, 2020
4fd0d14
modified tests folder
donaldcrane Sep 21, 2020
6e4235f
add clientID
Augusta-E Sep 21, 2020
8567262
fix src/models/index
Extremophile-ai Sep 22, 2020
d238a69
added user sign in test files
donaldcrane Sep 22, 2020
e6c9c51
refactor code
Augusta-E Sep 23, 2020
7e6a05d
fix validation error message [wip]
Extremophile-ai Sep 23, 2020
abc6e99
fix validation error and hash seeders password
Extremophile-ai Sep 24, 2020
2a54154
fix codeclimate line-exceeded-error
Extremophile-ai Sep 24, 2020
6ee8877
one commit
Augusta-E Sep 24, 2020
1794fce
add route
Augusta-E Sep 24, 2020
09b10d5
route
Augusta-E Sep 28, 2020
3dded96
resolve conflicts
Augusta-E Sep 29, 2020
c69949c
resolve conflict
Augusta-E Sep 30, 2020
ff0ab0b
add test
Augusta-E Oct 6, 2020
abe34a7
refactor code
Augusta-E Oct 8, 2020
7bca037
refactor
Augusta-E Oct 10, 2020
9a8ec3f
resolve conflict
Augusta-E Oct 15, 2020
214c1c7
add test
Augusta-E Oct 17, 2020
04cef05
add test
Augusta-E Oct 21, 2020
45e6d2d
add test
Augusta-E Oct 21, 2020
fbbbf00
resolve conflict
Augusta-E Oct 28, 2020
a3569b8
resolve conflict
Augusta-E Nov 2, 2020
f5c4a9a
resolve conflict
Augusta-E Nov 2, 2020
657cba0
resolve conflict
Augusta-E Nov 2, 2020
023bec8
resolve conflict
Augusta-E Nov 2, 2020
d12edc8
add test
Augusta-E Nov 2, 2020
2873d92
make changes
Augusta-E Nov 4, 2020
c2bb105
Merge branch 'develop' of https://github.com/devcareer/code-jammers-b…
Augusta-E Nov 6, 2020
f092054
resolve conflict
Augusta-E Nov 6, 2020
50a0c01
Merge branch 'develop' of https://github.com/devcareer/code-jammers-b…
Augusta-E Nov 6, 2020
8bcccd0
resolve conflict
Augusta-E Nov 6, 2020
56675de
make changes
Augusta-E Nov 6, 2020
0e0607e
resolve conflict
Augusta-E Nov 8, 2020
7cdec03
resolve conflict
Augusta-E Nov 16, 2020
3b5afb7
refactor code
Augusta-E Nov 16, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ JWT_KEY = secret
SENDGRID_API_KEY= "your API KEY goes here"
SENDGRID_EMAIL = "your SENDGRID EMAIL goes here"
NODE_ENV = development

FACEBOOK_CLIENT_ID = "facebook ID"
FACEBOOK_CLIENT_SECRET = "facebook Secret key"
FACEBOOK_CALLBACK_URL = "call back url"
COOKIE_KEY = cookieKey

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@
"@sendgrid/mail": "^7.2.6",
"async": "^3.2.0",
"bcrypt": "^5.0.0",
"body-parser": "^1.19.0",
"cookie-session": "^1.4.0",
"cors": "^2.8.5",
"cross-env": "^7.0.2",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"joi": "^17.2.1",
"jsonwebtoken": "^8.5.1",
"passport": "^0.4.1",
"passport-facebook": "^3.0.0",
"nodemailer": "^6.4.14",
"nodemon": "^2.0.4",
"passport": "^0.4.1",
"passport-google-oauth20": "^2.0.0",
"path": "^0.12.7",
"pg": "^8.3.3",
Expand Down
23 changes: 22 additions & 1 deletion src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,35 @@ import cors from "cors";
import dotenv from "dotenv";
import { googleStrategy } from "./database/config/google-passport";
import router from "./routes/index";
import { fbStrategy } from "./database/config/fbpassport";

dotenv.config();

const swaggerUi = require("swagger-ui-express");

dotenv.config();

const app = express();
const port = process.env.PORT || 3000;

app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: true }));

app.use(cookieSession({
maxAge: 24 * 60 * 60 * 1000,
keys: process.env.COOKIE_KEY
}));

passport.serializeUser((user, done) => {
done(null, user);
});
passport.deserializeUser((user, done) => {
done(null, user);
});
app.use(passport.initialize());
app.use(passport.session());

passport.use(fbStrategy);

app.use(express.json());
app.use(cors());
app.use("/api/v1/", router);
Expand Down
48 changes: 48 additions & 0 deletions src/database/config/fbpassport.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import dotenv from "dotenv";
import FacebookStrategy from "passport-facebook";
import model from "../../models";
import User from "../../services/UserService/User";

const { Users } = model;
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 userExist = await Users.findOne(
{ where: { facebookId: profile.id } }
);
if (userExist) {
const msgObj = { status: 409, error: "User already exist" };
return done(null, msgObj);
}
const emailExist = await Users.findOne({ where: { email } });
if (emailExist) {
const msgObj = ({ status: 404, error: "Email already used by another user." });
return done(null, msgObj);
}

if (!userExist) {
const newUser = {
email: profile.emails[0].value,
username: (profile.displayName).toLowerCase(),
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 removed src/database/config/passport.js
Empty file.
3 changes: 3 additions & 0 deletions src/database/migrations/20200903160620-create-user.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ module.exports = {
username: {
type: Sequelize.STRING,
},
facebookId: {
type: Sequelize.STRING,
},
password: {
type: Sequelize.STRING,
},
Expand Down
4 changes: 4 additions & 0 deletions src/models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ module.exports = (sequelize, DataTypes) => {
type: DataTypes.BOOLEAN,
defaultValue: false,
},
facebookId: {
type: DataTypes.STRING,
allowNull: true,
},
googleId: {
type: DataTypes.STRING,
allowNull: true,
Expand Down
17 changes: 17 additions & 0 deletions src/routes/userRoute/userRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,21 @@ router.patch("/user-profile/", verifyToken, verifyUserById, userController.updat
router.get("/users/signup/verify/:email", userController.verifyUser);
router.post("/users/signin", userController.loginUser);

router.get(
"/auth/facebook",
passport.authenticate("facebook", { scope: ["email"] })
);

router.get(
"/auth/facebook/callback",
passport.authenticate("facebook", { scope: ["email"] }),
(req, res) => {
if (!req.user.status) {
res.redirect("/");
} else {
res.status(409).send(req.user);
}
}
);

export default router;
21 changes: 21 additions & 0 deletions src/tests/fbOAuth-test.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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();
});
it("it should not sign up a user with an already existing email", done => {
chai.request(server).get("/auth/facebook/callback")
.end((err, res) => {
res.should.have.status(404);
done();
});
});
});
3 changes: 1 addition & 2 deletions src/tests/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import "./index-test";
import "./models/user.spec";
import "./models/profile.spec";
import "./models/food.spec";
import "./models/music.spec";
import "./models/comment.spec";
Expand All @@ -12,6 +10,7 @@ import "./models/country.spec";
import "./models/ethnicgroup.spec";
import "./controllers/users/user-test";
import "./controllers/users/user-sign-in-test";
import "./fbOAuth-test.spec";
import "./google-oauth/google-test.spec";
import "./controllers/userProfileTest/profile-test";
import "./controllers/admin/addCountry.test";
Expand Down