Skip to content

Commit 28881fa

Browse files
Merge pull request #2 from codeuino/development
Development
2 parents c36a14a + c5ef7ca commit 28881fa

23 files changed

+1896
-1550
lines changed

.eslintrc.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"env": {
3+
"node": true,
4+
"commonjs": true,
5+
"es6": true,
6+
"jasmine": true,
7+
"jquery": true,
8+
"browser": true,
9+
"mocha": true
10+
},
11+
"extends": [
12+
"eslint:recommended",
13+
"prettier"
14+
],
15+
"parserOptions": {
16+
"ecmaVersion": 2016
17+
},
18+
"plugins": ["prettier"],
19+
"rules": {
20+
"indent": [
21+
"error",
22+
2
23+
],
24+
"linebreak-style": [
25+
"error",
26+
"windows"
27+
],
28+
"quotes": [
29+
"error",
30+
"single"
31+
],
32+
"semi": [
33+
"error",
34+
"always"
35+
],
36+
"prettier/prettier": [
37+
"error",
38+
{
39+
"singleQuote": true
40+
}
41+
],
42+
"no-unused-vars": 1,
43+
"no-console": 1,
44+
"no-redeclare" : 1
45+
}
46+
}

config/credential.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
oauth: {
3-
clientID: "192695093229-kf95jtdv1jge25d86ak99e68dkrpu33o.apps.googleusercontent.com",
4-
clientSecret: "rXvfxBahDlJF1ORk7y660XM8"
3+
clientID:
4+
'192695093229-kf95jtdv1jge25d86ak99e68dkrpu33o.apps.googleusercontent.com',
5+
clientSecret: 'rXvfxBahDlJF1ORk7y660XM8'
56
},
67
database: 'mongodb://localhost:27017/donut1',
78
github: {
@@ -12,4 +13,4 @@ module.exports = {
1213
clientID: '383717979035587',
1314
clientSecret: '82bd80d286ef6e45606da6d53a97efbc'
1415
}
15-
}
16+
};

config/facebook.js

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
1-
const passport = require('passport');
2-
const FacebookStrategy = require('passport-facebook').Strategy;
3-
const credentials = require('./credential.js');
4-
const user = require('../schema/user.js');
5-
6-
passport.serializeUser(function(user, done) {
7-
done(null, user.id);
8-
});
9-
10-
passport.deserializeUser(function(id, done) {
11-
user.findById(id).then(function(user) {
12-
done(null, user);
13-
});
14-
});
15-
16-
passport.use(new FacebookStrategy({
17-
clientID: credentials.facebook.clientID,
18-
clientSecret: credentials.facebook.clientSecret,
19-
callbackURL: '/auth/facebook/redirect'
20-
}, (accessToken,refreshToken,profile,done) => {
21-
user.findOne({Eid:profile.id}).then( (data) => {
22-
if(data)
23-
{
24-
console.log("Already in Database");
25-
done(null,data);
26-
}
27-
else
28-
{
29-
new user({
30-
fname: profile.name.givenName,
31-
lname: profile.name.familyName,
32-
username: profile.name.givenName + ' ' + profile.name.familyName,
33-
Eid: profile.id
34-
})
35-
.save()
36-
.then( (us) => {
37-
done(null,us);
38-
});
39-
}
40-
});
41-
}));
1+
const passport = require('passport');
2+
const FacebookStrategy = require('passport-facebook').Strategy;
3+
const credentials = require('./credential.js');
4+
const user = require('../schema/user.js');
5+
6+
passport.serializeUser(function(user, done) {
7+
done(null, user.id);
8+
});
9+
10+
passport.deserializeUser(function(id, done) {
11+
user.findById(id).then(function(user) {
12+
done(null, user);
13+
});
14+
});
15+
16+
passport.use(
17+
new FacebookStrategy(
18+
{
19+
clientID: credentials.facebook.clientID,
20+
clientSecret: credentials.facebook.clientSecret,
21+
callbackURL: '/auth/facebook/redirect'
22+
},
23+
(accessToken, refreshToken, profile, done) => {
24+
user.findOne({ Eid: profile.id }).then(data => {
25+
if (data) {
26+
console.log('Already in Database');
27+
done(null, data);
28+
} else {
29+
new user({
30+
fname: profile.name.givenName,
31+
lname: profile.name.familyName,
32+
username: profile.name.givenName + ' ' + profile.name.familyName,
33+
Eid: profile.id
34+
})
35+
.save()
36+
.then(us => {
37+
done(null, us);
38+
});
39+
}
40+
});
41+
}
42+
)
43+
);

config/github.js

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const passport=require('passport');
2-
const github=require('passport-github');
3-
const user=require('../schema/user.js');
4-
const secret=require('./credential.js');
1+
const passport = require('passport');
2+
const github = require('passport-github');
3+
const user = require('../schema/user.js');
4+
const secret = require('./credential.js');
55

66
passport.serializeUser(function(user, done) {
77
done(null, user.id);
@@ -12,26 +12,29 @@ passport.deserializeUser(function(id, done) {
1212
});
1313
});
1414

15-
passport.use(new github(
15+
passport.use(
16+
new github(
1617
{
17-
clientID:secret.github.clientID,
18-
clientSecret:secret.github.clientSecret,
19-
callbackURL:'/auth/github/redirect'
20-
},
21-
function(ac,re,pro,done){
22-
user.findOne({Eid:pro.id}).then(function(data){
23-
if(data)
24-
{
25-
console.log("Already in database");
26-
done(null,data);
27-
}
28-
else {
29-
new user({
30-
username: pro.username,
31-
Eid: pro.id
32-
}).save().then(function(us){
33-
done(null,us);
34-
})
35-
}
36-
})
37-
}))
18+
clientID: secret.github.clientID,
19+
clientSecret: secret.github.clientSecret,
20+
callbackURL: '/auth/github/redirect'
21+
},
22+
function(ac, re, pro, done) {
23+
user.findOne({ Eid: pro.id }).then(function(data) {
24+
if (data) {
25+
console.log('Already in database');
26+
done(null, data);
27+
} else {
28+
new user({
29+
username: pro.username,
30+
Eid: pro.id
31+
})
32+
.save()
33+
.then(function(us) {
34+
done(null, us);
35+
});
36+
}
37+
});
38+
}
39+
)
40+
);

0 commit comments

Comments
 (0)