Rassemblement de tout ce qui est compte Polytech

Geoffrey PREUD'HOMME
1 parent a9a5cb2a
Showing 8 changed files with 128 additions and 98 deletions Show diff stats
app/models/NomsModl.js -> app/models/PolyUserModl.js
app/services/ConvsServ.js
app/services/MembresServ.js
app/services/MessServ.js
app/services/NomsServ.js -> app/services/PolyUserServ.js
app/services/SessionsServ.js
app/services/SshAuthServ.js
package.json
 var mongoose = require('mongoose');
-module.exports = mongoose.model('Noms', {
-    login: { // On récupèrera le nom via les passwd
+module.exports = mongoose.model('PolyUser', {
+    login: {
         type: String,
         default: 'login'
     },
 var ConvModl = require('../models/ConvModl');
-// var NomsServ = require('../services/NomsServ');
+// var PolyUserServ = require('../services/PolyUserServ');
 var async = require('async');
 var ConvsServ = {};
 ConvsServ.addData = function (conv, cb) {
-    // NomsServ.get(Conv.login, function (nom) {
+    // PolyUserServ.get(Conv.login, function (err, nom) {
     //     if (nom) {
     //         Conv.nom = nom;
     //     } else {
 var MembreModl = require('../models/MembreModl');
-var NomsServ = require('../services/NomsServ');
+var PolyUserServ = require('../services/PolyUserServ');
 var async = require('async');
 var MembresServ = {};
 MembresServ.addData = function (membre, cb) {
-    NomsServ.get(membre.login, function (nom) {
+    PolyUserServ.get(membre.login, function (err, nom) {
         membre.nom = nom.nom;
         membre.section = nom.section;
         cb(null, membre);
 var MessModl = require('../models/MessModl');
-// var NomsServ = require('../services/NomsServ');
+// var PolyUserServ = require('../services/PolyUserServ');
 var ConvsServ = require('../services/ConvsServ');
 var async = require('async');
 var MesssServ = {};
 MesssServ.addData = function (mess, cb) {
-    // NomsServ.get(Mess.login, function (nom) {
+    // PolyUserServ.get(Mess.login, function (err, nom) {
     //     if (nom) {
     //         Mess.nom = nom;
     //     } else {
-var NomsModl = require('../models/NomsModl');
+var PolyUserModl = require('../models/PolyUserModl');
 var LineTransform = require('node-line-reader').LineTransform;
 var fs = require('fs');
+var Client = require('ssh2').Client;
+var creds = require('../../config/sshAuth');
-var noms = {};
+var PolyUserServ = {};
-noms.readPasswd = function (login, cb) {
+PolyUserServ.readPasswd = function (login, cb) {
     passwdF = 'config/passwd';
     fs.exists(passwdF, function (exists) {
         found = false;
@@ -39,7 +41,7 @@ noms.readPasswd = function (login, cb) {
     });
 };
-noms.readGroup = function (gid, cb) {
+PolyUserServ.readGroup = function (gid, cb) {
     groupF = 'config/group';
     fs.exists(groupF, function (exists) {
         found = false;
@@ -71,59 +73,112 @@ noms.readGroup = function (gid, cb) {
     });
 };
-noms.get = function (login, cb) {
-    NomsModl.findOne({
-        login: login
-    }, {
-        nom: 1,
-        section: 1,
-        _id: 0
-    }, function (err, nom) {
-        if (nom && !err && nom.nom && nom.section) {
-            cb(nom);
-        } else {
-            noms.readPasswd(login, function (passwd) {
-                if (passwd) {
-                    noms.readGroup(passwd.GID, function (group) {
-                        if (group) {
-                            cb({
-                                nom: passwd.GECOS,
-                                section: group.name.toUpperCase()
-                            });
-                            NomsModl.create({
-                                login: login,
-                                nom: passwd.GECOS,
-                                section: group.name.toUpperCase()
-                            });
-                        } else {
-                            if (group === undefined) {
-                                console.error("Impossible d'ouvrir le fichier des groupes.");
-                            } else {
-                                console.error("Impossible d'obtenir le groupe de " + passwd.GID + ".");
-                            }
-                            cb({
-                                nom: passwd.GECOS,
-                                section: passwd.GID
-                            });
-                        }
+PolyUserServ.grabInfos = function (login, cb) {
+    PolyUserServ.readPasswd(login, function (passwd) {
+        if (passwd) {
+            PolyUserServ.readGroup(passwd.GID, function (group) {
+                if (group) {
+                    cb({
+                        nom: passwd.GECOS,
+                        section: group.name.toUpperCase()
+                    });
+                    PolyUserModl.create({
+                        login: login,
+                        nom: passwd.GECOS,
+                        section: group.name.toUpperCase()
                     });
                 } else {
-                    if (passwd === undefined) {
-                        console.error("Impossible d'ouvrir le fichier des noms.");
+                    if (group === undefined) {
+                        console.error("Impossible d'ouvrir le fichier des groupes.");
                     } else {
-                        console.error("Impossible d'obtenir le nom de " + login + ".");
-                    }
-                    if (!login) {
-                        login = 'Inconnu';
+                        console.error("Impossible d'obtenir le groupe de " + passwd.GID + ".");
                     }
                     cb({
-                        nom: login.toUpperCase(),
-                        section: 'Inconnue'
+                        nom: passwd.GECOS,
+                        section: passwd.GID
                     });
                 }
             });
+        } else {
+            if (passwd === undefined) {
+                console.error("Impossible d'ouvrir le fichier des noms.");
+            } else {
+                console.error("Impossible d'obtenir le nom de " + login + ".");
+            }
+            if (!login) {
+                login = 'Inconnu';
+            }
+            cb({
+                nom: login.toUpperCase(),
+                section: 'Inconnue'
+            });
+        }
+    });
+};
+
+PolyUserServ.addData = function (polyuser, cb) {
+    cb(null, polyuser);
+};
+
+PolyUserServ.obtain = function (login, cb) {
+    PolyUserModl.findOne({
+        login: login
+    }, {
+        nom: 1,
+        section: 1,
+        _id: 0
+    }, function (err, polyuser) {
+        if (err) {
+            cb(err);
+        } else {
+            PolyUserServ.addData(polyuser, cb);
+        }
+    });
+};
+
+PolyUserServ.add = function (login, cb) {
+    PolyUserServ.grabInfos(login, function (data) {
+        data.login = login;
+        PolyUserModl.create(data, function (err, polyuser) {
+            PolyUserServ.obtain(login, cb);
+        });
+    });
+};
+
+// PolyUserServ.remove = function (login, cb) {
+//     PolyUserModl.remove({
+//         login: login
+//     }, cb);
+// };
+
+PolyUserServ.get = function (login, cb) {
+    PolyUserModl.findOne({
+        login: login
+    }, function (err, polyuser) {
+        if (polyuser && !err && polyuser.polyuser && polyuser.section) {
+            PolyUserServ.obtain(login, cb);
+        } else {
+            PolyUserServ.add(login, cb);
+        }
+    });
+};
+
+PolyUserServ.verify = function (login, pass, cb) {
+    var conn = new Client();
+    conn.on('ready', function () {
+        cb(null, true);
+    }).on('error', function (err) {
+        if (err.level === 'client-authentication') {
+            cb(null, false);
+        } else {
+            cb(err);
         }
+    }).connect({
+        host: creds.host,
+        port: creds.port,
+        username: login,
+        password: pass
     });
 };
-module.exports = noms;
+module.exports = PolyUserServ;
 var SessionModl = require('../models/SessionModl');
-var NomsServ = require('../services/NomsServ');
+var PolyUserServ = require('../services/PolyUserServ');
 var MembresServ = require('../services/MembresServ');
-var SshAuthServ = require('../services/SshAuthServ');
 var sessions = {};
 sessions.cur = false;
 sessions.addData = function (session, cb) {
-    NomsServ.get(session.login, function (nom) {
+    PolyUserServ.get(session.login, function (err, nom) {
         // Nom
         session.nom = nom.nom;
         session.section = nom.section;
@@ -87,7 +86,7 @@ sessions.create = function (login, cb) {
 };
 sessions.login = function (data, cb) {
-    SshAuthServ.verify(data.login, data.pass, cb);
+    PolyUserServ.verify(data.login, data.pass, cb);
 };
 sessions.open = function (data, cb) {
@@ -1,25 +0,0 @@
-var Client = require('ssh2').Client;
-
-var creds = require('../../config/sshAuth');
-
-var SshAuth = {};
-
-SshAuth.verify = function (login, pass, cb) {
-    var conn = new Client();
-    conn.on('ready', function () {
-        cb(null, true);
-    }).on('error', function(err) {
-        if (err.level === 'client-authentication') {
-            cb(null, false);
-        } else {
-            cb(err);
-        }
-    }).connect({
-        host: creds.host,
-        port: creds.port,
-        username: login,
-        password: pass
-    });
-};
-
-module.exports = SshAuth;
 {
-    "name": "ci-site",
-    "main": "server.js",
-    "repository": "https://github.com/ClubInfoPolytechLille/ci-site",
-    "dependencies": {
-        "async": "^0.9.0",
-        "body-parser": "^1.12.2",
-        "cookie-parser": "^1.3.4",
-        "express": "^4.12.3",
-        "mongoose": "^4.0.1",
-        "node-line-reader": "0.0.2",
-        "ssh2": "^0.4.6",
-        "ursa": "^0.8.4"
-    }
+  "name": "ci-site",
+  "main": "server.js",
+  "repository": "https://github.com/ClubInfoPolytechLille/ci-site",
+  "dependencies": {
+    "async": "^0.9.0",
+    "body-parser": "^1.12.2",
+    "cookie-parser": "^1.3.4",
+    "express": "^4.12.3",
+    "express-http-proxy": "^0.5.0",
+    "mongoose": "^4.0.1",
+    "node-line-reader": "0.0.2",
+    "ssh2": "^0.4.6",
+    "ursa": "^0.8.4"
+  }
 }