sitcomlab
diff --git a/‎.env.sample‎
Lines changed: 2 additions & 0 deletions b/‎.env.sample‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 8 additions & 0 deletions b/‎README.md‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎controllers/documents/change_status.js‎
Lines changed: 2 additions & 1 deletion b/‎controllers/documents/change_status.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎controllers/documents/post.js‎
Lines changed: 2 additions & 0 deletions b/‎controllers/documents/post.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎controllers/documents/submit.js‎
Lines changed: 2 additions & 3 deletions b/‎controllers/documents/submit.js‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎controllers/members/post.js‎
Lines changed: 3 additions & 1 deletion b/‎controllers/members/post.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎controllers/members/put.js‎
Lines changed: 3 additions & 0 deletions b/‎controllers/members/put.js‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎controllers/recovery/find_member_by_email.js‎
Lines changed: 2 additions & 0 deletions b/‎controllers/recovery/find_member_by_email.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎controllers/recovery/find_user_by_email.js‎
Lines changed: 2 additions & 0 deletions b/‎controllers/recovery/find_user_by_email.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎controllers/recovery/reset_password.js‎
Lines changed: 1 addition & 0 deletions b/‎controllers/recovery/reset_password.js‎
Lines changed: 1 addition & 0 deletions
@@ -1,6 +1,8 @@
 NODE_ENV='development'
 SERVER_URL='http://localhost'
 SERVER_PORT=5000
+MEMBER_CLIENT_PATH='/member-client'
+USER_CLIENT_PATH='/user-client'
 HTTP_PORT=5000
 HTTPS_PORT=5443
 POSTGRES_HOST='localhost'
 
@@ -184,6 +184,12 @@ git clone https://github.com/sitcomlab/Ethics-app.git
 node npm install
 ```
 
+* Alternatively you can also use **yarn** for that (run the command with `sudo`, if you don't have permission):
+
+```
+yarn install
+```
+
 ##### 2.4. Bower
 
 * Install Bower via **npm** (run the command with `sudo`, if you don't have permission):
@@ -255,6 +261,8 @@ node server.js
     * `NODE_ENV`: server environment (default: `development`, option: `production`, which uses https with a certificate)
     * `SERVER_URL`: url/domain of the host-server (default: `http://ethics-app.uni-muenster.de`)
     * `SERVER_PORT`: port number of the host-server (default: `80`)
+    * `MEMBER_CLIENT_PATH`: path to the member-client on the host-server (default: `/member-client`)
+    * `USER_CLIENT_PATH`: path to the user-client on the host-server (default: `/user-client`)
     * `HTTP_PORT`: port number of the nodejs-server: (default: `5000`)
     * `HTTPS_PORT`: secure port number of the nodejs-server: (default: `HTTP_PORT + 443`)
     * `POSTGRES_HOST`: Postgres host address (default: `localhost`)
 
@@ -5,10 +5,10 @@ var types = require('pg').types;
 types.setTypeParser(1700, 'text', parseFloat);
 var _ = require('underscore');
 var jwt = require('jsonwebtoken');
-var jwtSecret = require('../../server.js').jwtSecret;
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var user_client_path = process.env.USER_CLIENT_PATH;
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
 
@@ -380,6 +380,7 @@ exports.request = function(req, res) {
                     status_description_1: status_description_1,
                     status_description_2: status_description_2,
                     domain: domain,
+                    user_client_path: user_client_path,
                     year: moment().format("YYYY")
                 });
 
 
@@ -8,6 +8,7 @@ var uuid = require('uuid');
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var user_client_path = process.env.USER_CLIENT_PATH;
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
 
@@ -211,6 +212,7 @@ exports.request = function(req, res) {
                 user: user,
                 document: document,
                 domain: domain,
+                user_client_path: user_client_path,
                 year: moment().format("YYYY")
             });
 
 
@@ -7,6 +7,7 @@ var _ = require('underscore');
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var member_client_path = process.env.MEMBER_CLIENT_PATH;
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
 
@@ -373,9 +374,6 @@ exports.request = function(req, res) {
                     concern.q13_sign = "no";
                 }
 
-                // Formatting
-                document.link = domain + "/committee/documents/" + document.document_id + "/login";
-
                 // Notify each committee member
                 async.eachOfSeries(members, function (member, key, callback) {
 
@@ -389,6 +387,7 @@ exports.request = function(req, res) {
                         concern: concern,
                         course: course,
                         domain: domain,
+                        member_client_path: member_client_path,
                         year: moment().format("YYYY")
                     });
 
 
@@ -7,6 +7,7 @@ var _ = require('underscore');
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var member_client_path = process.env.MEMBER_CLIENT_PATH;
 var jwt = require('jsonwebtoken');
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
@@ -38,7 +39,7 @@ exports.request = function(req, res) {
                 var token = req.headers.authorization.substring(7);
 
                 // Verify token
-                jwt.verify(token, jwtSecret, function(err, decoded) {
+                jwt.verify(token, process.env.JWTSECRET, function(err, decoded) {
                     if(err){
                         callback(new Error("Authorization failed"), 401);
                     } else {
@@ -89,6 +90,7 @@ exports.request = function(req, res) {
                     var output = mustache.render(template_member_account_created, {
                         member: member,
                         domain: domain,
+                        member_client_path: member_client_path,
                         year: moment().format("YYYY")
                     });
 
 
@@ -7,6 +7,7 @@ var _ = require('underscore');
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var member_client_path = process.env.MEMBER_CLIENT_PATH;
 var jwt = require('jsonwebtoken');
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
@@ -224,6 +225,7 @@ exports.request = function(req, res) {
                         member: member,
                         updated_member: updated_member,
                         domain: domain,
+                        member_client_path: member_client_path,
                         year: moment().format("YYYY")
                     });
                 } else {
@@ -233,6 +235,7 @@ exports.request = function(req, res) {
                         member: member,
                         updated_member: updated_member,
                         domain: domain,
+                        member_client_path: member_client_path,
                         year: moment().format("YYYY")
                     });
                 }
 
@@ -7,6 +7,7 @@ var _ = require('underscore');
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var member_client_path = process.env.MEMBER_CLIENT_PATH;
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
 var jwt = require('jsonwebtoken');
@@ -78,6 +79,7 @@ exports.request = function(req, res) {
             var output = mustache.render(template_member_recovery, {
                 member: member,
                 domain: domain,
+                member_client_path: member_client_path,
                 year: moment().format("YYYY")
             });
 
 
@@ -7,6 +7,7 @@ var _ = require('underscore');
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var user_client_path = process.env.USER_CLIENT_PATH;
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
 
@@ -142,6 +143,7 @@ exports.request = function(req, res) {
                 amount: amount,
                 amount_description: amount_description,
                 domain: domain,
+                user_client_path: user_client_path,
                 year: moment().format("YYYY")
             });
 
 
@@ -7,6 +7,7 @@ var _ = require('underscore');
 var mustache = require('mustache');
 var moment = require('moment');
 var domain = process.env.SERVER_URL + ":" + process.env.SERVER_PORT;
+var member_client_path = process.env.MEMBER_CLIENT_PATH;
 var pool = require('../../server.js').pool;
 var transporter = require('../../server.js').transporter;
 var jwt = require('jsonwebtoken');