Merge pull request #432 from appirio-tech/dev

Release dev to qa

Author: thabofletcher

actions/challengeRegistration.js

@@ -869,9 +869,12 @@ exports.registerChallenge = {
                 if (error) {
                     console.log("error: " +  error);
                     cb(error);
-                } else {
-                    console.log("error11: " +  error);
-                    api.dataAccess.executeQuery('check_challenge_exists', {challengeId: challengeId}, connection.dbConnectionMap, cb);
+                } else {                   
+                    api.helper.checkUserActivated(connection.caller.handle, api, connection.dbConnectionMap, function (err, inactive) {
+                        var fail = err || inactive;
+                        if (fail) cb(fail);
+                        else api.dataAccess.executeQuery('check_challenge_exists', {challengeId: challengeId}, connection.dbConnectionMap, cb);
+                    }, "You must activate your account in order to participate. Please check your e-mail in order to complete the activation process, or contact support@topcoder.com if you did not receive an e-mail.");                    
                 }
             }, function (result, cb) {
                 if (result.length > 0) {

apiary.apib

@@ -9946,7 +9946,7 @@ Request
         }
 
 ## Register for a software/studio challenge [/challenges/{challengeId}/register]
-### Register for a software/studio challenge [GET]
+### Register for a software/studio challenge [POST]
 
 + Parameters
     + challengeId (required, number, `1234567`) ... The challenge for which to register

initializers/helper.js

@@ -1625,7 +1625,7 @@ helper.checkUserExists = function (handle, api, dbConnectionMap, callback) {
  * @param {Object} dbConnectionMap - the database connection map
  * @param {Function<err>} callback - the callback function
  */
-helper.checkUserActivated = function (handle, api, dbConnectionMap, callback) {
+helper.checkUserActivated = function (handle, api, dbConnectionMap, callback, textResponse) {
     api.dataAccess.executeQuery('check_user_activated', { handle: handle }, dbConnectionMap, function (err, result) {
         if (err) {
             callback(err, null);
@@ -1634,7 +1634,8 @@ helper.checkUserActivated = function (handle, api, dbConnectionMap, callback) {
         if (result && result[0] && result[0].status === 'A') {
             callback(err, null);
         } else {
-            callback(err, new BadRequestError('User is not activated.'));
+            var message = textResponse || 'User is not activated.';
+            callback(err, new BadRequestError(message));
         }
     });
 };