Backwards compatibility fixes

TryQuiet · Dec 5, 2024 · 936bd2a · 936bd2a
1 parent 97e54d3
commit 936bd2a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
@@ -12,7 +12,7 @@ import { getLibp2pAddressesFromCsrs, removeFilesFromDir } from '../common/utils'
 
 import { LazyModuleLoader } from '@nestjs/core'
 import { createLibp2pAddress, filterValidAddresses, isPSKcodeValid } from '@quiet/common'
-import { CertFieldsTypes, createRootCA, getCertFieldValue, loadCertificate } from '@quiet/identity'
+import { CertFieldsTypes, getCertFieldValue, loadCertificate } from '@quiet/identity'
 import {
   ChannelMessageIdsResponse,
   ChannelSubscribedPayload,
@@ -28,8 +28,6 @@ import {
   FileMetadata,
   GetMessagesPayload,
   InitCommunityPayload,
-  InvitationDataV2,
-  InvitationDataVersion,
   MessagesLoadedPayload,
   NetworkDataPayload,
   NetworkInfo,
@@ -62,7 +60,6 @@ import { SocketService } from '../socket/socket.service'
 import { StorageService } from '../storage/storage.service'
 import { StorageEvents } from '../storage/storage.types'
 import { StorageServiceClient } from '../storageServiceClient/storageServiceClient.service'
-import { ServerStoredCommunityMetadata } from '../storageServiceClient/storageServiceClient.types'
 import { Tor } from '../tor/tor.service'
 import { ConfigOptions, GetPorts, ServerIoProviderTypes } from '../types'
 import { ServiceState, TorInitState } from './connections-manager.types'

diff --git a/packages/desktop/src/renderer/sagas/invitation/customProtocol.saga.ts b/packages/desktop/src/renderer/sagas/invitation/customProtocol.saga.ts
@@ -77,15 +77,18 @@ export function* customProtocolSaga(
 
   let isJoiningAnotherCommunity = false
 
+  let storedPsk: string | undefined = undefined
+  let currentPsk: string | undefined = undefined
   switch (data.version) {
     case InvitationDataVersion.v1:
-      const storedPsk = yield* select(communities.selectors.psk)
-      const currentPsk = data.psk
+      storedPsk = yield* select(communities.selectors.psk)
+      currentPsk = data.psk
       isJoiningAnotherCommunity = Boolean(storedPsk && storedPsk !== currentPsk)
       break
-    case InvitationDataVersion.v2:
-      const inviteData = yield* select(communities.selectors.inviteData)
-      isJoiningAnotherCommunity = Boolean(inviteData && !_.isEqual(inviteData, data))
+    case InvitationDataVersion.v2: // Question: should we also check if the sig chain team name is different or something?  is the psk enough?
+      storedPsk = yield* select(communities.selectors.psk)
+      currentPsk = data.psk
+      isJoiningAnotherCommunity = Boolean(storedPsk && storedPsk !== currentPsk)
       break
   }
 

diff --git a/packages/mobile/src/store/init/deepLink/deepLink.saga.ts b/packages/mobile/src/store/init/deepLink/deepLink.saga.ts
@@ -80,15 +80,18 @@ export function* deepLinkSaga(action: PayloadAction<ReturnType<typeof initAction
 
   let isJoiningAnotherCommunity = false
 
+  let storedPsk: string | undefined = undefined
+  let currentPsk: string | undefined = undefined
   switch (data.version) {
     case InvitationDataVersion.v1:
-      const storedPsk = yield* select(communities.selectors.psk)
-      const currentPsk = data.psk
+      storedPsk = yield* select(communities.selectors.psk)
+      currentPsk = data.psk
       isJoiningAnotherCommunity = Boolean(storedPsk && storedPsk !== currentPsk)
       break
-    case InvitationDataVersion.v2:
-      const inviteData = yield* select(communities.selectors.inviteData)
-      isJoiningAnotherCommunity = Boolean(inviteData && !_.isEqual(inviteData, data))
+    case InvitationDataVersion.v2: // Question: should we also check if the sig chain team name is different or something?  is the psk enough?
+      storedPsk = yield* select(communities.selectors.psk)
+      currentPsk = data.psk
+      isJoiningAnotherCommunity = Boolean(storedPsk && storedPsk !== currentPsk)
       break
   }
 

diff --git a/packages/state-manager/src/sagas/communities/createNetwork/createNetwork.saga.ts b/packages/state-manager/src/sagas/communities/createNetwork/createNetwork.saga.ts
@@ -60,6 +60,7 @@ export function* createNetworkSaga(
 
   if (payload.inviteData) {
     switch (payload.inviteData.version) {
+      case InvitationDataVersion.v2: // TODO: update to have actual logic https://github.com/TryQuiet/quiet/issues/2628
       case InvitationDataVersion.v1:
         community.psk = payload.inviteData.psk
         community.ownerOrbitDbIdentity = payload.inviteData.ownerOrbitDbIdentity