From 98da3af7d3acfa6b8d94d5aa88beca7c021886da Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Fri, 15 Dec 2017 09:51:26 -0800
Subject: [PATCH] updated publish api channel parse function

---
 helpers/publishHelpers.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/helpers/publishHelpers.js b/helpers/publishHelpers.js
index 3b4b0f92..14d23e96 100644
--- a/helpers/publishHelpers.js
+++ b/helpers/publishHelpers.js
@@ -57,20 +57,25 @@ module.exports = {
     };
   },
   parsePublishApiChannel ({channelName, channelPassword}, user) {
-    // anonymous if no channel name provided
-    let anonymous = (channelName === null || channelName === undefined || channelName === '');
-    // if a channel name is provided, get password from the user token
-    if (user) {
-      channelPassword = user.channelPassword;
-    } ;
-    // cleanse channel name
+    // if no channel name provided, publish will be anonymous
+    // if a channel name is provided...
     if (channelName) {
+      // make sure a password was provided
+      if (!channelPassword) {
+        throw new Error('Channel name provided without password');
+      }
+      // if request comes from the client and is logged in
+      // ensure it is the same channel and get the password
+      if (user) {
+        channelName = user.channelName;
+        channelPassword = user.channelPassword;
+      } ;
+      // add the @ if the channel name is missing it
       if (channelName.indexOf('@') !== 0) {
         channelName = `@${channelName}`;
       }
     }
     return {
-      anonymous,
       channelName,
       channelPassword,
     };