fix xid bug (#1787)

* Message for non-xid-whitelisted vote

* check for xid whitelisting on any vote submission

* check xid whitelist without requiring socials

client-participation/js/views/vote-view.js

@@ -366,6 +366,8 @@ module.exports = Handlebones.ModelView.extend({
         that.model.set({
           needSocial: true,
         });
+      } else if (err && err.responseText === "polis_err_xid_not_whitelisted") {
+        alert("Sorry, you must be registered to vote. Please sign in or contact the conversation owner.");
       } else {
         alert("Apologies, your vote failed to send. Please check your connection and try again.");
       }

server/src/d.ts

@@ -203,6 +203,7 @@ export type Vote = {
   pid: any;
   lang: any;
   tid: any;
+  xid: any;
   vote: any;
   weight: any;
   starred: any;

server/src/server.ts

@@ -649,6 +649,7 @@ function initializePolisHelpers() {
     pid?: any,
     zid?: any,
     tid?: any,
+    xid?: any,
     voteType?: any,
     weight?: number,
   ) {
@@ -693,6 +694,15 @@ function initializePolisHelpers() {
               });
             });
           }
+          if (conv.use_xid_whitelist) {
+            return isXidWhitelisted(conv.owner, xid).then((is_whitelisted: boolean) => {
+              if (is_whitelisted) {
+                return conv;
+              } else {
+                throw 'polis_err_xid_not_whitelisted';
+              }
+            });
+          }
           return conv;
         })
         .then(function (conv: any) {
@@ -7004,6 +7014,7 @@ Email verified! You can close this tab or hit the back button.
     req: {
       p: {
         zid?: any;
+        xid?: any;
         uid?: any;
         txt?: any;
         pid?: any;
@@ -7022,7 +7033,7 @@ Email verified! You can close this tab or hit the back button.
     res: { json: (arg0: { tid: any; currentPid: any }) => void }
   ) {
     let zid = req.p.zid;
-    let xid = void 0; //req.p.xid;
+    let xid = req.p.xid;
     let uid = req.p.uid;
     let txt = req.p.txt;
     let pid = req.p.pid; // PID_FLOW may be undefined
@@ -7323,7 +7334,7 @@ Email verified! You can close this tab or hit the back button.
                         let createdTime = comment.created;
                         let votePromise = _.isUndefined(vote)
                           ? Promise.resolve()
-                          : votesPost(uid, pid, zid, tid, vote, 0);
+                          : votesPost(uid, pid, zid, tid, xid, vote, 0);
 
                         return (
                           votePromise
@@ -7946,6 +7957,7 @@ Email verified! You can close this tab or hit the back button.
               pid,
               zid,
               req.p.tid,
+              req.p.xid,
               req.p.vote,
               req.p.weight,
             );
@@ -8010,6 +8022,8 @@ Email verified! You can close this tab or hit the back button.
           fail(res, 403, "polis_err_conversation_is_closed", err);
         } else if (err === "polis_err_post_votes_social_needed") {
           fail(res, 403, "polis_err_post_votes_social_needed", err);
+        } else if (err === 'polis_err_xid_not_whitelisted') {
+          fail(res, 403, 'polis_err_xid_not_whitelisted', err);
         } else {
           fail(res, 500, "polis_err_vote", err);
         }