From 4816067bfe5037d60dc1fc7355258d9687089f48 Mon Sep 17 00:00:00 2001
From: DiD3n <denwojtkowiak@gmail.com>
Date: Wed, 13 Apr 2022 16:34:16 +0200
Subject: [PATCH] Fixes

---
 .../containers/LectureCard/EventCard.tsx          |  5 ++++-
 src/contexts/auth/AuthContext.tsx                 | 15 +++++++--------
 .../auth/__test__/BasicAuthorization.test.tsx     |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/containers/LectureCard/EventCard.tsx b/src/components/containers/LectureCard/EventCard.tsx
index e129f60..fd76c69 100644
--- a/src/components/containers/LectureCard/EventCard.tsx
+++ b/src/components/containers/LectureCard/EventCard.tsx
@@ -25,7 +25,7 @@ export const EventCard: React.FC<EventCardProps> = ({
 }) => {
 
     const cardStyle: React.CSSProperties = {
-        backgroundColor: color || "#080736" //space dark
+        backgroundColor: color
     }
 
     return (
@@ -52,4 +52,7 @@ export const EventCard: React.FC<EventCardProps> = ({
             </div>
         </div>
     )
+}
+EventCard.defaultProps = {
+    color: "#080736"
 }
\ No newline at end of file
diff --git a/src/contexts/auth/AuthContext.tsx b/src/contexts/auth/AuthContext.tsx
index 144d8ae..a3b35f8 100644
--- a/src/contexts/auth/AuthContext.tsx
+++ b/src/contexts/auth/AuthContext.tsx
@@ -9,15 +9,14 @@ import Providers from "../../api/rest/auth/oauth/Provider";
 import { User } from "../../common/models/User";
 
 export interface AuthContextInterface {
-    auth(provider: string, code: string, state?: string): Promise<User>;
-    logout(): void;
-    user: User | null; // undefined == not authorized
-    refreshSession(): void;
-    axios: AxiosInstance,
+    auth(provider: string, code: string, state?: string): Promise<User>
+    logout(): void
+    user?: User
+    refreshSession(): void
+    axios: AxiosInstance
 }
 
 export const AuthContext = createContext<AuthContextInterface>({
-    user: null,
     auth: async () => { throw new Error("AuthContext not initialized") },
     logout: () => { throw new Error("AuthContext not initialized") },
     refreshSession: () => { throw new Error("AuthContext not initialized") },
@@ -25,7 +24,7 @@ export const AuthContext = createContext<AuthContextInterface>({
 });
 
 export const AuthContextProvider: React.FC = ({ children }) => {
-    const [user, setUser] = useState<User | null>(null);
+    const [user, setUser] = useState<User|undefined>(undefined);
 
     const [axiosClient, setAxiosClient] = useState<AxiosInstance>(() => createAxiosClient());
     const [apolloClient, setApolloClient] = useState<ApolloClient<NormalizedCacheObject>>(() => createApolloClient());
@@ -67,7 +66,7 @@ export const AuthContextProvider: React.FC = ({ children }) => {
         setApolloClient(() => createApolloClient());
         setAxiosClient(() => createAxiosClient());
 
-        setUser(() => null);
+        setUser(() => undefined);
         localStorage.setItem("refresh_token", "");
     }
 
diff --git a/src/contexts/auth/__test__/BasicAuthorization.test.tsx b/src/contexts/auth/__test__/BasicAuthorization.test.tsx
index e654589..1aca243 100644
--- a/src/contexts/auth/__test__/BasicAuthorization.test.tsx
+++ b/src/contexts/auth/__test__/BasicAuthorization.test.tsx
@@ -67,7 +67,7 @@ describe('Authorization Context', () => {
     })
 
     it('should login', async () => {
-        expect(testContext?.user).toBe(null);
+        expect(testContext?.user).toBe(undefined);
 
         act(() => {
             userEvent.click(screen.getByTestId('login'), { button: 0 })
@@ -82,7 +82,7 @@ describe('Authorization Context', () => {
     })
 
     it('should login & logout', async () => {
-        expect(testContext?.user).toBe(null);
+        expect(testContext?.user).toBe(undefined);
 
         act(() => {
             userEvent.click(screen.getByTestId('login'), { button: 0 })
@@ -91,13 +91,13 @@ describe('Authorization Context', () => {
 
         await waitFor(() => screen.getByTestId('id'));
 
-        expect(testContext?.user).not.toBe(null);
+        expect(testContext?.user).toBeDefined();
         expect(testContext?.user?.nickname).toBe(authRes.username);
 
         act(() => {
             userEvent.click(screen.getByTestId('logout'), { button: 0 });
         })
 
-        expect(testContext?.user).toBe(null);
+        expect(testContext?.user).toBe(undefined);
     })
 })
\ No newline at end of file