Merge pull request #2639 from withspectrum/fix-private-channel-join

Fix private channel join

Author: brianlovin

Diff for: iris/mutations/channel/disableChannelTokenJoin.js

@@ -33,7 +33,8 @@ export default async (
 
   loaders.channelSettings.clear(channelId);
 
-  if (settings) {
+  // settings.id tells us that a channelSettings record exists in the db
+  if (settings.id) {
     return await disableChannelTokenJoin(channelId);
   } else {
     return await createChannelSettings(channelId);

Diff for: iris/mutations/channel/enableChannelTokenJoin.js

@@ -33,7 +33,8 @@ export default async (
 
   loaders.channelSettings.clear(channelId);
 
-  if (settings) {
+  // settings.id tells us that a channelSettings record exists in the db
+  if (settings.id) {
     return await enableChannelTokenJoin(channelId);
   } else {
     return await createChannelSettings(channelId).then(() =>

Diff for: iris/mutations/channel/resetChannelJoinToken.js

@@ -34,7 +34,8 @@ export default async (
 
   loaders.channelSettings.clear(channelId);
 
-  if (settings) {
+  // settings.id tells us that a channelSettings record exists in the db
+  if (settings.id) {
     return await resetChannelJoinToken(channelId);
   } else {
     return await createChannelSettings(channelId).then(

Diff for: iris/mutations/community/disableBrandedLogin.js

@@ -33,7 +33,8 @@ export default async (
 
   loaders.communitySettings.clear(communityId);
 
-  if (settings) {
+  // settings.id tells us that a channelSettings record exists in the db
+  if (settings.id) {
     return await disableCommunityBrandedLogin(communityId);
   } else {
     return await createCommunitySettings(communityId);

Diff for: iris/mutations/community/enableBrandedLogin.js

@@ -33,7 +33,8 @@ export default async (
 
   loaders.communitySettings.clear(communityId);
 
-  if (settings) {
+  // settings.id tells us that a channelSettings record exists in the db
+  if (settings.id) {
     return await enableCommunityBrandedLogin(communityId);
   } else {
     return await createCommunitySettings(communityId).then(

Diff for: iris/mutations/community/saveBrandedLoginSettings.js

@@ -40,7 +40,8 @@ export default async (
 
   loaders.communitySettings.clear(communityId);
 
-  if (settings) {
+  // settings.id tells us that a channelSettings record exists in the db
+  if (settings.id) {
     return await updateCommunityBrandedLoginMessage(communityId, message);
   } else {
     return await createCommunitySettings(communityId).then(

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "private": true,
   "devDependencies": {
     "babel-cli": "^6.24.1",