Merge remote-tracking branch 'CoderDojo/master' into staging

DanielBrierton · DanielBrierton · commit 654ed51ce1ab · 2017-08-04T10:51:23.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,10 @@
+.git
+node_modules
+.gitignore
+*.md
+*Dockerfile
+*.sh
+!docker-entrypoint.sh
+deploy
+example
+*.yml
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v0.10.48
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,13 @@
-FROM mhart/alpine-node:0.10
-MAINTAINER nearForm <info@nearform.com>
+FROM mhart/alpine-node:0.10.48
+MAINTAINER butlerx <butlerx@notthe.cloud>
 
-RUN apk-install git make gcc g++ python postgresql-client
-  
-RUN mkdir -p /usr/src/app /usr/src/app/config /usr/src/app/email-templates /usr/src/app/data /usr/src/app/scripts
+RUN apk add --update git build-base python postgresql-client && \
+    mkdir -p /usr/src/app
 WORKDIR /usr/src/app
-
-COPY package.json /usr/src/app/
-RUN npm install --production && rm -rf /root/.npm
-COPY config /usr/src/app/config/
-COPY data /usr/src/app/data/
-COPY scripts /usr/src/app/scripts/
-COPY email-templates /usr/src/app/email-templates/
-COPY *.js /usr/src/app/  
-
-RUN apk del make gcc g++ python && rm -rf /tmp/* /root/.npm /root/.node-gyp
+ADD . /usr/src/app/
+RUN npm install && \
+    rm -rf /root/.npm && \
+    apk del build-base  python && \
+    rm -rf /tmp/* /root/.npm /root/.node-gyp
+EXPOSE 10303
+CMD ["node", "service.js"]
diff --git a/circle.yml b/circle.yml
@@ -6,7 +6,6 @@ machine:
 dependencies:
   pre:
     - npm -g install npm@latest-2
-    - if [ "$CIRCLE_BRANCH" = "master" ]; then cd ~/ && git clone git@github.com:CoderDojo/cp-translations.git && cd cp-translations && ./build.sh; fi
   override:
     - npm install
 test:
diff --git a/config/development.env b/config/development.env
@@ -0,0 +1,15 @@
+POSTGRES_HOST=localhost
+POSTGRES_NAME=cp-users-development
+POSTGRES_USERNAME=platform
+POSTGRES_PASSWORD=QdYx3D5y
+POSTGRES_PORT=5432
+
+MAILTRAP_ENABLED=true
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USER=397746d4abc52902b
+MAIL_PASS=0383c445ef22d4
+
+HOSTNAME=localhost
+
+CDF_ADMINS=manager1@example.com,admin@example.com
diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -0,0 +1,10 @@
+FROM mhart/alpine-node:0.10.48
+MAINTAINER butlerx <butlerx@notthe.cloud>
+
+RUN apk add --update git build-base python postgresql-client && \
+    npm install -g nodemon && \
+    mkdir -p /usr/src/app /usr/src/cp-translations
+ADD docker-entrypoint.sh /usr/src
+EXPOSE 10303
+VOLUME /usr/src/app /usr/src/cp-translations
+CMD ["/usr/src/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -0,0 +1,6 @@
+#! /usr/bin/env sh
+cd /usr/src/cp-translations || exit
+npm link
+cd /usr/src/app || exit
+npm install && npm link cp-translations
+nodemon service.js
diff --git a/lib/fixes/1202-sync-sys-user-profile.js b/lib/fixes/1202-sync-sys-user-profile.js
@@ -0,0 +1,47 @@
+var async = require('async');
+/**
+ * Resave sys_user structure for those affected by https://github.com/CoderDojo/community-platform/issues/1202
+ */
+module.exports = function (args, done) {
+  var seneca = this;
+  var plugin = args.role;
+  var entity = seneca.make$('sys_user');
+  entity.native$(function (err, client, release) {
+    var finishUp = function (err) {
+      release();
+      done(err);
+    };
+    if (err) finishUp(err);
+    client.query('SELECT p.id, u.id as userId FROM cd_profiles p JOIN sys_user u on u.id = p.user_id WHERE u.name != p.name;',
+    function (err, res) {
+      if (err) finishUp(err);
+      async.each(res.rows, function (faulty, eCb) {
+        async.waterfall([
+          // Recover originalProfile
+          function (wfCb) {
+            seneca.act({role: plugin, cmd: 'load', id: faulty.id}, function (err, profile) {
+              if (err) eCb(err);
+              wfCb(null, profile);
+            });
+          },
+          // Recover original user for perm bypass
+          function (profile, wfCb) {
+            // it's not a typo, camelCase is not applied through native$
+            seneca.act({role: 'cd-users', cmd: 'load', id: faulty.userid}, function (err, user) {
+              if (err) eCb(err);
+              wfCb(null, profile, user);
+            });
+          },
+          // re-Save profiles
+          function (profile, user, wfCb) {
+            if (['attendee-o13', 'attendee-u13'].indexOf(profile.userType) > -1) {
+              seneca.act({role: plugin, cmd: 'update-youth-profile', profile: profile, user: user}, wfCb);
+            } else {
+              seneca.act({role: plugin, cmd: 'create', profile: profile, user: user}, wfCb);
+            }
+          }
+        ], eCb);
+      }, finishUp);
+    });
+  });
+};
diff --git a/network.js b/network.js
@@ -2,7 +2,22 @@
 
 module.exports = function (seneca) {
   seneca.listen()
-  .client({type: 'web', port: 10304, pin: {role: 'cd-salesforce', cmd: '*'}})
-  .client({type: 'web', port: 10301, pin: {role: 'cd-dojos', cmd: '*'}})
-  .client({type: 'web', port: 10305, pin: {role: 'cd-badges', cmd: '*'}});
+  .client({
+    type: 'web',
+    host: process.env.CD_DOJOS || 'localhost',
+    port: 10301,
+    pin: {
+      role: 'cd-dojos',
+      cmd: '*'
+    }
+  })
+  .client({
+    type: 'web',
+    host: process.env.CD_BADGES || 'localhost',
+    port: 10305,
+    pin: {
+      role: 'cd-badges',
+      cmd: '*'
+    }
+  });
 };
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "test": "npm run lint && bash -c 'source ./config/development.env; ./node_modules/.bin/lab --ignore __core-js_shared__ --flat --threshold 50 -r html -o ./coverage/coverage.html -r lcov -o ./coverage/lcov.info -r json -o ./coverage/coverage.json -r lab-quieter-reporter -o stdout -m 5000'",
+    "testdata": "node test/lib/service.js",
     "covrep": "bash test/covrep.sh",
     "lint": "./node_modules/.bin/semistandard *.js config/config.js"
   },
