Eliminando codigo redundante v5

services/auth/server/server.js

@@ -1,5 +1,6 @@
 
 var vnLoopback = require('../../loopback/server/server.js');
 
-var app = module.exports = vnLoopback(__dirname, true);
+var app = module.exports = vnLoopback.loopback();
 app.set('applications', require('./application.json'));
+vnLoopback.boot(app, __dirname);

services/client/server/server.js

@@ -1,4 +1,5 @@
 
 var vnLoopback = require('../../loopback/server/server.js');
 
-module.exports = vnLoopback(__dirname);
+var app = module.exports = vnLoopback.loopback();
+vnLoopback.boot(app, __dirname);

services/loopback/server/boot/validations.js

@@ -1,4 +1,4 @@
-module.exports = function(server) {
+module.exports = function(app) {
     function toJson(object) {
         let json = {};
 
@@ -21,9 +21,9 @@ module.exports = function(server) {
         return json;
     }
 
-    server.get('/validations', function(req, res) {
+    app.get('/validations', function(req, res) {
         let json = {};
-        let models = server.models;
+        let models = app.models;
 
         for (let modelName in models) {
             let model = models[modelName];

services/loopback/server/server.js

@@ -5,29 +5,41 @@ var path = require('path');
 var fs = require('fs');
 var i18n = require('i18n');
 
-module.exports = function(rootDir, hasView)
+module.exports = {
-{
+    loopback: loopback,
-    let app = loopback();
+    boot: vnBoot
+};
 
+function vnBoot(app, rootDir, cb) {
     // Internationalization
 
     let i18nDir = rootDir + '/i18n';
 
-    if (fs.existsSync (i18nDir)) {
+    if (fs.existsSync(i18nDir)) {
         i18n.configure({
             directory: i18nDir,
             defaultLocale: 'es'
         });
 
-        app.get('/prueba', function (req,res){
+        app.get('/prueba', function(req, res) {
             i18n.setLocale(req.get('Accept-Language').substring(0,2));
             res.send(i18n.__('Hello'));
         });
     }
 
+    // View
+
+    let viewDir = path.join(rootDir, '../client');
+
+    if (fs.existsSync(viewDir)) {
+        app.set('view engine', 'ejs');
+        app.set('views', viewDir);
+        app.use(loopback.static(path.resolve(rootDir, '../client')));
+    }
+
     // Initialization
 
-    let packageJson = require(rootDir +'/../package.json');
+    let packageJson = require(rootDir + '/../package.json');
     let appName = packageJson.name;
 
     app.start = function() {
@@ -38,12 +50,6 @@ module.exports = function(rootDir, hasView)
         });
     };
 
-    if (hasView) {
-        app.set('view engine', 'ejs');
-        app.set('views', path.join(rootDir, '../client'));
-        app.use(loopback.static(path.resolve(rootDir, '../client')));
-    }
-
     let config = require('./config.json');
 
     for (var key in config) {
@@ -57,22 +63,22 @@ module.exports = function(rootDir, hasView)
         modelSources: [
             "loopback/common/models",
             "loopback/server/models",
-            __dirname +"/../common/models",
+            __dirname + "/../common/models",
-            __dirname +"/models",
+            __dirname + "/models",
-            rootDir +"/../common/models",
+            rootDir + "/../common/models",
-            rootDir +"/models"
+            rootDir + "/models"
         ],
         mixinDirs: [
             "loopback/common/mixins",
             "loopback/server/mixins",
-            __dirname +"/../common/mixins",
+            __dirname + "/../common/mixins",
-            __dirname +"/mixins",
+            __dirname + "/mixins",
-            rootDir +"/../common/mixins",
+            rootDir + "/../common/mixins",
-            rootDir +"/mixins"
+            rootDir + "/mixins"
         ],
         bootDirs: [
-            __dirname +"/boot",
+            __dirname + "/boot",
-            rootDir +"/boot"
+            rootDir + "/boot"
         ]
     };
 
@@ -80,7 +86,8 @@ module.exports = function(rootDir, hasView)
         if (err) throw err;
         if (require.main === module)
             app.start();
-    });
 
-    return app;
+        if (cb)
-};
+            cb(app);
+    });
+}

services/production/server/server.js

@@ -1,4 +1,5 @@
 
 var vnLoopback = require('../../loopback/server/server.js');
 
-module.exports = vnLoopback(__dirname);
+var app = module.exports = vnLoopback.loopback();
+vnLoopback.boot(app, __dirname);

services/route/server/server.js

@@ -1,4 +1,5 @@
 
 var vnLoopback = require('../../loopback/server/server.js');
 
-module.exports = vnLoopback(__dirname);
+var app = module.exports = vnLoopback.loopback();
+vnLoopback.boot(app, __dirname);

services/salix/server/server.js

@@ -2,10 +2,12 @@
 var cookieParser = require('cookie-parser');
 var vnLoopback = require('../../loopback/server/server.js');
 
-var app = module.exports = vnLoopback(__dirname, true);
+var app = module.exports = vnLoopback.loopback();
 
 // TODO: ver donde se almacena
 app.set('api key', 'salix');
 app.set('url auth', '/auth');
 
 app.use(cookieParser());
+
+vnLoopback.boot(app, __dirname);