fix: Allow shutter in proposal privacy if space is using shutter privacy

src/ingestor.ts

@@ -142,7 +142,7 @@ export default async function ingestor(req) {
         body: message.body,
         discussion: message.discussion || '',
         choices: message.choices,
-        privacy: message.privacy || '',
+        privacy: message.privacy,
         labels: message.labels || [],
         start: message.start,
         end: message.end,
@@ -169,7 +169,7 @@ export default async function ingestor(req) {
         name: message.title,
         body: message.body,
         discussion: message.discussion || '',
-        privacy: message.privacy || '',
+        privacy: message.privacy,
         choices: message.choices,
         labels: message.labels || [],
         metadata: {

src/writer/proposal.ts

@@ -102,7 +102,10 @@ export async function verify(body): Promise<any> {
     if (msg.payload.type !== space.voting.type) return Promise.reject('invalid voting type');
   }
 
-  if (space.voting?.privacy !== 'any' && msg.payload.privacy) {
+  const spacePrivacy = space.voting?.privacy ?? 'any';
+  const proposalPrivacy = msg.payload.privacy;
+
+  if (proposalPrivacy !== undefined && spacePrivacy !== 'any' && spacePrivacy !== proposalPrivacy) {
     return Promise.reject('not allowed to set privacy');
   }
 
@@ -210,9 +213,9 @@ export async function action(body, ipfs, receipt, id): Promise<void> {
   const plugins = JSON.stringify(metadata.plugins || {});
   const spaceNetwork = spaceSettings.network;
   const proposalSnapshot = parseInt(msg.payload.snapshot || '0');
-  let privacy = spaceSettings.voting?.privacy || '';
+  let privacy = spaceSettings.voting?.privacy ?? 'any';
   if (privacy === 'any') {
-    privacy = msg.payload.privacy;
+    privacy = msg.payload.privacy ?? '';
   }
 
   let quorum = spaceSettings.voting?.quorum || 0;

src/writer/update-proposal.ts

@@ -49,7 +49,10 @@ export async function verify(body): Promise<any> {
 
   if (proposal.author !== body.address) return Promise.reject('Not the author');
 
-  if (space.voting?.privacy !== 'any' && msg.payload.privacy) {
+  const spacePrivacy = space.voting?.privacy ?? 'any';
+  const proposalPrivacy = msg.payload.privacy;
+
+  if (proposalPrivacy !== undefined && spacePrivacy !== 'any' && spacePrivacy !== proposalPrivacy) {
     return Promise.reject('not allowed to set privacy');
   }
 
@@ -68,9 +71,9 @@ export async function action(body, ipfs): Promise<void> {
   const metadata = msg.payload.metadata || {};
   const plugins = JSON.stringify(metadata.plugins || {});
   const spaceSettings = await getSpace(msg.space);
-  let privacy = spaceSettings.voting?.privacy || '';
+  let privacy = spaceSettings.voting?.privacy ?? 'any';
   if (privacy === 'any') {
-    privacy = msg.payload.privacy;
+    privacy = msg.payload.privacy ?? '';
   }
 
   const proposal = {

test/unit/writer/proposal.test.ts

@@ -1,21 +1,21 @@
 import omit from 'lodash/omit';
-import * as writer from '../../../src/writer/proposal';
-import input from '../../fixtures/writer-payload/proposal.json';
-import { spacesGetSpaceFixtures } from '../../fixtures/space';
 import {
+  ACTIVE_PROPOSAL_BY_AUTHOR_LIMIT,
   ECOSYSTEM_SPACE_PROPOSAL_DAY_LIMIT,
-  FLAGGED_SPACE_PROPOSAL_DAY_LIMIT,
-  SPACE_PROPOSAL_DAY_LIMIT,
-  VERIFIED_SPACE_PROPOSAL_DAY_LIMIT,
   ECOSYSTEM_SPACE_PROPOSAL_MONTH_LIMIT,
+  FLAGGED_SPACE_PROPOSAL_DAY_LIMIT,
   FLAGGED_SPACE_PROPOSAL_MONTH_LIMIT,
-  SPACE_PROPOSAL_MONTH_LIMIT,
-  VERIFIED_SPACE_PROPOSAL_MONTH_LIMIT,
   MAINNET_ECOSYSTEM_SPACES,
-  ACTIVE_PROPOSAL_BY_AUTHOR_LIMIT,
+  SPACE_PROPOSAL_DAY_LIMIT,
+  SPACE_PROPOSAL_MONTH_LIMIT,
   TURBO_SPACE_PROPOSAL_DAY_LIMIT,
-  TURBO_SPACE_PROPOSAL_MONTH_LIMIT
+  TURBO_SPACE_PROPOSAL_MONTH_LIMIT,
+  VERIFIED_SPACE_PROPOSAL_DAY_LIMIT,
+  VERIFIED_SPACE_PROPOSAL_MONTH_LIMIT
 } from '../../../src/helpers/limits';
+import * as writer from '../../../src/writer/proposal';
+import { spacesGetSpaceFixtures } from '../../fixtures/space';
+import input from '../../fixtures/writer-payload/proposal.json';
 
 const FLAGGED_ADDRESSES = ['0x0'];
 
@@ -69,6 +69,12 @@ mockGetProposalsCount.mockResolvedValue([
   }
 ]);
 
+function updateInputPayload(input: any, payload: any) {
+  const msg = JSON.parse(input.msg);
+
+  return { ...input, msg: JSON.stringify({ ...msg, payload: { ...msg.payload, ...payload } }) };
+}
+
 describe('writer/proposal', () => {
   afterEach(jest.clearAllMocks);
 
@@ -294,6 +300,116 @@ describe('writer/proposal', () => {
           expect(mockSnapshotUtilsValidate).toHaveBeenCalledTimes(0);
         });
       });
+
+      describe('when the space is using ANY privacy', () => {
+        beforeEach(() => {
+          mockGetSpace.mockResolvedValueOnce({
+            ...spacesGetSpaceFixtures,
+            voting: { privacy: 'any' }
+          });
+        });
+
+        it('accepts a proposal with shutter privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: 'shutter' }))
+          ).resolves.toBeUndefined();
+        });
+
+        it('accepts a proposal with undefined privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: undefined }))
+          ).resolves.toBeUndefined();
+        });
+
+        it('accepts a proposal with no privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: '' }))
+          ).resolves.toBeUndefined();
+        });
+      });
+
+      // Fallback as if { privacy: 'any' }
+      describe('when the space is missing the privacy settings', () => {
+        beforeEach(() => {
+          mockGetSpace.mockResolvedValueOnce({
+            ...spacesGetSpaceFixtures,
+            voting: undefined
+          });
+        });
+
+        it('accepts a proposal with shutter privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: 'shutter' }))
+          ).resolves.toBeUndefined();
+        });
+
+        it('accepts a proposal with undefined privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: undefined }))
+          ).resolves.toBeUndefined();
+        });
+
+        it('accepts a proposal with no privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: '' }))
+          ).resolves.toBeUndefined();
+        });
+      });
+
+      describe('when the space is using NO privacy', () => {
+        beforeEach(() => {
+          mockGetSpace.mockResolvedValueOnce({
+            ...spacesGetSpaceFixtures,
+            voting: { privacy: '' }
+          });
+        });
+
+        it('rejects a proposal with shutter privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: 'shutter' }))
+          ).rejects.toMatch('not allowed to set privacy');
+        });
+
+        it('accepts a proposal with undefined privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: undefined }))
+          ).resolves.toBeUndefined();
+        });
+
+        it('accepts a proposal with no privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: '' }))
+          ).resolves.toBeUndefined();
+        });
+      });
+
+      describe('when the space is using SHUTTER privacy', () => {
+        beforeEach(() => {
+          mockGetSpace.mockResolvedValueOnce({
+            ...spacesGetSpaceFixtures,
+            voting: { privacy: 'shutter' }
+          });
+        });
+
+        it('accepts a proposal with shutter privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: 'shutter' }))
+          ).resolves.toBeUndefined();
+        });
+
+        it('accepts a proposal with undefined privacy', () => {
+          return expect(
+            writer.verify(updateInputPayload(input, { privacy: undefined }))
+          ).resolves.toBeUndefined();
+        });
+
+        it('rejects a proposal with privacy empty string', async () => {
+          expect.assertions(1);
+          await expect(writer.verify(updateInputPayload(input, { privacy: '' }))).rejects.toMatch(
+            'not allowed to set privacy'
+          );
+        });
+      });
     });
 
     it('rejects if the snapshot is in the future', async () => {