Affichage des noms complets via passwd

Authentification via identifiants TODO: Cache via db

Affichage des noms complets via passwd
Authentification via identifiants TODO: Cache via db
Geoffrey PREUD'HOMME
1 parent ac04356e
Showing 7 changed files with 107 additions and 16 deletions Show diff stats
app/controllers/noms.js
app/controllers/sessions.js
app/models/noms.js
app/routes/api.js
package.json
public/js/services/SessionServ.js
public/views/index.html
@@ -0,0 +1,43 @@
+var Noms = require('../models/noms');
+var lineReader = require('line-reader');
+
+var noms = {}
+
+noms.get = function (login, cb) {
+    Noms.find({
+        login: login
+    }, function (err, nom) {
+        if (err) {
+            console.error(err)
+            cb(false)
+        } else {
+            if (nom.length >= 1) {
+                cb(nom.nom)
+            } else {
+                found = false
+                try {
+                    lineReader.eachLine('config/passwd', function (line, last, cbL) {
+                        ex = line.split(':')
+                        // console.log(ex);
+                        if (ex[0] == login) { // Si trouvé
+                            found = true
+                            cb(ex[4])
+                            cbL(false);
+                        } else {
+                            cbL();
+                        }
+                    }).then(function () {
+                        if (!found) {
+                            cb(false)
+                        }
+                    });
+                } catch (e) {
+                    console.error("Error while fetching name", e)
+                    cb(login.toUpperCase())
+                }
+            }
+        }
+    })
+}
+
+module.exports = noms;
 \ No newline at end of file
 var Session = require('../models/session');
+var noms = require('../controllers/noms');
 var sessions = {}
+sessions.addData = function (session, cb) {
+    noms.get(session.login, function (nom) {
+        if (typeof nom == 'string') {
+            session.nom = nom
+        } else {
+            session.nom = 'Inconnu'
+        }
+        cb(session)
+    })
+}
+
+sessions.find = function (id, cb) {
+    _this = this
+    Session.findById(id).lean().exec(function (err, session) {
+        if (typeof session == 'object') {
+            _this.addData(session, function (session) {
+                cb(err, session)
+            })
+        } else {
+            cb(err, null)
+        }
+    })
+}
+
 sessions.valid = function (session) {
     return session.started.setSeconds(session.started.getSeconds() + 3600) > new Date()
 }
@@ -14,7 +39,7 @@ sessions.delete = function (id, cb) {
 sessions.verify = function (id, cb) {
     _this = this
-    Session.findById(id, function (err, session) {
+    _this.find(id, function (err, session) {
         if (err) {
             cb('error');
         } else {
@@ -40,24 +65,31 @@ sessions.create = function (login, cb) {
 sessions.login = function (data, cb) {
     // DUMMY
-    if (data.login == 'cool' && data.pass == 'cool') {
-        cb(null, true);
-    } else {
-        cb(null, false);
-    }
+    noms.get(data.login, function (nom) {
+        if (nom == false) {
+            cb(null, false)
+        } else {
+            if (data.pass == 'cool') {
+                cb(null, true)
+            } else {
+                cb(null, false)
+            }
+        }
+    })
 }
 sessions.open = function (data, cb) {
-    sessions.login(data, function (err, res) {
+    _this = this
+    _this.login(data, function (err, res) {
         if (err) {
             cb('error')
         } else {
             if (res) {
-                sessions.create(data.login, function (err, session) {
+                _this.create(data.login, function (err, session) {
                     if (err) {
                         cb('error');
                     } else {
-                        cb(session);
+                        _this.find(session._id, cb)
                     }
                 });
             } else {
@@ -0,0 +1,12 @@
+var mongoose = require('mongoose');
+
+module.exports = mongoose.model('Noms', {
+    login: { // On récupèrera le nom via les passwd
+        type: String,
+        default: 'login'
+    },
+    nom: {
+        type: String,
+        default: 'Nom'
+    }
+});
 \ No newline at end of file
@@ -21,11 +21,14 @@ api.get(&#39;/session&#39;, function (req, res) { // Informations sur la session
 });
 api.post('/session', function (req, res) { // Se connecter
-    sessions.open(req.body, function (status) {
-        if (typeof status === 'object') {
-            res.cookie('session', status._id);
+    sessions.open(req.body, function (err, session) {
+        if (err) {
+            res.send(err)
+            console.error(err)
+        } else {
+            res.cookie('session', session._id);
+            res.send(session)
         }
-        res.send(status);
     })
 })
@@ -5,6 +5,7 @@
     "body-parser": "^1.12.0",
     "cookie-parser": "^1.3.4",
     "express": "^4.12.2",
+    "line-reader": "^0.2.4",
     "method-override": "^2.3.1",
     "mongoose": "^3.8.25",
     "morgan": "^1.5.1"
 angular.module('SessionsServ', []).service('SessionService', ['$http',
     function ($http) {
         a = {
-            name: "Invité",
+            nom: "Invité",
             logged: false,
             status: 0,
             changeHandlers: [],
@@ -17,7 +17,7 @@ angular.module(&#39;SessionsServ&#39;, []).service(&#39;SessionService&#39;, [&#39;$http&#39;,
                 if (typeof data === 'object') {
                     console.log("Connected")
                     this.logged = true
-                    this.name = data.login
+                    this.nom = data.nom
                 } else {
                     this.logged = false
@@ -32,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="session.disconnect()">{{ session.name }} <span class="glyphicon glyphicon-off"></span></a>
+                                <a ng-show="session.logged" href="#" ng-click="session.disconnect()">{{ session.nom }} <span class="glyphicon glyphicon-off"></span></a>
                             </li>
                         </ul>
                     </div>