commit 30 05 2018 v3

app.js

@@ -18,13 +18,18 @@ var upload = require("express-fileupload");
 //var morgan = require('morgan');
 var mongoose = require('mongoose');
 var passport = require('passport');
+var session = require('express-session');
 var config = require('./config/database');
 
 //DB
 //mongoose.Promise = require('bluebird');
 mongoose.connect(config.database);
 
-
+app.use(session({
+  secret: 's3cr3t',
+  resave: true,
+  saveUninitialized: true
+}));
 app.use(passport.initialize());
 app.use(passport.session());
 

auth/facebook.js

@@ -8,7 +8,11 @@ var User = require('../models/user');
 passport.use(new FacebookStrategy({
         clientID: "191092458179642",
         clientSecret: "964e490d7e49a13ee7a77c9b65419fb3",
+<<<<<<< HEAD
         callbackURL: "http://127.0.0.1:3000/api/facebook/callback"
+=======
+        callbackURL: "https://localhost:3000/api/facebook/callback"
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
     },
     function(accessToken, refreshToken, profile, done) {
         console.log('yaaauuu : ' + accessToken + ' ----- ' + profile.displayName + ' ----- ' + profile.id);
@@ -34,4 +38,9 @@ passport.use(new FacebookStrategy({
         });*/
     }
 ));
-module.exports = passport;
+<<<<<<< HEAD
+module.exports = passport;
+=======
+
+module.exports = passport;
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc

auth/github.js

@@ -4,7 +4,7 @@ var GitHubStrategy = require('passport-github').Strategy;
 passport.use(new GitHubStrategy({
         clientID: "60a0296da9fce6ca3b7e",
         clientSecret: "9fb2f52123d9d840c98b98b3b4ffbc5dd77d1de3",
-        callbackURL: "https://localhost:3000/auth/github/callback"
+        callbackURL: "https://localhost:3000/api/github/callback"
     },
     function(accessToken, refreshToken, profile, done) {
         User.findOrCreate({userid: profile.id}, {name: profile.displayName,userid: profile.id}, function (err, user) {
@@ -13,4 +13,4 @@ passport.use(new GitHubStrategy({
     }
 ));
 
-module.exports = passport;
+module.exports = passport;

auth/google.js

@@ -4,7 +4,7 @@ var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
 passport.use(new GoogleStrategy({
         clientID: "633754977454-7dcfrsfob7sjq5lim47tc63pdjch6imr.apps.googleusercontent.com",
         clientSecret: "D7lHcUgZbCpmWZtooRlICzAH",
-        callbackURL: "https://localhost:3000/auth/google/callback"
+        callbackURL: "https://localhost:3000/api/google/callback"
     },
     function(accessToken, refreshToken, profile, done) {
         User.findOrCreate({ userid: profile.id }, { name: profile.displayName,userid: profile.id }, function (err, user) {
@@ -13,4 +13,4 @@ passport.use(new GoogleStrategy({
     }
 ));
 
-module.exports = passport;
+module.exports = passport;

package.json

@@ -39,7 +39,10 @@
     "express": "^4.16.2",
     "express-fileupload": "^0.4.0",
     "express-session": "^1.15.6",
+<<<<<<< HEAD
     "find-or-create": "^1.1.0",
+=======
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
     "font-awesome": "4.7.x",
     "form-data": "^2.3.2",
     "gulp": "^3.9.1",

routes/api.js

@@ -18,10 +18,13 @@ var passportFacebook = require('../auth/facebook');
 var passportGoogle = require('../auth/google');
 var passportGitHub = require('../auth/github');
 
+<<<<<<< HEAD
 //var router = express.Router([options]);
 
 
 
+=======
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
 /* creation Token */
 getToken = function (headers) {
     if (headers && headers.authorization) {
@@ -290,15 +293,20 @@ function ensureAuthenticated(req, res, next) {
 /* FACEBOOK ROUTER */
 router.get('/facebook', passportFacebook.authenticate('facebook'));
 
+<<<<<<< HEAD
 
 ///////////////////
 router.get('/facebook/callback',
     passportFacebook.authenticate('facebook', { failureRedirect: 'api/' }),
     function(req, res) {
         console.log('faceeeeboookk !!');
+=======
+router.get('/facebook/callback', passportFacebook.authenticate('facebook', { successRedirect : '/', failureRedirect: '/login' }), function(req, res) {
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
         // Successful authentication, redirect home.
         res.redirect('/api/main');
     });
+<<<<<<< HEAD
 // router.get('/facebook/callback/:id', passport.authenticate('facebook'), function(req, res, err, user, info){
 //     console.log('faceeeeboookk !!');
 //
@@ -348,27 +356,49 @@ router.get('/facebook/callback',
 // router.get('/facebook',
 //     passportFacebook.authenticate('facebook', { scope: ['read_stream', 'publish_actions'] })
 // );
+=======
+router.get('/facebook',
+    passport.authenticate('facebook', { scope: ['read_stream', 'publish_actions'] })
+  );
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
 
 /* GOOGLE ROUTER */
 router.get('/google', passportGoogle.authenticate('google', { scope: 'https://www.google.com/m8/feeds' }));
 
 router.get('/google/callback', passportGoogle.authenticate('google', { successRedirect : '/', failureRedirect: '/login' }), function(req, res) {
+<<<<<<< HEAD
     res.redirect('/');
 });
 router.get('/google',
     passport.authenticate('google', { scope: ['read_stream', 'publish_actions'] })
 );
+=======
+        res.redirect('/');
+    });
+router.get('/google',
+        passport.authenticate('google', { scope: ['read_stream', 'publish_actions'] })
+      );
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
 
 /* GITHUB ROUTER */
 router.get('/github', passportGitHub.authenticate('github', { scope: [ 'user:email' ] }));
 
 router.get('/auth/github/callback', passportGitHub.authenticate('github', { successRedirect : '/', failureRedirect: '/login' }), function(req, res) {
+<<<<<<< HEAD
     // Successful authentication, redirect home.
     res.redirect('/');
 });
 router.get('/github',
     passport.authenticate('github', { scope: ['read_stream', 'publish_actions'] })
 );
+=======
+        // Successful authentication, redirect home.
+        res.redirect('/');
+    });
+router.get('/github',
+          passport.authenticate('github', { scope: ['read_stream', 'publish_actions'] })
+      );
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
 
 
 module.exports = router;

src/app/login/login.component.html

@@ -13,8 +13,13 @@
     <p>
       Not a member? <a [routerLink]="['/signup']">Signup here</a>
     </p>
+
+    <button onclick="location.href='/api/facebook'" type="button" class="btn-floating btn-fb"><i class="fa fa-facebook"></i></button>
+    <button onclick="location.href='/api/github'" type="button" class="btn-floating btn-git"><i class="fa fa-github"></i></button>
+    <button onclick="location.href='/api/google'" type="button" class="btn-floating btn-gplus"><i class="fa fa-google"></i></button>
   </form>
 </div>
+<<<<<<< HEAD
 
 
 
@@ -22,3 +27,5 @@
 <button onclick="location.href='/api/github'" type="button" class="btn-floating btn-git"><i class="fa fa-github"></i></button>
 <button onclick="location.href='/api/google'" type="button" class="btn-floating btn-gplus"><i class="fa fa-google"></i></button>
 <button type="button" class="btn-floating btn-fb" (click)="facebook()"><i class="fa fa-facebook"></i></button>
+=======
+>>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc