Add qss private channels e2e tests

Author: islathehut

.github/workflows/e2e-linux.yml

@@ -87,6 +87,13 @@ jobs:
           timeout_minutes: 25
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test multipleClients.test.ts
+          
+      - name: Run multiple clients test (private channels)
+        uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        with:
+          timeout_minutes: 25
+          max_attempts: 3
+          command: cd packages/e2e-tests && npm run test multipleClients.privateChannels.test.ts
 
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0

.github/workflows/e2e-qss-linux.yml

@@ -80,6 +80,13 @@ jobs:
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test multipleClients.qss.test.ts
 
+      - name: Run multiple clients with QSS test (private channels)
+        uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
+        with:
+          timeout_minutes: 25
+          max_attempts: 3
+          command: cd packages/e2e-tests && npm run test multipleClients.privateChannels.qss.test.ts
+
       - name: Run one client with QSS test
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
         with:

packages/backend/src/nest/storage/channels/channels.errors.ts

@@ -1,5 +1,5 @@
 export class NotAMemberError extends Error {
-  constructor() {
-    super('Not a member of this channel')
+  constructor(id?: string) {
+    super(`Not a member of this channel: ${id}`)
   }
 }

packages/backend/src/nest/storage/channels/channels.service.ts

@@ -209,7 +209,7 @@ export class ChannelsService extends EventEmitter {
       !chain.roles.amIMemberOfRole(payload.encrypted.scope.name)
     ) {
       this.logger.warn(`Not a member of this channel, skipping channel entry decrypt`)
-      throw new NotAMemberError()
+      throw new NotAMemberError(id)
     }
 
     try {
@@ -244,7 +244,7 @@ export class ChannelsService extends EventEmitter {
         }
       }
     } catch (err) {
-      if (err instanceof NotAMemberError || err.message === 'Not a member of this channel') {
+      if (err instanceof NotAMemberError || err.message.startsWith('Not a member of this channel')) {
         this.logger.warn(`Failed to decrypt and validate private channel entry, ignoring...`)
         return false
       }
@@ -300,6 +300,7 @@ export class ChannelsService extends EventEmitter {
    * @throws Error
    */
   public async getChannel(id: string): Promise<Channel | undefined> {
+    this.logger.debug('Getting channel', id)
     if (!this.channels) {
       throw new Error('Channels have not been initialized!')
     }
@@ -308,7 +309,15 @@ export class ChannelsService extends EventEmitter {
       return undefined
     }
     // need to rehydrate the UInt8Array bc json value encoding in KeyValueIndexedValidated does not maintain type
-    return this.decryptChannelEntry(channelEncrypted as EncryptedAndSignedPayload, id)
+    try {
+      return this.decryptChannelEntry(channelEncrypted as EncryptedAndSignedPayload, id)
+    } catch (e) {
+      if (e instanceof NotAMemberError || e.message.startsWith('Not a member of this channel')) {
+        this.logger.warn(`Failed to decrypt and validate private channel entry during getChannel, ignoring...`, id)
+      } else {
+        this.logger.error('Failed to decrypt channel entry', e)
+      }
+    }
   }
 
   /**
@@ -318,14 +327,24 @@ export class ChannelsService extends EventEmitter {
    * @throws Error
    */
   public async getChannels(): Promise<Channel[]> {
+    this.logger.debug('Getting channels')
     if (!this.channels) {
       throw new Error('Channels have not been initialized!')
     }
     return (await this.channels.all())
       .map(x => {
         try {
+          this.logger.debug('Decrypting channel entry', x.key)
           return this.decryptChannelEntry(x.value, x.key)
         } catch (e) {
+          if (e instanceof NotAMemberError || e.message.startsWith('Not a member of this channel')) {
+            this.logger.warn(
+              `Failed to decrypt and validate private channel entry during getChannels, ignoring...`,
+              x.key
+            )
+          } else {
+            this.logger.error('Failed to decrypt channel entry', e)
+          }
           return undefined
         }
       })

packages/desktop/src/renderer/components/Channel/AddMembersChannel/AddMembersChannelComponent.tsx

@@ -305,7 +305,14 @@ export const AddMembersChannelComponent: React.FC<ReturnType<typeof useModal> &
           direction='row'
           justifyContent='center'
         >
-          <Button variant='contained' onClick={handleClose} size='small' fullWidth className={classes.secondaryButton}>
+          <Button
+            variant='contained'
+            onClick={handleClose}
+            size='small'
+            fullWidth
+            className={classes.secondaryButton}
+            data-testid={`${channelName}-add-members-leave-button`}
+          >
             Never mind
           </Button>
         </Grid>

packages/desktop/src/renderer/components/LoadingPanel/LoadingPanel.tsx

@@ -48,7 +48,7 @@ const LoadingPanel = () => {
       logger.info('Joining completed')
       loadingPanelModal.handleClose()
     }
-  }, [isJoiningCompletedSelector])
+  }, [isJoiningCompletedSelector, areMessages, areChannels, isCurrentCommunityInitialized])
 
   useEffect(() => {
     if (isConnected) {

packages/e2e-tests/src/selectors.ts

@@ -733,7 +733,74 @@ export class ChannelContextMenu {
       500
     )
     await button.click()
+    await sleep(5_000)
+  }
+
+  async checkForMembersInAddMembersAutocomplete(channelName: string, memberNames: string[]): Promise<string[]> {
+    const autoCompleteInput = await this.driver.wait(
+      until.elementLocated(By.xpath(`//div[@data-testid="${channelName}-add-members-autocomplete"]`)),
+      20_000,
+      `Channel add members autocomplete input div couldn't be located within timeout`,
+      500
+    )
+    await this.driver.wait(
+      until.elementIsVisible(autoCompleteInput),
+      15_000,
+      `Channel context menu channel add members autocomplete div was not visibile within timeout`,
+      500
+    )
+
+    const inputField = await this.driver.wait(
+      autoCompleteInput.findElement(By.xpath(`//input[@aria-autocomplete="list"]`)),
+      5_000,
+      `Channel add members autocomplete input field couldn't be located within timeout`,
+      500
+    )
+
+    const waitForUserInAutocomplete = async (memberName: string) => {
+      const autoCompleteOption = await this.driver.wait(
+        until.elementLocated(
+          By.xpath(`//div[@data-testid="${channelName}-add-members-autocomplete-option-${memberName}"]`)
+        ),
+        2_000,
+        `Channel add members autocomplete option for ${memberName} couldn't be located within timeout`,
+        500
+      )
+      await this.driver.wait(
+        until.elementIsVisible(autoCompleteOption),
+        2_000,
+        `Channel add members autocomplete option for ${memberName} wasn't visible within timeout`,
+        500
+      )
+    }
+
+    const membersInAutocomplete: string[] = []
+    for (const memberName of memberNames) {
+      await inputField.sendKeys(memberName)
+      try {
+        await waitForUserInAutocomplete(memberName)
+        membersInAutocomplete.push(memberName)
+      } catch {
+        // do nothing
+      }
+      await inputField.clear()
+    }
+
+    const button = this.driver.wait(
+      until.elementLocated(By.xpath(`//button[@data-testid="${channelName}-add-members-leave-button"]`)),
+      20_000,
+      `Channel add members leave button couldn't be located within timeout`,
+      500
+    )
+    await this.driver.wait(
+      until.elementIsVisible(button),
+      15_000,
+      `Channel add members leave button wasn't visibile within timeout`,
+      500
+    )
+    await button.click()
     await sleep(5000)
+    return membersInAutocomplete
   }
 }
 
@@ -2029,19 +2096,22 @@ export class Sidebar {
     return Promise.all(
       elements.map(async element => {
         const fullName = await element.getText()
-        return fullName.split(' ')[1]
+        if (fullName.startsWith('# ')) {
+          return fullName.split(' ')[1]
+        }
+        return fullName
       })
     )
   }
 
-  async waitForChannelsNum(num: number) {
+  async waitForChannelsNum(num: number, timeoutMs: number = 15_000) {
     logger.info(`Waiting for ${num} channels`)
     return this.driver.wait(
       async () => {
         const channels = await this.getChannelList()
         return channels.length === num
       },
-      15_000,
+      timeoutMs,
       `Sidebar channel list length couldn't be determined within timeout`,
       500
     )