From a68d53b779c6a809f5b171f5206f69f0b7b4bcc0 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 13 May 2022 08:26:46 -0500 Subject: [PATCH] logging out --- packages/desktop/src/providers/AuthProvider.tsx | 4 ++-- packages/desktop/src/providers/RealTimeRoomProvider.tsx | 4 ++-- packages/desktop/src/tree/protected/terminal/Terminal.tsx | 5 +++++ .../desktop/src/tree/protected/terminal/navbar/Navbar.tsx | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/desktop/src/providers/AuthProvider.tsx b/packages/desktop/src/providers/AuthProvider.tsx index 11792ad..338231a 100644 --- a/packages/desktop/src/providers/AuthProvider.tsx +++ b/packages/desktop/src/providers/AuthProvider.tsx @@ -36,8 +36,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) { }, [jwtToken, fetchUser]); const handleLogout = useCallback(() => { - setJwtToken(undefined); - // ?should this be set here? what's a better way of NirvanaApi._jwtToken = null; @@ -48,6 +46,8 @@ export function AuthProvider({ children }: { children: React.ReactNode }) { .catch(() => { toast.error('logged out'); }); + + setJwtToken(undefined); }, [fetchUser, setJwtToken]); const handleSetJwtToken = useCallback( diff --git a/packages/desktop/src/providers/RealTimeRoomProvider.tsx b/packages/desktop/src/providers/RealTimeRoomProvider.tsx index 1a8d4f0..6c28590 100644 --- a/packages/desktop/src/providers/RealTimeRoomProvider.tsx +++ b/packages/desktop/src/providers/RealTimeRoomProvider.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState, useCallback, useContext } from 'react'; +import React, { useEffect, useState, useContext } from 'react'; import useRooms from './RoomsProvider'; import useSockets from './SocketProvider'; @@ -190,7 +190,7 @@ export function RealTimeRoomProvider({ children }: { children: React.ReactChild return ( - {' '} + {children} ); } diff --git a/packages/desktop/src/tree/protected/terminal/Terminal.tsx b/packages/desktop/src/tree/protected/terminal/Terminal.tsx index 7cb3a87..d412979 100644 --- a/packages/desktop/src/tree/protected/terminal/Terminal.tsx +++ b/packages/desktop/src/tree/protected/terminal/Terminal.tsx @@ -21,6 +21,7 @@ export default function Terminal() { const handleSelectLine = useCallback( (newLineIdToSelect: string) => { toast('selecting line!! NOT IMPLEMENTED'); + setSelectedLine(roomsMap[newLineIdToSelect]); }, [setSelectedLine], ); @@ -31,3 +32,7 @@ export default function Terminal() { ); } + +// have a socket view component to just connect on mount and disconnect from specific | tunes in and untunes similarly +// have a socket view component to just tune into tuned in lines +// have a stream view component to just make peer connections and have stream components available diff --git a/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx b/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx index e06e021..e5c6b39 100644 --- a/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx +++ b/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx @@ -83,7 +83,7 @@ export default function NavBar() { onClick={(e) => { handleLogout(); }} - onKeyPress={this.handleKeyPress} + onKeyPress={handleLogout} > Sign Out