Improve passport integration (almost works now ;)

beeman · beeman · commit f06ea870af4f · 2015-01-17T20:40:18.000+07:00
diff --git a/client/app/modules/users/controllers/login.ctrl.js b/client/app/modules/users/controllers/login.ctrl.js
@@ -9,7 +9,7 @@
  * Contrller for Login Page
  **/
 angular.module('com.module.users')
-  .controller('LoginCtrl', function ($scope, $routeParams, $location, toasty, User, AppAuth, AuthProvider, gettextCatalog) {
+  .controller('LoginCtrl', function ($scope, $routeParams, $location, toasty, User, AppAuth, AuthProvider, ENV, gettextCatalog) {
 
     var TWO_WEEKS = 1000 * 60 * 60 * 24 * 7 * 2;
 
@@ -60,7 +60,7 @@ angular.module('com.module.users')
     };
 
     $scope.socialLogin = function (provider) {
-      window.location = provider.authPath;
+      window.location = ENV.siteUrl + provider.authPath;
     };
 
     AuthProvider.count(function (result) {
diff --git a/client/app/modules/users/controllers/users.ctrl.js b/client/app/modules/users/controllers/users.ctrl.js
@@ -10,7 +10,7 @@ app.controller('UsersCtrl', function ($scope, $stateParams, $state, User, toasty
         where: {
           id: $stateParams.id
         },
-        include: ['roles']
+        include: ['roles', 'identities', 'credentials', 'accessTokens']
       }
     }, function (result) {
       $scope.user = result;
diff --git a/server/boot/passport.js b/server/boot/passport.js
@@ -88,18 +88,19 @@ module.exports = function (app) {
 
   var ensureLoggedIn = require('connect-ensure-login').ensureLoggedIn;
 
-  app.get('/auth/account', ensureLoggedIn('/login.html'), function (req, res, next) {
-    res.render('pages/loginProfiles', {
-      user: req.user,
-      url: req.url
-    });
+  app.get('/auth/account', ensureLoggedIn('/'), function(req, res, next) {
+    console.log('Logged in', req.user)
+    res.redirect('/#/app');
   });
 
-  app.get('/link/account', ensureLoggedIn('/login.html'), function (req, res, next) {
-    res.render('pages/linkedAccounts', {
-      user: req.user,
-      url: req.url
-    });
+  app.get('/auth/current', function(req, res, next) {
+    if (!req.isAuthenticated || !req.isAuthenticated()) {
+      return res.status(200).json({});
+    }
+    //poor man's copy
+    var ret = JSON.parse(JSON.stringify(req.user));
+    delete ret.password;
+    res.status(200).json(ret);
   });
 
   app.get('/auth/logout', function (req, res, next) {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ app.controller('UsersCtrl', function ($scope, $stateParams, $state, User, toasty`
`10`	`10`	`where: {`
`11`	`11`	`id: $stateParams.id`
`12`	`12`	`},`
`13`		`- include: ['roles']`
	`13`	`+ include: ['roles', 'identities', 'credentials', 'accessTokens']`
`14`	`14`	`}`
`15`	`15`	`}, function (result) {`
`16`	`16`	`$scope.user = result;`