Merge pull request #1 from mozillascience/aid29-issue26

Try to fix the environment variable load pbm

src/app.js

@@ -167,14 +167,41 @@ module.exports = function (badgerService) {
 
   // Create a badge instance -- need to add auth around this
   app.post('/papers/:doi1/:doi2/users/:orcid/badges/:badge', function (request, response) {
-    if (!request.params.doi1 || !request.params.doi2 || !request.params.orcid || !request.params.badge) {
-      response.status(400).end();
+    var orcid;
+    if (request.session.orcid_token && request.session.orcid_token.token) {
+      orcid = request.session.orcid_token.token.orcid;
+    }
+    if (orcid !== request.params.orcid) {
+      response.status(403).end();
       return;
     }
-    returnBadges(badgerService.createBadge(request.params.orcid, request.params.badge, {
-      '_1': request.params.doi1,
-      '_2': request.params.doi2
-    }), request, response);
+    var pretty = request.query.pretty;
+    // Create a badge.
+    var badge = request.params.badge,
+      evidence = helpers.DOIFromURL(request.params.doi1 + '/' + request.params.doi2),
+      context = {
+        system: system,
+        badge: badge,
+        instance: {
+          email: helpers.emailFromORCID(orcid),
+          evidenceUrl: helpers.urlFromDOI(evidence)
+        }
+      };
+    client.createBadgeInstance(context, function (err, badge) {
+      if (err) {
+        console.error(err);
+        response.send(err);
+        return;
+      }
+      helpers.modEntry(badge, orcid);
+      if (pretty) {
+        response.render(path.join(__dirname, '..', '/public/code.jade'), {
+          data: JSON.stringify(badge, null, 2)
+        });
+      } else {
+        response.send(badge);
+      }
+    });
   });
 
   app.get('*', function (request, response) {

src/startApp.js

@@ -1,5 +1,5 @@
 module.exports = function (startAppCallback) {
-	var env = require('./environments');
+  var env = require('./environments');
   var badgeClient = require('./badgeClient.js')(env);
   var badgeService = require('./badgeService.js')(badgeClient, env);
   var app = require('./app')(badgeService);

templates/pages/issue.jsx

@@ -23,7 +23,8 @@ var Issue = React.createClass({
     var url = '/papers/' + path[path.length-2] + '/' + path[path.length-1] + '/users/' + orcid + '/badges/' + badge;
 
     fetch(url, {
-      method: 'post'
+      method: 'post',
+      credentials: 'same-origin'
     })
     .then((response) => {
         if (response.status >= 400) {

test/app.js

@@ -1,8 +1,7 @@
 var request = require('supertest');
 var assert = require('assert');
 
-var Habitat = require('habitat');
-var testEnv = new Habitat();
+var testEnv = require('../src/environments');
 
 var badgeClient = require('../src/badgeClient.js')(testEnv);
 var badgeService = require('../src/badgeService.js')(badgeClient, testEnv);