Merge remote-tracking branch 'origin/technology-2014-12-18'

Author: ykohata

actions/terms.js

@@ -58,6 +58,8 @@ var getTermsOfUse = function (api, connection, dbConnectionMap, next) {
         return;
     }
 
+    sqlParams.userId = connection.caller.userId;
+
     async.waterfall([
         function (cb) {
             // validate termsOfUseId parameter and set sql parameter

initializers/middleware.js

@@ -107,8 +107,13 @@ exports.middleware = function (api, next) {
                     return;
                 }
                 var split = decoded.sub.split("|");
-                socialUserId = (split.pop() || "").trim();
-                socialProvider = (split.pop() || "").trim();
+                try {
+                    socialUserId = (split[split.length-1] || "").trim();
+                    socialProvider = (split[0] || "").trim();
+                } catch (ignored) {
+                    cb(new IllegalArgumentError('Malformed Auth header. Could not parse token.sub!'));
+                    return;
+                }
                 if (!_.isDefined(socialUserId) || socialUserId.length === 0) {
                     cb(new IllegalArgumentError('Malformed Auth header. No userId in token.sub!'));
                     return;

queries/get_terms_of_use

@@ -4,8 +4,10 @@ SELECT 	tou.terms_of_use_id as terms_of_use_id,
 	touat.name as agreeability_type,
 	tou.terms_text as text,
     touat.terms_of_use_agreeability_type_id as agreeability_type_id,
-    toudtx.docusign_template_id as docusign_template_id
+    toudtx.docusign_template_id as docusign_template_id,
+    (utuox.user_id IS NOT NULL) as agreed
 FROM terms_of_use tou
 INNER JOIN terms_of_use_agreeability_type_lu touat ON touat.terms_of_use_agreeability_type_id = tou.terms_of_use_agreeability_type_id
 LEFT JOIN terms_of_use_docusign_template_xref toudtx ON toudtx.terms_of_use_id = tou.terms_of_use_id
+LEFT JOIN user_terms_of_use_xref utuox ON utuox.terms_of_use_id = tou.terms_of_use_id AND utuox.user_id = @userId@
 WHERE tou.terms_of_use_id = @termsOfUseId@