Merge pull request #318 from CoderDojo/feature/profile-edit-tandcs

Allow accepting T&Cs from profile edit page

Author: ArayB

profiles.js

@@ -24,7 +24,7 @@ module.exports = function (options) {
 
   var immutableFields = ['userType', 'avatar'];
 
-  var requiredProfileFields = ['name', 'alias', 'country'];
+  var requiredProfileFields = ['name', 'country'];
 
   // var userTypes = ['champion', 'mentor', 'parent-guardian', 'attendee-o13', 'attendee-u13'];
   // var userTypes = ['attendee-u13', 'attendee-o13', 'parent-guardian', 'mentor', 'champion'];
@@ -124,7 +124,7 @@ module.exports = function (options) {
 
   function syncUserObj (profile, done) {
     var updatedFields = {};
-    var userFields = ['mailingList'];
+    var userFields = ['mailingList', 'termsConditionsAccepted'];
     updatedFields.id = profile.userId;
     _.each(syncedFields, function (field) {
       updatedFields[field] = profile[field];
@@ -307,11 +307,13 @@ module.exports = function (options) {
 
   function cmd_save (args, done) {
     var profile = args.profile;
-
+    if (!profile.raspberryId || !profile.name) {
+      // if it's a raspberry pi connected account, keep profile.name if present
+      profile.name = profile.firstName && profile.lastName ? profile.firstName + ' ' + profile.lastName : profile.name;
+    }
     var profileKeys = _.keys(profile);
     var missingKeys = _.difference(requiredProfileFields, profileKeys);
     if (_.isEmpty(missingKeys)) profile.requiredFieldsComplete = true;
-    profile.name = profile.firstName && profile.lastName ? profile.firstName + ' ' + profile.lastName : profile.name;
 
     seneca.make$(ENTITY_NS).save$(profile, done);
   }

users.js

@@ -15,7 +15,7 @@ module.exports = function (options) {
   var ENTITY_NS = 'sys/user';
   var so = seneca.options();
   var protocol = process.env.PROTOCOL || 'http';
-  var requiredProfileFields = ['name', 'dob', 'country'];
+  var requiredProfileFields = ['name', 'country'];
 
   seneca.add({role: plugin, cmd: 'ping'}, require('./lib/ping'));
   seneca.add({role: plugin, cmd: 'create_reset'}, cmd_create_reset);