diff --git a/profiles.js b/profiles.js
@@ -51,6 +51,8 @@ module.exports = function (options) {
   seneca.add({role: plugin, cmd: 'ninjas_for_user'}, require('./lib/profiles/load-children-for-user'));
   //  Perms
   seneca.add({role: plugin, cmd: 'is_own_profile'}, require('./lib/profiles/is-own-profile'));
+  // one-shot
+  seneca.add({role: plugin, cmd: '1202_syncSysUserName'}, require('./lib/fixes/1202-sync-sys-user-profile'));
 
   function cmd_search (args, done) {
     if (!args.query) {
@@ -100,14 +102,6 @@ module.exports = function (options) {
       }
       seneca.act({role: plugin, cmd: 'save', profile: cleanedProfile}, function (err, retProfile) {
         if (err) return done(err);
-        if (process.env.SALESFORCE_ENABLED === 'true') {
-          seneca.act({ role: 'cd-profiles', cmd: 'load', id: profile.id }, function (err, fullProfile) {
-            if (err) return done(err);
-            if (fullProfile.userType.toLowerCase() === 'champion') {
-              seneca.act({role: 'cd-salesforce', cmd: 'queud_update_profiles', param: {profile: fullProfile}, fatal$: false});
-            }
-          });
-        }
         //  TODO: use seneca-mesh to avoid coupling the integration to the user
         if (args.user && !_.isEmpty(retProfile.email) && args.user.lmsId && args.user.email !== retProfile.email) {
           seneca.act({role: 'cd-users', cmd: 'update_lms_user', lmsId: args.user.lmsId, userEmail: args.user.email, profileEmail: retProfile.email});
@@ -625,6 +619,13 @@ module.exports = function (options) {
                 bufs.push(d);
               });
 
+              stream.on('error', function (err) {
+                client.query('ROLLBACK', function () {
+                  client.end();
+                  done(err);
+                });
+              });
+
               stream.on('end', function () {
                 client.query('COMMIT', function () {
                   client.end();
diff --git a/test/lib/insert-test-users.js b/test/lib/insert-test-users.js
@@ -3,101 +3,101 @@
 var _ = require('lodash');
 var async = require('async');
 
- module.exports = function () {
+module.exports = function () {
 
-   var seneca = this;
+  var seneca = this;
 
-   var plugin = 'test-user-data';
+  var plugin = 'test-user-data';
 
-   seneca.add({role: plugin, cmd: 'insert', entity: 'user'}, function (args, done) {
+  seneca.add({role: plugin, cmd: 'insert', entity: 'user'}, function (args, done) {
 
-     async.waterfall([
-       createIndependants,
-       createDependantsChildren
-     ], function (err, users) {
-       return done(null);
-     });
+    async.waterfall([
+      createIndependants,
+      createDependantsChildren
+    ], function (err, users) {
+      return done(null);
+    });
 
-     function createIndependants (wfCb) {
-       var users = require('../fixtures/e2e/users.json');
-       async.eachSeries(users, function (user, cb) {
-         seneca.act(user, {role: 'cd-users', cmd: 'register'}, function (err, response) {
-           if (err) return done(err);
-           if (response.ok === false) {
-             console.error('insert failed: ', response);
-             return cb(response);
-           }
-           return cb(err, response);
-         });
-       }, wfCb);
-     }
-
-     function createDependantsChildren (wfCb) {
-       var children = require('../fixtures/e2e/children.json');
-       async.eachSeries(children, function (child, cb) {
-         function getParent (wfCb) {
-           seneca.act({role: 'cd-users', cmd: 'list', query: {email: child.parentEmail}}, function (err, parents) {
-             if (err) return done(err);
-             return wfCb(null, parents[0]);
-           });
-         }
-
-         function saveChild (parent, wfCb) {
-           child.parents = [parent.userId];
-           seneca.act({role: 'cd-profiles', cmd: 'save-youth-profile', profile: child.data, user: parent}, function (err, savedChild) {
-             if (err) return wfCb(err);
-             if (savedChild.ok === false) {
-               console.error('insert failed: ', savedChild);
-               return wfCb(savedChild);
-             }
-             return wfCb(err, savedChild);
-           });
-         }
-
-         async.waterfall([
-           getParent,
-           saveChild
-         ], cb);
-
-       }, function (err, data) {
-         return wfCb();
-       });
-
-     }
-
-   });
-
-   seneca.add({role: plugin, cmd: 'insert', entity: 'agreement'}, function (args, done) {
-     var users = require('../fixtures/e2e/users.json');
-     var champs = _.filter(users, function (user) {
-       return user.user.email.indexOf('champion') > -1;
-     });
-     async.eachSeries(champs, function (champ, sCb) {
-       async.waterfall([
-        getUser,
-        saveAgreement
-      ], sCb);
-
-       function getUser (wfCb) {
-        seneca.act({role: 'cd-users', cmd: 'list', query: {email: champ.user.email}}, function (err, champs) {
+    function createIndependants (wfCb) {
+      var users = require('../fixtures/e2e/users.json');
+      async.eachSeries(users, function (user, cb) {
+        seneca.act(user, {role: 'cd-users', cmd: 'register'}, function (err, response) {
           if (err) return done(err);
-          return wfCb(null, champs[0]);
+          if (response.ok === false) {
+            console.error('insert failed: ', response);
+            return cb(response);
+          }
+          return cb(err, response);
         });
-       }
-
-       function saveAgreement (champ, wfCb) {
-         var payload = {
-           fullName: champ.name
-         };
-         seneca.act({role: 'cd-agreements', cmd: 'save', agreement: payload, user: champ}, function (err, agreement) {
+      }, wfCb);
+    }
+
+    function createDependantsChildren (wfCb) {
+      var children = require('../fixtures/e2e/children.json');
+      async.eachSeries(children, function (child, cb) {
+        function getParent (wfCb) {
+          seneca.act({role: 'cd-users', cmd: 'list', query: {email: child.parentEmail}}, function (err, parents) {
             if (err) return done(err);
-            return wfCb(null, agreement);
-         });
-       }
-     }, done);
-   });
-
-   return {
-     name: plugin
-   };
- };
+            return wfCb(null, parents[0]);
+          });
+        }
+
+        function saveChild (parent, wfCb) {
+          child.parents = [parent.userId];
+          seneca.act({role: 'cd-profiles', cmd: 'save-youth-profile', profile: child.data, user: parent}, function (err, savedChild) {
+            if (err) return wfCb(err);
+            if (savedChild.ok === false) {
+              console.error('insert failed: ', savedChild);
+              return wfCb(savedChild);
+            }
+            return wfCb(err, savedChild);
+          });
+        }
+
+        async.waterfall([
+          getParent,
+          saveChild
+        ], cb);
+
+      }, function (err, data) {
+        return wfCb();
+      });
+
+    }
+
+  });
+
+  seneca.add({role: plugin, cmd: 'insert', entity: 'agreement'}, function (args, done) {
+    var users = require('../fixtures/e2e/users.json');
+    var champs = _.filter(users, function (user) {
+      return user.user.email.indexOf('champion') > -1;
+    });
+    async.eachSeries(champs, function (champ, sCb) {
+      async.waterfall([
+       getUser,
+       saveAgreement
+     ], sCb);
+
+      function getUser (wfCb) {
+       seneca.act({role: 'cd-users', cmd: 'list', query: {email: champ.user.email}}, function (err, champs) {
+         if (err) return done(err);
+         return wfCb(null, champs[0]);
+       });
+      }
+
+      function saveAgreement (champ, wfCb) {
+        var payload = {
+          fullName: champ.name
+        };
+        seneca.act({role: 'cd-agreements', cmd: 'save', agreement: payload, user: champ}, function (err, agreement) {
+           if (err) return done(err);
+           return wfCb(null, agreement);
+        });
+      }
+    }, done);
+  });
+
+  return {
+    name: plugin
+  };
+};
diff --git a/test/lib/service.js b/test/lib/service.js
diff --git a/users.js b/users.js
