diff --git a/packages/desktop/src/providers/AuthProvider.tsx b/packages/desktop/src/providers/AuthProvider.tsx index 338231a..6992e74 100644 --- a/packages/desktop/src/providers/AuthProvider.tsx +++ b/packages/desktop/src/providers/AuthProvider.tsx @@ -1,9 +1,9 @@ -import React, { useContext, useState, useEffect } from 'react'; +import React, { useContext, useState, useEffect, useCallback } from 'react'; import { User } from '@nirvana/core/models/user.model'; import { useAsyncFn } from 'react-use'; import NirvanaApi, { getUserDetails } from '../api/NirvanaApi'; import toast from 'react-hot-toast'; -import { useCallback } from 'react'; +import { STORE_ITEMS } from '../electron/constants'; interface IAuthProvider { user?: User; @@ -18,6 +18,21 @@ export function AuthProvider({ children }: { children: React.ReactNode }) { const [jwtToken, setJwtToken] = useState(); const [userFetchState, fetchUser] = useAsyncFn(getUserDetails); + // ! REMOVING FOR TESTING MULTIPLE CLIENTS + useEffect(() => { + // on load of this, if we already have jwt tokens in store, + // then try using them with auth check + window.electronAPI.store.get(STORE_ITEMS.AUTH_SESSION_JWT).then((jwtToken: string) => { + if (jwtToken) { + setJwtToken(jwtToken); + + console.log('retrieved jwtToken from storage', jwtToken); + } else { + console.log('no jwt token in store'); + } + }); + }, []); + useEffect(() => { if (jwtToken) { console.warn(jwtToken); diff --git a/packages/desktop/src/providers/RealTimeRoomProvider.tsx b/packages/desktop/src/providers/RealTimeRoomProvider.tsx index 39a402a..09471c3 100644 --- a/packages/desktop/src/providers/RealTimeRoomProvider.tsx +++ b/packages/desktop/src/providers/RealTimeRoomProvider.tsx @@ -3,7 +3,6 @@ import useRooms from './RoomsProvider'; import useSockets from './SocketProvider'; import MasterLineData from '@nirvana/core/models/masterLineData.model'; -import { LineMemberState } from '@nirvana/core/models/line.model'; import { ServerResponseChannels, @@ -15,7 +14,6 @@ import { UserStoppedBroadcastingResponse, } from '@nirvana/core/sockets/channels'; import toast from 'react-hot-toast'; -import { useMap } from 'react-use'; import { useImmer } from 'use-immer'; type LineIdToMasterLine = { @@ -226,11 +224,11 @@ export function RealTimeRoomProvider({ children }: { children: React.ReactChild [setSelectedLineId], ); + console.warn(roomMap); + return ( {children} - -
{JSON.stringify(roomMap)}
); } diff --git a/packages/desktop/src/tree/protected/terminal/Terminal.tsx b/packages/desktop/src/tree/protected/terminal/Terminal.tsx index 2e4d4e9..a66a09b 100644 --- a/packages/desktop/src/tree/protected/terminal/Terminal.tsx +++ b/packages/desktop/src/tree/protected/terminal/Terminal.tsx @@ -21,7 +21,7 @@ export default function Terminal() {
- + {desktopMode === 'mainApp' && }
); diff --git a/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx b/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx index 675abab..e2bc839 100644 --- a/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx +++ b/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx @@ -1,9 +1,12 @@ import React from 'react'; import useAuth from '../../../../providers/AuthProvider'; +import useRealTimeRooms from '../../../../providers/RealTimeRoomProvider'; export default function MainPanel() { const { user } = useAuth(); + const { roomsMap } = useRealTimeRooms(); + return (