refactor: Remove SET_COMMUNITY_METADATA event (#2408)

TryQuiet · Apr 10, 2024 · f50e034 · f50e034
1 parent 3ba5b9a
commit f50e034
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 179 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,20 +1,28 @@
 [unreleased]
 
-* Refactored package.json to have consistent license "GPL-3.0-or-later"
-
-# Refactorings:
+# New features:
 
-* Use ack for CREATE_NETWORK and simplify
+# Refactorings:
 
-# Fixes
+# Fixes:
 
-* Allow JPEG and GIF files as profile photos ([#2332](https://github.com/TryQuiet/quiet/issues/2332))
-* Fixes issues with recreating general channel when deleted while offline ([#2334](https://github.com/TryQuiet/quiet/issues/2334))
+[2.2.0]
 
-# New features
+# New features:
 
 * Add utilities for emoji detection in messages and make all-emoji message larger font size ([#519](https://github.com/TryQuiet/quiet/issues/519))
 
+# Refactorings:
+
+* Use ack for CREATE_NETWORK and simplify
+* Move Community model to the backend
+
+# Fixes:
+
+* Allow JPEG and GIF files as profile photos ([#2332](https://github.com/TryQuiet/quiet/issues/2332))
+* Fix issues with recreating general channel when deleted while offline ([#2334](https://github.com/TryQuiet/quiet/issues/2334))
+* Fix package.json license inconsistency
+
 # Chores
 
 * Cleanup data directory at end of e2e tests
@@ -278,4 +286,3 @@
 * C4 for Quiet architecture. Context and Container diagrams.
 
 * Invite tab as default in settings
-
diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
@@ -349,7 +349,7 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
 
     const localAddress = createLibp2pAddress(payload.hiddenService.onionAddress, payload.peerId.id)
 
-    const community = {
+    let community: Community = {
       id: payload.id,
       name: payload.name,
       CA: payload.CA,
@@ -371,6 +371,22 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     await this.localDbService.setNetworkInfo(network)
 
     await this.launchCommunity({ community, network })
+
+    const meta = await this.storageService.updateCommunityMetadata({
+      id: community.id,
+      rootCa: community.rootCa as string,
+      ownerCertificate: community.ownerCertificate as string,
+    })
+    const currentCommunity = await this.localDbService.getCurrentCommunity()
+
+    if (meta && currentCommunity) {
+      community = {
+        ...currentCommunity,
+        ownerOrbitDbIdentity: meta.ownerOrbitDbIdentity,
+      }
+      await this.localDbService.setCommunity(community)
+    }
+
     this.logger(`Created and launched community ${community.id}`)
 
     return community
@@ -535,7 +551,15 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     // service for now. Both object construction and object
     // initialization need to happen in order based on dependencies.
     await this.registrationService.init(this.storageService)
-    this.logger('storage initialized')
+
+    if (community.CA) {
+      this.registrationService.setPermsData({
+        certificate: community.CA.rootCertString,
+        privKey: community.CA.rootKeyString,
+      })
+    }
+
+    this.logger('Storage initialized')
 
     this.serverIoProvider.io.emit(
       SocketActionTypes.CONNECTION_PROCESS_INFO,
@@ -559,7 +583,6 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     this.socketService.on(SocketActionTypes.CONNECTION, async () => {
       // Update Frontend with Initialized Communities
       if (this.communityId) {
-        console.log('Hunting for heisenbug: Backend initialized community and sent event to state manager')
         this.serverIoProvider.io.emit(SocketActionTypes.COMMUNITY_LAUNCHED, { id: this.communityId })
         console.log('this.libp2pService.connectedPeers', this.libp2pService.connectedPeers)
         console.log('this.libp2pservice', this.libp2pService)
@@ -595,26 +618,6 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
         callback(await this.joinCommunity(args))
       }
     )
-    // TODO: With the Community model on the backend, there is no need to call
-    // SET_COMMUNITY_METADATA anymore. We can call updateCommunityMetadata when
-    // creating the community.
-    this.socketService.on(
-      SocketActionTypes.SET_COMMUNITY_METADATA,
-      async (payload: CommunityMetadata, callback: (response: CommunityMetadata | undefined) => void) => {
-        const meta = await this.storageService.updateCommunityMetadata(payload)
-        const community = await this.localDbService.getCurrentCommunity()
-
-        if (meta && community) {
-          const updatedCommunity = {
-            ...community,
-            ownerOrbitDbIdentity: meta.ownerOrbitDbIdentity,
-          }
-          await this.localDbService.setCommunity(updatedCommunity)
-          this.serverIoProvider.io.emit(SocketActionTypes.COMMUNITY_UPDATED, updatedCommunity)
-        }
-        callback(meta)
-      }
-    )
     this.socketService.on(SocketActionTypes.LEAVE_COMMUNITY, async () => {
       await this.leaveCommunity()
     })
@@ -624,13 +627,6 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       this.logger(`socketService - ${SocketActionTypes.ADD_CSR}`)
       await this.storageService?.saveCSR(payload)
     })
-    // TODO: With the Community model on the backend, there is no need to call
-    // SET_COMMUNITY_CA_DATA anymore. We can call setPermsData when
-    // creating the community.
-    this.socketService.on(SocketActionTypes.SET_COMMUNITY_CA_DATA, async (payload: PermsData) => {
-      this.logger(`socketService - ${SocketActionTypes.SET_COMMUNITY_CA_DATA}`)
-      this.registrationService.setPermsData(payload)
-    })
 
     // Public Channels
     this.socketService.on(

diff --git a/packages/backend/src/nest/socket/socket.service.spec.ts b/packages/backend/src/nest/socket/socket.service.spec.ts
@@ -61,7 +61,6 @@ describe('SocketService', () => {
       SocketActionTypes.LAUNCH_COMMUNITY.valueOf(),
       SocketActionTypes.REGISTER_USER_CERTIFICATE.valueOf(),
       SocketActionTypes.ADD_CSR.valueOf(),
-      SocketActionTypes.SET_COMMUNITY_METADATA.valueOf(),
     ]
 
     fragile.forEach(event => {

diff --git a/packages/backend/src/nest/socket/socket.service.ts b/packages/backend/src/nest/socket/socket.service.ts
@@ -179,17 +179,6 @@ export class SocketService extends EventEmitter implements OnModuleInit {
         this.emit(SocketActionTypes.LIBP2P_PSK_STORED, payload)
       })
 
-      socket.on(
-        SocketActionTypes.SET_COMMUNITY_METADATA,
-        (payload: CommunityMetadata, callback: (response: CommunityMetadata | undefined) => void) => {
-          this.emit(SocketActionTypes.SET_COMMUNITY_METADATA, payload, callback)
-        }
-      )
-
-      socket.on(SocketActionTypes.SET_COMMUNITY_CA_DATA, (payload: PermsData) => {
-        this.emit(SocketActionTypes.SET_COMMUNITY_CA_DATA, payload)
-      })
-
       // ====== Users ======
 
       socket.on(SocketActionTypes.SET_USER_PROFILE, (profile: UserProfile) => {

diff --git a/packages/desktop/src/rtl-tests/community.create.test.tsx b/packages/desktop/src/rtl-tests/community.create.test.tsx
@@ -20,13 +20,11 @@ import {
   type NetworkInfo,
   SavedOwnerCertificatePayload,
   SocketActionTypes,
+  type ChannelsReplicatedPayload,
+  type RegisterOwnerCertificatePayload,
+  type ResponseLaunchCommunityPayload,
 } from '@quiet/types'
-import {
-  ChannelsReplicatedPayload,
-  publicChannels,
-  RegisterOwnerCertificatePayload,
-  ResponseLaunchCommunityPayload,
-} from '@quiet/state-manager'
+import { publicChannels } from '@quiet/state-manager'
 import Channel from '../renderer/components/Channel/Channel'
 import LoadingPanel from '../renderer/components/LoadingPanel/LoadingPanel'
 import { AnyAction } from 'redux'
@@ -167,7 +165,6 @@ describe('User', () => {
         "Modals/openModal",
         "Identity/registerCertificate",
         "Communities/createCommunity",
-        "Communities/sendCommunityCaData",
         "Files/checkForMissingFiles",
         "Network/addInitializedCommunity",
         "Communities/clearInvitationCodes",
@@ -176,7 +173,6 @@ describe('User', () => {
         "PublicChannels/addChannel",
         "Identity/storeUserCertificate",
         "Messages/addPublicChannelsMessagesBase",
-        "Communities/sendCommunityMetadata",
         "PublicChannels/createGeneralChannel",
         "PublicChannels/createChannel",
         "Identity/saveUserCsr",

diff --git a/packages/desktop/src/rtl-tests/community.join.test.tsx b/packages/desktop/src/rtl-tests/community.join.test.tsx
@@ -181,7 +181,6 @@ describe('User', () => {
         "Modals/openModal",
         "Identity/registerCertificate",
         "Communities/launchCommunity",
-        "Communities/sendCommunityCaData",
         "Files/checkForMissingFiles",
         "Network/addInitializedCommunity",
         "Communities/clearInvitationCodes",

diff --git a/packages/state-manager/src/sagas/communities/communities.master.saga.ts b/packages/state-manager/src/sagas/communities/communities.master.saga.ts
@@ -5,16 +5,12 @@ import { connectionActions } from '../appConnection/connection.slice'
 import { createCommunitySaga } from './createCommunity/createCommunity.saga'
 import { initCommunities, launchCommunitySaga } from './launchCommunity/launchCommunity.saga'
 import { createNetworkSaga } from './createNetwork/createNetwork.saga'
-import { sendCommunityMetadataSaga } from './updateCommunityMetadata/updateCommunityMetadata.saga'
-import { sendCommunityCaDataSaga } from './sendCommunityCaData/sendCommunityCaData.saga'
 
 export function* communitiesMasterSaga(socket: Socket): Generator {
   yield all([
     takeEvery(communitiesActions.createNetwork.type, createNetworkSaga, socket),
     takeEvery(connectionActions.torBootstrapped.type, initCommunities),
     takeEvery(communitiesActions.createCommunity.type, createCommunitySaga, socket),
     takeEvery(communitiesActions.launchCommunity.type, launchCommunitySaga, socket),
-    takeEvery(communitiesActions.sendCommunityMetadata.type, sendCommunityMetadataSaga, socket),
-    takeEvery(communitiesActions.sendCommunityCaData.type, sendCommunityCaDataSaga, socket),
   ])
 }
diff --git a/packages/state-manager/src/sagas/communities/communities.slice.ts b/packages/state-manager/src/sagas/communities/communities.slice.ts
@@ -35,8 +35,6 @@ export const communitiesSlice = createSlice({
         },
       })
     },
-    sendCommunityCaData: state => state,
-    sendCommunityMetadata: state => state,
     createNetwork: (state, _action: PayloadAction<CreateNetworkPayload>) => state,
     resetApp: (state, _action) => state,
     createCommunity: (state, _action: PayloadAction<string>) => state,

diff --git a/packages/state-manager/src/sagas/communities/createCommunity/createCommunity.saga.ts b/packages/state-manager/src/sagas/communities/createCommunity/createCommunity.saga.ts
@@ -52,9 +52,6 @@ export function* createCommunitySaga(
     })
   )
 
-  // TODO: Community metadata should already exist on the backend after creating
-  // the community.
-  yield* put(communitiesActions.sendCommunityMetadata())
   yield* put(publicChannelsActions.createGeneralChannel())
   // TODO: We can likely refactor this a bit. Currently, we issue the owner's
   // certificate before creating the community, but then we add the owner's CSR

diff --git a/packages/state-manager/src/sagas/communities/sendCommunityCaData/sendCommunityCaData.saga.ts b/packages/state-manager/src/sagas/communities/sendCommunityCaData/sendCommunityCaData.saga.ts
diff --git a/...ate-manager/src/sagas/communities/updateCommunityMetadata/updateCommunityMetadata.saga.ts b/...ate-manager/src/sagas/communities/updateCommunityMetadata/updateCommunityMetadata.saga.ts
diff --git a/packages/state-manager/src/sagas/identity/identity.types.ts b/packages/state-manager/src/sagas/identity/identity.types.ts
@@ -51,29 +51,6 @@ export interface RegisterUserCertificatePayload {
   serviceAddress: string
 }
 
-export interface PermsData {
-  certificate: string
-  privKey: string
-}
-
-export interface RegisterOwnerCertificatePayload {
-  communityId: string
-  userCsr: UserCsr
-  permsData: PermsData
-}
-
-export interface SaveCertificatePayload {
-  certificate: string
-  rootPermsData: PermsData
-}
-
-export interface SaveOwnerCertificatePayload {
-  id: string
-  peerId: string
-  certificate: string
-  permsData: PermsData
-}
-
 export interface StoreUserCertificatePayload {
   userCertificate: string
   communityId: string

diff --git a/packages/state-manager/src/sagas/network/network.slice.ts b/packages/state-manager/src/sagas/network/network.slice.ts
@@ -14,7 +14,6 @@ export const networkSlice = createSlice({
   name: StoreKeys.Network,
   reducers: {
     addInitializedCommunity: (state, action: PayloadAction<CommunityId>) => {
-      console.log('Hunting for heisenbug: adding initialized community ', action.payload)
       state.initializedCommunities = {
         ...state.initializedCommunities,
         [action.payload]: true,

diff --git a/packages/state-manager/src/sagas/socket/startConnection/startConnection.saga.ts b/packages/state-manager/src/sagas/socket/startConnection/startConnection.saga.ts
@@ -84,8 +84,6 @@ export function subscribe(socket: Socket) {
     | ReturnType<typeof communitiesActions.clearInvitationCodes>
     | ReturnType<typeof identityActions.saveUserCsr>
     | ReturnType<typeof connectionActions.setTorInitialized>
-    | ReturnType<typeof communitiesActions.sendCommunityMetadata>
-    | ReturnType<typeof communitiesActions.sendCommunityCaData>
     | ReturnType<typeof usersActions.setUserProfiles>
     | ReturnType<typeof appActions.loadMigrationData>
   >(emit => {
@@ -140,10 +138,6 @@ export function subscribe(socket: Socket) {
     // Community
 
     socket.on(SocketActionTypes.COMMUNITY_LAUNCHED, (payload: ResponseLaunchCommunityPayload) => {
-      console.log('Hunting for heisenbug: Community event received in state-manager')
-      // TODO: We can send this once when creating the community and
-      // store it in the backend.
-      emit(communitiesActions.sendCommunityCaData())
       emit(filesActions.checkForMissingFiles(payload.id))
       emit(networkActions.addInitializedCommunity(payload.id))
       emit(communitiesActions.clearInvitationCodes())

diff --git a/packages/state-manager/src/types.ts b/packages/state-manager/src/types.ts
@@ -50,11 +50,6 @@ export interface EmitEvents {
   [SocketActionTypes.LEAVE_COMMUNITY]: () => void
   [SocketActionTypes.CREATE_NETWORK]: EmitEvent<string, (response: NetworkInfo | undefined) => void>
   [SocketActionTypes.ADD_CSR]: EmitEvent<SaveCSRPayload>
-  [SocketActionTypes.SET_COMMUNITY_METADATA]: EmitEvent<
-    CommunityMetadata,
-    (response: CommunityMetadata | undefined) => void
-  >
-  [SocketActionTypes.SET_COMMUNITY_CA_DATA]: EmitEvent<PermsData>
   [SocketActionTypes.SET_USER_PROFILE]: EmitEvent<UserProfile>
   [SocketActionTypes.LOAD_MIGRATION_DATA]: EmitEvent<Record<string, any>>
 }

diff --git a/packages/types/src/socket.ts b/packages/types/src/socket.ts
@@ -21,8 +21,6 @@ export enum SocketActionTypes {
   CREATE_COMMUNITY = 'createCommunity',
   LAUNCH_COMMUNITY = 'launchCommunity',
   LEAVE_COMMUNITY = 'leaveCommunity',
-  SET_COMMUNITY_CA_DATA = 'setCommunityCaData',
-  SET_COMMUNITY_METADATA = 'setCommunityMetadata',
 
   // ====== Channels ======