Merge branch 'technology-2014-11-13'

Author: ykohata

actions/user.js

@@ -13,6 +13,7 @@ var async = require('async');
 var _ = require('underscore');
 var BadRequestError = require('../errors/BadRequestError');
 var ForbiddenError = require('../errors/ForbiddenError');
+var NotFoundError = require('../errors/NotFoundError');
 var UnauthorizedError = require('../errors/UnauthorizedError');
 var IllegalArgumentError = require('../errors/IllegalArgumentError');
 
@@ -322,3 +323,98 @@ exports.getUserIdentity = {
         }
     }
 };
+
+/**
+ * Get user identity information api.
+ * @param {Object} api - The api object.
+ * @param {Object} connection - The database connection map object.
+ * @param {Function} next - The callback function.
+ * @since 1.2
+ */
+function getUserIdentityByAuth0Id(api, connection, next) {
+    var helper = api.helper, 
+        auth0id = connection.params.id,
+        userid = 0,
+        dbConnectionMap = connection.dbConnectionMap,
+        notfound = new NotFoundError('Feelin lucky, punk?'),
+        response;
+
+    async.waterfall([
+        function (cb) {
+            try {
+                var splits = auth0id.split('|');
+                if (splits[0] == 'ad') {
+                    cb(null, [{ user_id: Number(splits[1]) }]);
+                } else {
+                    api.helper.getProviderId(splits[0], function(err, provider) {
+                        if (err) {
+                            cb(notfound);
+                        } else {
+                            api.dataAccess.executeQuery("get_user_by_social_login",
+                            {
+                                social_user_id: splits[1],
+                                provider_id: provider
+                            },
+                            dbConnectionMap, cb);
+                        }
+                    });
+                }
+            }
+            catch (exc) {
+                cb(notfound);
+            }
+        },
+        function (result, cb) {
+            userid = result[0].user_id
+            api.dataAccess.executeQuery('get_user_email_and_handle', 
+                { userId: userid }, 
+                dbConnectionMap, cb);
+        },
+        function (rs, cb) {
+            if (!rs[0]) {
+                cb(notfound);
+            } else {
+                response = {
+                    uid: userid,
+                    handle: rs[0].handle
+                };
+                cb();
+            }
+        }
+    ], function (err) {
+        if (err) {
+            helper.handleError(api, connection, err);
+        } else {
+            connection.response = response;
+        }
+        next(connection, true);
+    });
+
+}
+
+/**
+ * The API for activate user
+ * @since 1.2
+ */
+exports.getUserIdentityByAuth0Id = {
+    name: 'getUserIdentityByAuth0Id',
+    description: 'Get user identity information',
+    inputs: {
+        required: ['id'],
+        optional: []
+    },
+    blockedConnectionTypes: [],
+    outputExample: {},
+    version: 'v2',
+    transaction: 'read',
+    databases: ['common_oltp'],
+    cacheEnabled: false,
+    run: function (api, connection, next) {
+        if (connection.dbConnectionMap) {
+            api.log('getUserIdentityByAuth0Id#run', 'debug');
+            getUserIdentityByAuth0Id(api, connection, next);
+        } else {
+            api.helper.handleNoConnection(api, connection, next);
+        }
+    }
+};

apiary.apib

@@ -2312,7 +2312,7 @@ Request
 + Response 200 (application/json)
 
         {
-            "uid": "uid=132456, ou=members, dc=topcoder, dc=com",
+            "uid": "132456",
             "handle": "heffan",
             "email": "foo@fooonyou.com"
         }

queries/active_data_science_challenges

@@ -11,5 +11,4 @@ FROM
     active_data_science_challenges
 WHERE
     submission_end_date BETWEEN TO_DATE('@submitByFrom@ 00:00:00', '%Y-%m-%d %H:%M:%S') AND TO_DATE('@submitByTo@ 23:59:59', '%Y-%m-%d %H:%M:%S')     
-    AND CURRENT BETWEEN registration_start_date AND submission_end_date
-ORDER BY challenge_id
+ORDER BY challenge_id

routes.js

@@ -256,6 +256,7 @@ exports.routes = {
 
         { path: "/:apiVersion/user/challenges", action: "getMyChallenges" },
         { path: "/:apiVersion/user/activation-email", action: "userActivationEmail" },
+        { path: "/:apiVersion/user/tcid/:id", action: "getUserIdentityByAuth0Id" },
         { path: "/:apiVersion/user/identity", action: "getUserIdentity" },
 
         { path: "/:apiVersion/users/tops/:trackType", action: "getTopTrackMembers" },