Fix/Use CSRs in mocking test data #1900

packages/desktop/src/rtl-tests/community.join.test.tsx

@@ -116,13 +116,14 @@ describe('User', () => {
           },
           communityHelper.CA
         )
-        const certificate = certificateHelper.userCert.userCertString
+        const certificate = certificateHelper.userCert?.userCertString
         const rootCa = communityHelper.CA?.rootCertString
         return socket.socketClient.emit<SendOwnerCertificatePayload>(SocketActionTypes.SEND_USER_CERTIFICATE, {
           communityId: payload.communityId,
           payload: {
+            // @ts-expect-error - This is statically mocked data so it'll never be undefined
             certificate: certificate,
-            // @ts-expect-error
+            // @ts-expect-error - This is statically mocked data so it'll never be undefined
             rootCa: rootCa,
             peers: [],
           },

packages/identity/src/test/helpers.ts

@@ -64,10 +64,10 @@ export const createUserCertificateTestHelper = async (
     peerId: string
     dmPublicKey: string
   },
-  rootCA: Pick<RootCA, 'rootCertString' | 'rootKeyString'>
+  rootCA?: Pick<RootCA, 'rootCertString' | 'rootKeyString'> | null
 ): Promise<{
-  userCert: UserCert
   userCsr: UserCsr
+  userCert?: UserCert
 }> => {
   const userCsr = await createUserCsr({
     nickname: user.nickname,
@@ -77,13 +77,19 @@ export const createUserCertificateTestHelper = async (
     signAlg: config.signAlg,
     hashAlg: config.hashAlg,
   })
-  const userCert = await createUserCert(
-    rootCA.rootCertString,
-    rootCA.rootKeyString,
-    userCsr.userCsr,
-    notBeforeDate,
-    notAfterDate
-  )
+
+  let userCert
+
+  if (rootCA) {
+    userCert = await createUserCert(
+      rootCA.rootCertString,
+      rootCA.rootKeyString,
+      userCsr.userCsr,
+      notBeforeDate,
+      notAfterDate
+    )
+  }
+
   return {
     userCsr,
     userCert,

packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.test.ts

@@ -11,11 +11,11 @@ import { type communitiesActions } from '../../communities/communities.slice'
 import { config } from '../../users/const/certFieldTypes'
 import { CertData, CreateUserCsrPayload, SocketActionTypes } from '@quiet/types'
 import { Socket } from '../../../types'
-import { connectionActions } from '../../appConnection/connection.slice'
 
 describe('registerUsernameSaga', () => {
   it('create user csr', async () => {
     setupCrypto()
+
     const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
 
     const store = prepareStore().store
@@ -25,23 +25,15 @@ describe('registerUsernameSaga', () => {
     const community = await factory.create<ReturnType<typeof communitiesActions.addNewCommunity>['payload']>(
       'Community',
       {
-        id: '1',
-        name: 'rockets',
-        registrarUrl: 'registrarUrl',
         CA: null,
-        rootCa: 'rootCa',
-        peerList: [],
-        registrar: null,
-        onionAddress: '',
-        privateKey: '',
-        port: 0,
+        rootCa: 'rootCertString',
       }
     )
 
     // Identity won't have userCsr as long as its corresponding community has no CA (factory specific logic)
     const identity = await factory.create<ReturnType<typeof identityActions.addNewIdentity>['payload']>('Identity', {
-      nickname: undefined,
       id: community.id,
+      nickname: undefined,
       userCsr: null,
     })
 
@@ -59,6 +51,7 @@ describe('registerUsernameSaga', () => {
       signAlg: config.signAlg,
       hashAlg: config.hashAlg,
     }
+
     const reducer = combineReducers(reducers)
     await expectSaga(registerUsernameSaga, socket, identityActions.registerUsername({ nickname: 'nickname' }))
       .withReducer(reducer)
@@ -95,23 +88,12 @@ describe('registerUsernameSaga', () => {
 
     const factory = await getFactory(store)
 
-    const community = await factory.create<ReturnType<typeof communitiesActions.addNewCommunity>['payload']>(
-      'Community',
-      {
-        id: '1',
-        name: 'rockets',
-        registrarUrl: 'registrarUrl',
-        CA: null,
-        rootCa: 'rootCa',
-        peerList: [],
-        registrar: null,
-        onionAddress: '',
-        privateKey: '',
-        port: 0,
-      }
-    )
+    const community =
+      await factory.create<ReturnType<typeof communitiesActions.addNewCommunity>['payload']>('Community')
+
     const oldNickname = 'john'
     const newNickname = 'paul'
+
     const userCsr: UserCsr = {
       userCsr: 'userCsr',
       userKey: 'userKey',
@@ -123,6 +105,7 @@ describe('registerUsernameSaga', () => {
       id: community.id,
       userCsr: userCsr,
     })
+
     if (!identity.userCsr?.userCsr) return
     const pubKey = 'pubKey'
     const privateKey = 'privateKey'
@@ -140,6 +123,7 @@ describe('registerUsernameSaga', () => {
         publicKey: publicKey as unknown as CryptoKey,
       },
     }
+
     const reducer = combineReducers(reducers)
     await expectSaga(
       registerUsernameSaga,
@@ -168,30 +152,19 @@ describe('registerUsernameSaga', () => {
       )
       .run()
   })
-  //outdated
+
+  // Outdated
   it.skip("reuse existing csr if provided username hasn't changed", async () => {
     setupCrypto()
+
     const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
 
     const store = prepareStore().store
 
     const factory = await getFactory(store)
 
-    const community = await factory.create<ReturnType<typeof communitiesActions.addNewCommunity>['payload']>(
-      'Community',
-      {
-        id: '1',
-        name: 'rockets',
-        registrarUrl: 'registrarUrl',
-        CA: null,
-        rootCa: 'rootCa',
-        peerList: [],
-        registrar: null,
-        onionAddress: '',
-        privateKey: '',
-        port: 0,
-      }
-    )
+    const community =
+      await factory.create<ReturnType<typeof communitiesActions.addNewCommunity>['payload']>('Community')
 
     const userCsr: UserCsr = {
       userCsr: 'userCsr',
@@ -209,6 +182,7 @@ describe('registerUsernameSaga', () => {
     identity.userCsr = userCsr
 
     store.dispatch(identityActions.addNewIdentity(identity))
+
     const reducer = combineReducers(reducers)
     await expectSaga(registerUsernameSaga, socket, identityActions.registerUsername({ nickname: identity.nickname }))
       .withReducer(reducer)
@@ -234,9 +208,11 @@ describe('registerUsernameSaga', () => {
       )
       .run()
   })
-  //outdated
+
+  // Outdated
   it.skip("don't reuse existing csr if provided username has changed", async () => {
     setupCrypto()
+
     const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
 
     const store = prepareStore().store
@@ -290,6 +266,7 @@ describe('registerUsernameSaga', () => {
       signAlg: config.signAlg,
       hashAlg: config.hashAlg,
     }
+
     const reducer = combineReducers(reducers)
     await expectSaga(
       registerUsernameSaga,

packages/state-manager/src/sagas/publicChannels/publicChannels.selectors.test.ts

@@ -59,14 +59,18 @@ describe('publicChannelsSelectors', () => {
       id: community.id,
       nickname: 'alice',
     })
+
     const generalChannelState = publicChannelsSelectors.generalChannel(store.getState())
     if (generalChannelState) generalChannel = generalChannelState
+
     expect(generalChannel).not.toBeUndefined()
+
     channelIdes = [...channelIdes, generalChannel.id]
     john = await factory.create<ReturnType<typeof identityActions.addNewIdentity>['payload']>('Identity', {
       id: community.id,
       nickname: 'john',
     })
+
     store.dispatch(publicChannelsActions.setCurrentChannel({ channelId: generalChannel.id }))
     // Setup channels
     const channelNames = ['croatia', 'allergies', 'sailing', 'pets', 'antiques']
@@ -317,6 +321,8 @@ describe('publicChannelsSelectors', () => {
 
     if (!elouise.userCertificate) throw new Error('no elouise.userCertificate')
     store.dispatch(usersActions.test_remove_user_certificate({ certificate: elouise.userCertificate }))
+    // @ts-expect-error - This is statically mocked data so it'll never be undefined
+    store.dispatch(usersActions.test_remove_user_csr({ csr: elouise.userCsr?.userCsr }))
 
     store.dispatch(
       publicChannelsActions.setCurrentChannel({