Merge branch '2.2.0' into feat/1706-connection-status-desktop

TryQuiet · Apr 9, 2024 · d368170 · d368170
2 parents b45a1ec + 595d896
commit d368170
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/backend/src/nest/app.module.ts b/packages/backend/src/nest/app.module.ts
@@ -105,15 +105,15 @@ export class AppModule {
             io.engine.use((req, res, next) => {
               const authHeader = req.headers['authorization']
               if (!authHeader) {
-                console.error('No authorization header')
+                console.error('Backend server: No authorization header')
                 res.writeHead(401, 'No authorization header')
                 res.end()
                 return
               }
 
               const token = authHeader && authHeader.split(' ')[1]
               if (!token) {
-                console.error('No auth token')
+                console.error('Backend server: No auth token')
                 res.writeHead(401, 'No authorization token')
                 res.end()
                 return
@@ -122,7 +122,7 @@ export class AppModule {
               if (verifyToken(options.socketIOSecret, token)) {
                 next()
               } else {
-                console.error('Wrong basic token')
+                console.error('Backend server: Unauthorized')
                 res.writeHead(401, 'Unauthorized')
                 res.end()
               }

diff --git a/packages/backend/src/nest/websocketOverTor/index.ts b/packages/backend/src/nest/websocketOverTor/index.ts
@@ -82,6 +82,7 @@ export class WebSockets extends EventEmitter {
         websocket: {
           ...this._websocketOpts,
         },
+        signal: options.signal,
       })
     } catch (e) {
       log.error('error connecting to %s. Details: %s', ma, e.message)

diff --git a/packages/mobile/src/App.tsx b/packages/mobile/src/App.tsx
@@ -85,7 +85,6 @@ function App(): JSX.Element {
           ref={navigationRef}
           linking={linking}
           onReady={() => {
-            dispatch(initActions.blindWebsocketConnection())
             dispatch(navigationActions.redirection())
           }}
         >