Possibilité de se connecter

login: cool pass: cool

Possibilité de se connecter
login: cool pass: cool
Geoffrey PREUD'HOMME
1 parent 9a023783
Showing 11 changed files with 124 additions and 39 deletions Show diff stats
app/controllers/sessions.js
app/routes/api.js
package.json
public/js/app.js
public/js/appRoutes.js
public/js/controllers/ConnectCtrl.js
public/js/controllers/SessionCtrl.js
public/js/services/SessionServ.js
public/views/connect.html
public/views/index.html
server.js
@@ -3,13 +3,11 @@ var Session = require(&#39;../models/session&#39;);
 var sessions = {}
 sessions.find = function (id, cb) {
-    Session.find({
-        '_id': id
-    }, cb)
+    Session.findById(id, cb)
 }
 sessions.valid = function (session) {
-    return session.started + 3600 > Date.now()
+    return session.started.setSeconds(session.started.getSeconds() + 3600) > new Date()
 }
 sessions.delete = function (id, cb) {
@@ -18,20 +16,21 @@ sessions.delete = function (id, cb) {
     }, cb);
 }
-sessions.close = function (id, cb) {
-
-}
-
 sessions.verify = function (id, cb) {
-    session.find(id, function (err, session) {
+    _this = this
+    Session.findById(id, function (err, session) {
         if (err) {
             cb('error');
         } else {
-            if (sessions.valid(session)) {
-                cb(session);
+            if (session) {
+                if (sessions.valid(session)) {
+                    cb(err, session);
+                } else {
+                    cb('expired');
+                    _this.delete(id)
+                }
             } else {
-                cb('expired');
-                sessions.delete(id)
+                cb('unknown')
             }
         }
     });
@@ -7,7 +7,13 @@ var api = express()
 // Sessions
 api.get('/session', function (req, res) { // Informations sur la session
     if (req.cookies && req.cookies.session) {
-        res.send(sessions.verify(req.cookies.session))
+        sessions.verify(req.cookies.session, function (err, session) {
+            if (err) {
+                res.send(err)
+            } else {
+                res.send(session)
+            }
+        })
         // TODO si pas bon : res.clearCookie('session')
     } else {
         res.send('missing');
@@ -24,9 +30,10 @@ api.post(&#39;/session&#39;, function (req, res) { // Se connecter
 })
 api.delete('/session', function (req, res) { // Se déconnecter
-    if (req.cookies) {
-        sessions.delete(req.cookies.id, function () {
+    if (req.cookies.session) {
+        sessions.delete(req.cookies.session, function () {
             res.clearCookie('session');
+            res.end()
         })
     } else {
         res.send('missing')
@@ -3,6 +3,7 @@
   "main": "server.js",
   "dependencies": {
     "body-parser": "^1.12.0",
+    "cookie-parser": "^1.3.4",
     "express": "^4.12.2",
     "method-override": "^2.3.1",
     "mongoose": "^3.8.25",
-angular.module('ciApp', ['ngRoute', 'appRoutes', 'MembreCtrl', 'SessionsServ', 'SessionsCtrl']);
 \ No newline at end of file
+angular.module('ciApp', ['ngRoute', 'appRoutes', 'MembreCtrl', 'SessionsServ', 'SessionsCtrl', 'ConnectCtrl']);
 \ No newline at end of file
 // public/js/appRoutes.js
 angular.module('appRoutes', []).config(['$routeProvider', '$locationProvider',
     function ($routeProvider, $locationProvider) {
-
         $routeProvider
             .when('/', {
                 templateUrl: 'views/home.html'
@@ -11,8 +10,8 @@ angular.module(&#39;appRoutes&#39;, []).config([&#39;$routeProvider&#39;, &#39;$locationProvider&#39;,
                 controller: 'MembreController'
             })
             .when('/connect', {
-                templateUrl: 'views/connect.html'
-                // controller: 'ConnectController'
+                templateUrl: 'views/connect.html',
+                controller: 'ConnectController'
             });
         $locationProvider.html5Mode(true);
@@ -0,0 +1,9 @@
+angular.module('ConnectCtrl', []).controller('ConnectController', ['$scope', 'SessionService',
+    function ($scope, SessionService) {
+        $scope.connect = {
+            connect: function () {
+                SessionService.connect($scope.connect.login, $scope.connect.pass)
+            }
+        }
+    }
+]);
 \ No newline at end of file
-angular.module('SessionsCtrl', []).controller('SessionController', ['$scope', '$http', 'SessionService',
-    function ($scope, $http, SessionService) {
-        $scope.session = {
-            logged: true,
-            name: SessionService.get()
-        }
-
-        $scope.disconnect = function () {
-            $scope.session.logged = false;
-        }
+angular.module('SessionsCtrl', []).controller('SessionController', ['$scope', 'SessionService',
+    function ($scope, SessionService) {
+        $scope.session = SessionService
+        // $scope.session.onChange(function () {
+        //     // TODO
+        // })
+        // $scope.$on("$destroy", function () {
+        //     // TODO
+        // })
     }
 ]);
 \ No newline at end of file
-angular.module('SessionsServ', []).service('SessionService', function () {
-    return {
-        get: function () {
-            return 'BANANE';
+angular.module('SessionsServ', []).service('SessionService', ['$http',
+    function ($http) {
+        a = {
+            name: "Invité",
+            logged: false,
+            status: 0,
+            changeHandlers: [],
+            onChange: function (fun) {
+                this.changeHandlers.push(fun)
+            },
+            triggerChange: function () {
+                for (fun in this.changeHandlers) {
+                    this.changeHandlers[fun]()
+                }
+            },
+            updateSessionInfos: function (data) {
+                if (typeof data === 'object') {
+                    console.log("Connected")
+                    this.logged = true
+                    this.name = data.login
+                } else {
+
+                    this.logged = false
+                }
+                this.triggerChange()
+            },
+            get: function (cb) { // Fetch infos if needed
+                console.log("Session: get")
+                if (status == 0) {
+                    this.status = 1 // Fetching
+                    _this = this
+                    // TODO Verify if cookies to prevent uneeded request
+                    $http.get('/api/session').success(function (body) {
+                        _this.updateSessionInfos(body)
+                        if (cb) {
+                            if (this.logged) {
+                                cb(null)
+                            } else {
+                                cb(body)
+                            }
+                        }
+                    })
+                } else {
+                    console.warn("get multiple times")
+                }
+            },
+            connect: function (login, pass, cb) {
+                console.log("Session: connecting with login:", login)
+                _this = this
+                $http.post('/api/session', {
+                    login: login,
+                    pass: pass
+                }).success(function (body) {
+                    _this.updateSessionInfos(body)
+                    if (cb) {
+                        if (this.logged) {
+                            cb(null)
+                        } else {
+                            cb(body)
+                        }
+                    }
+                })
+            },
+            disconnect: function () {
+                console.log("Session: disconnect", this.name)
+                $http.delete('/api/session')
+                this.logged = false
+            }
         }
+        a.get()
+        return a
     }
-})
 \ No newline at end of file
+])
 \ No newline at end of file
@@ -5,12 +5,12 @@
     <form>
         <div class="form-group">
             <label for="login">Identifiant</label>
-            <input type="text" class="form-control" id="login" placeholder="Identifiant Polytech">
+            <input type="text" class="form-control" id="login" ng-model="connect.login" placeholder="Identifiant Polytech">
         </div>
         <div class="form-group">
             <label for="pass">Mot de passe</label>
-            <input type="password" class="form-control" id="pass" placeholder="Mot de passe Polytech">
+            <input type="password" class="form-control" id="pass" ng-model="connect.pass" placeholder="Mot de passe Polytech">
         </div>
-        <button type="submit" class="btn btn-default">Se connecter</button>
+        <button type="submit" class="btn btn-default" ng-click="connect.connect()">Se connecter</button>
     </form>
 </div>
 \ No newline at end of file
@@ -14,6 +14,7 @@
         <script src="js/controllers/MembreCtrl.js"></script>
         <script src="js/services/SessionServ.js"></script>
         <script src="js/controllers/SessionCtrl.js"></script>
+        <script src="js/controllers/ConnectCtrl.js"></script>
         <script src="js/appRoutes.js"></script>
         <script src="js/app.js"></script>
     </head>
@@ -31,7 +32,7 @@
                         <ul class="nav navbar-nav navbar-right" ng-controller="SessionController">
                             <li>
                                 <a ng-hide="session.logged" href="/connect">Se connecter</a>
-                                <a ng-show="session.logged" href="#" ng-click="disconnect()">{{ session.name }} <span class="glyphicon glyphicon-off"></span></a>
+                                <a ng-show="session.logged" href="#" ng-click="session.disconnect()">{{ session.name }} <span class="glyphicon glyphicon-off"></span></a>
                             </li>
                         </ul>
                     </div>
@@ -5,6 +5,7 @@ var mongoose = require(&#39;mongoose&#39;);
 var morgan = require('morgan');
 var bodyParser = require('body-parser');
 var methodOverride = require('method-override');
+var cookieParser = require('cookie-parser')
 // Application ================================================================
@@ -24,6 +25,9 @@ app.use(bodyParser.urlencoded({
 }));
 app.use(methodOverride('X-HTTP-Method-Override'));
+// Cookie-parser
+app.use(cookieParser())
+
 // Dossier public
 app.use(express.static(__dirname + '/public'));