Changeset 519 for Dev/trunk/src/server/app.js

Timestamp:

03/15/14 01:00:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Support different environments with QED_ENV. If dev, run against qed-dev database, if production, run against qed database. The UI indicates if we are running in anything but production mode.
• Return undefined if we allow page leaves, because null is treated as a value.
• Changed format of design docs, so it can work for different databases.
• Use correct design documents in configCouch, so server now actually updates them when it starts.

File:

• Dev/trunk/src/server/app.js (modified) (5 diffs)

Dev/trunk/src/server/app.js

@@ -14 +14 @@
   ;
 
-function assertSetting(name, settings, validate) {
-    if ( typeof settings[name] === 'undefined' ) {
-        throw new Error("Required setting '"+name+"' undefined.");
-    }
-    if ( _.isFunction(validate) && !validate(settings[name]) ) {
-        throw new Error("Setting '"+name+"' with value '"+settings[name]+"' is invalid.");
-    }
-}
-
-exports.App = function(settings) {
-
-    assertSetting("couchServerURL", settings, _.isString);
-    assertSetting("dbName", settings, _.isString);
-    var couch = new CouchDB(settings.couchServerURL,settings.dbName);
+exports.App = function(env) {
+
+    assertSetting("couchServerURL", env, _.isString);
+    assertSetting("dbName", env, _.isString);
+    assertSetting("mode", env, _.isString);
+    var couch = new CouchDB(env.couchServerURL,env.dbName);
     
     var schema = require("./config/couchdb-schema.json");
@@ -35 +27 @@
             throw new Error(msg);
         }
-        return configureApp(settings,couch,schema);
+        return configureApp(env,couch,schema);
     });
 
 };
 
-function configureApp(settings,couch,schema) {
+function configureApp(env,couch,schema) {
 
     function clientPath(relativePath) {
@@ -46 +38 @@
     }
 
-    passport.use(new passportLocal.Strategy(function(username, password, done){
-        if ( username === "igor" && password === "mayer" ) {
-            done(null,{ username: "igor" });
-        } else {
-            done(null,false,{ message: 'Invalid credentials.' });
-        }
-    }));
+    passport.use(
+        new passportLocal.Strategy(
+            function(username, password, done){
+                if ( username === "igor" && password === "mayer" ) {
+                    done(null,{ username: "igor" });
+                } else {
+                    done(null,false,{ message: 'Invalid credentials.' });
+                }
+            }));
     passport.serializeUser(function(user, done) {
         done(null, user.username);
@@ -952 +946 @@
         });
 
+    app.get('/api/mode',
+        ensureMIME(JSON_MIME),
+        function(req,res){
+            res.send({mode:env.mode});
+        });
+
+
     return app;
 }
@@ -991 +992 @@
     return result;
 }
+
+function assertSetting(name, settings, validate) {
+    if ( typeof settings[name] === 'undefined' ) {
+        throw new Error("Required setting '"+name+"' undefined.");
+    }
+    if ( _.isFunction(validate) && !validate(settings[name]) ) {
+        throw new Error("Setting '"+name+"' with value '"+settings[name]+"' is invalid.");
+    }
+}