Merge remote-tracking branch 'upstream/dev' into dev

actions/challenges.js

@@ -82,7 +82,6 @@
  * Changes in 1.32:
  * - validateChallenge, getRegistrants, getChallenge, getSubmissions and getPhases functions now check 
  *   if an user belongs to a group via user_group_xref for old challenges and by calling V3 API for new ones.
- * - 
  */
 "use strict";
 /*jslint stupid: true, unparam: true, continue: true, nomen: true */

db_scripts/test_eligibility.insert.sql

@@ -173,6 +173,18 @@ INSERT INTO project_info (project_id, project_info_type_id, value, create_user,
 	VALUES (1110005, 26, "---", "132456", CURRENT, "132456", CURRENT);
 
 INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
+	VALUES (1110001, 6, 3330333, "Not private", CURRENT, "132456", CURRENT);
+INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
+	VALUES (1110002, 6, 3330333, "Old logic - access allowed", CURRENT, "132456", CURRENT);
+INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
+	VALUES (1110003, 6, 3330333, "Old logic - access denied", CURRENT, "132456", CURRENT);
+INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
+	VALUES (1110004, 6, 3330333, "New logic - access allowed", CURRENT, "132456", CURRENT);
+INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
+	VALUES (1110005, 6, 3330333, "New logic - access denied", CURRENT, "132456", CURRENT);
+
+INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
+>>>>>>> upstream/dev
 	VALUES (1110001, 79, "---", "132456", CURRENT, "132456", CURRENT);
 INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
 	VALUES (1110002, 79, "---", "132456", CURRENT, "132456", CURRENT);

initializers/v3client.js

@@ -42,7 +42,7 @@ function callService(params, callback) {
         /*jslint eqeq: true*/
         if (response.statusCode != 200) {
             /*jslint eqeq: false*/
-            callback(new Error('API V3 returned ' + response.statusCode + ' ' + (response.statusMessage || '')));
+            callback(new Error('API ' + params.url + ' returned ' + response.statusCode + ' ' + (response.statusMessage || '')));
             return;
         }
         callback(null, body);
@@ -73,7 +73,7 @@ function getToken(connection, callback) {
         method: 'POST',
         body: {
             param: {
-                token: connection.authToken
+                externalToken: connection.authToken
             }
         }
     }, function (err, body) {