Handle socketIOSecret for iOS lifecycle event

TryQuiet · Oct 18, 2023 · f9fafbd · f9fafbd
1 parent 3eaf916
commit f9fafbd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/backend/src/backendManager.ts b/packages/backend/src/backendManager.ts
@@ -34,6 +34,7 @@ console.log('options', options)
 interface OpenServices {
  torControlPort?: any
  socketIOPort?: any
+ socketIOSecret?: any
  httpTunnelPort?: any
  authCookie?: any
 }
@@ -123,6 +124,7 @@ export const runBackendMobile = async (): Promise<any> => {
  app = await NestFactory.createApplicationContext(
  AppModule.forOptions({
  socketIOPort: msg.socketIOPort,
+ socketIOSecret: msg.socketIOSecret,
  httpTunnelPort: msg.httpTunnelPort ? msg.httpTunnelPort : null,
  torAuthCookie: msg.authCookie ? msg.authCookie : null,
  torControlPort: msg.torControlPort ? msg.torControlPort : await getPort(),
@@ -136,7 +138,6 @@ export const runBackendMobile = async (): Promise<any> => {
  }),
  { logger: ['warn', 'error', 'log', 'debug', 'verbose'] }
  )
- console.log('started backend wiktor little bastard ')
  })
 }
 

diff --git a/packages/mobile/ios/Quiet/AppDelegate.m b/packages/mobile/ios/Quiet/AppDelegate.m
@@ -129,7 +129,9 @@ - (void) spinupBackend:(BOOL)init {
  FindFreePort *findFreePort = [FindFreePort new];
 
  self.dataPort = [findFreePort getFirstStartingFromPort:11000];
- self.socketIOSecret = randomStringWithLength(20);
+ if (self.socketIOSecret == nil) {
+ self.socketIOSecret = randomStringWithLength(20);
+ }
 
  uint16_t socksPort = [findFreePort getFirstStartingFromPort:12000];
  uint16_t controlPort = [findFreePort getFirstStartingFromPort:14000];
@@ -215,11 +217,12 @@ - (void) launchBackend:(uint16_t)controlPort:(uint16_t)httpTunnelPort:(NSString
 
 - (void) reviweServices:(uint16_t)controlPort:(uint16_t)httpTunnelPort:(NSString *)authCookie {
  NSString * dataPortPayload = [NSString stringWithFormat:@"%@:%hu", @"socketIOPort", self.dataPort];
+ NSString * socketIOSecretPayload = [NSString stringWithFormat:@"%@:%@", @"socketIOSecret", self.socketIOSecret];
  NSString * controlPortPayload = [NSString stringWithFormat:@"%@:%hu", @"torControlPort", controlPort];
  NSString * httpTunnelPortPayload = [NSString stringWithFormat:@"%@:%hu", @"httpTunnelPort", httpTunnelPort];
  NSString * authCookiePayload = [NSString stringWithFormat:@"%@:%@", @"authCookie", authCookie];
 
- NSString * payload = [NSString stringWithFormat:@"%@|%@|%@|%@", dataPortPayload, controlPortPayload, httpTunnelPortPayload, authCookiePayload];
+ NSString * payload = [NSString stringWithFormat:@"%@|%@|%@|%@|%@", dataPortPayload, socketIOSecretPayload, controlPortPayload, httpTunnelPortPayload, authCookiePayload];
  [self.nodeJsMobile sendMessageToNode:@"open":payload];
 }