Update isLoggedIn for all routes

Author: kumaran-14

src/app/apiFetch/Leaderboard.ts

@@ -1,5 +1,5 @@
 /* tslint:disable:no-console*/
-import { jsonResponseWrapper } from 'app/apiFetch/utils';
+import { jsonResponseWrapper, textResponseWrapper } from 'app/apiFetch/utils';
 import * as LeaderboardInterfaces from 'app/types/Leaderboard';
 import { API_BASE_URL } from '../../config/config';
 
@@ -120,7 +120,7 @@ export const getTimer = () => {
     },
     method: 'GET',
   })
-    .then((response) => response.text())
+    .then((response) => textResponseWrapper(response))
     .then((data) => data)
     .catch((err) => {
       console.error(err);

src/app/apiFetch/MatchView.ts

@@ -9,10 +9,7 @@ export const getMatches = (pageNo: number, pageSize: number) => {
     method: 'GET',
   })
     .then((response) => {
-      console.log('match response');
-      console.log(response);
-
-      return response.json();
+      return jsonResponseWrapper(response);
     })
     .then((data) => {
       return data;
@@ -32,10 +29,7 @@ export const getTopMatches = (pageNo: number, pageSize: number) => {
     method: 'GET',
   })
     .then((response) => {
-      console.log('top response');
-      console.log(response);
-
-      return response.json();
+      return jsonResponseWrapper(response);
     })
     .then((data) => {
       return data;
@@ -52,7 +46,6 @@ export const getGameLogs = (gameId: number) => {
     method: 'GET',
   })
     .then((response) => {
-      console.log(response);
       return jsonResponseWrapper(response);
     })
     .then((data) => data)

src/app/apiFetch/Notification.ts

@@ -17,10 +17,10 @@ export const getUnreadNotifications = () => {
     },
     method: 'GET',
   })
-    .then((response) => response.json())
+    .then((response) => jsonResponseWrapper(response))
     .then((data) => data)
     .catch((error) => {
-      console.log(error);
+      console.error(error);
     });
 };
 

src/app/apiFetch/utils/index.ts

@@ -15,8 +15,6 @@ export enum HeadReqType {
  */
 export function jsonResponseWrapper(response: any) {
   return response.json().then((data: any) => {
-    // tslint:disable-next-line: no-console
-    console.log(data);
     return new Promise((resolve, reject) => {
       let type: string = resType.SUCCESS;
       let error: string = '';
@@ -29,6 +27,7 @@ export function jsonResponseWrapper(response: any) {
         error,
         type,
         body: data,
+        status: response.status,
       });
     });
   });
@@ -74,6 +73,7 @@ export function headResponseWrapper(response: any, headReqType: HeadReqType) {
       error,
       type,
       body: response.text(),
+      status: response.status,
     });
   });
 }
@@ -101,6 +101,7 @@ export function textResponseWrapper(response: any) {
         error,
         type,
         body: data,
+        status: response.status,
       });
     });
   });

src/app/components/MatchView/MatchElement.tsx

@@ -33,9 +33,6 @@ export class MatchElement extends React.Component<
 
     let games = null;
 
-    // tslint:disable-next-line: no-console
-    console.log(match);
-
     if (isSelected) {
       games = match.games.map((game, index) => {
         let gameVerdict = 'TIE';
@@ -55,8 +52,6 @@ export class MatchElement extends React.Component<
             key={index}
             className={classnames(styles.game, 'mt-2')}
             onClick={(e) => {
-              // tslint:disable-next-line: no-console
-              console.log('HE CLICKED HERE');
               getGameLogs(game.id);
               e.stopPropagation();
             }}

src/app/components/Renderer.tsx

@@ -22,17 +22,6 @@ export default class Renderer extends React.Component<RendererInterfaces.Props,
       clearLog,
       updateLog,
     } = this.props;
-    // tslint:disable-next-line: no-console
-    console.log(
-      'logfile:',
-      logFile,
-      'player1DL',
-      player1DebugLog,
-      'player2DL',
-      player2DebugLog,
-      'MatchPlayerId',
-      matchPlayerId,
-    );
 
     return (
       <div style={{ height, display: 'flex', width: '100%', alignItems: 'center' }}>

src/app/components/SocketHandler.tsx

@@ -65,8 +65,6 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
               clearAllLogs,
             } = this.props;
             const matchPlayerId = parseInt(matchDetails.matchPlayerId, 10);
-            // tslint:disable-next-line: no-console
-            console.log(matchDetails, matchPlayerId, userId);
 
             clearDisplayDebugLog();
             clearAllLogs();
@@ -128,8 +126,6 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
     } = this.props;
     switch (request) {
       case SubmissionInterfaces.Request.PREVIOUS_COMMIT_MATCH: {
-        // tslint:disable-next-line: no-console
-        console.log('INITIATING MATCH:PREVIOUS_COMMIT_MATCH');
         this.initiateMatch(
           userId,
           userId,
@@ -141,8 +137,6 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
         break;
       }
       case SubmissionInterfaces.Request.AI_MATCH: {
-        // tslint:disable-next-line: no-console
-        console.log('INITIATING MATCH:AI_MATCH');
         this.initiateMatch(
           playerId1,
           playerId2,
@@ -154,8 +148,6 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
         break;
       }
       case SubmissionInterfaces.Request.SELF_MATCH: {
-        // tslint:disable-next-line: no-console
-        console.log('INITIATING MATCH:SELF_MATCH');
         this.initiateMatch(
           userId,
           playerId2,

src/app/sagas/Leaderboard.ts

@@ -1,6 +1,7 @@
 /* tslint:disable:no-console*/
 import { LeaderboardActions, SubmissionActions } from 'app/actions';
 import * as LeaderboardFetch from 'app/apiFetch/Leaderboard';
+import { checkAuthentication } from 'app/sagas/utils';
 import { Request } from 'app/types/code/Submission';
 import { resType } from 'app/types/sagas';
 import { all, call, put, takeEvery } from 'redux-saga/effects';
@@ -13,6 +14,8 @@ export function* getLeaderboard(action: ActionType<typeof LeaderboardActions.get
       pageNo: action.payload.pageNo,
       pageSize: action.payload.pageSize,
     });
+    const isAuthenticated = yield checkAuthentication(result);
+    if (isAuthenticated === false) return;
     yield put(LeaderboardActions.updateError(result.error));
     if (result.type !== resType.ERROR) {
       yield put(
@@ -36,6 +39,8 @@ export function* getLeaderboardByDiv(
       pageNo: action.payload.pageNo,
       pageSize: action.payload.pageSize,
     });
+    const isAuthenticated = yield checkAuthentication(result);
+    if (isAuthenticated === false) return;
     yield put(LeaderboardActions.updateError(result.error));
     if (result.type !== resType.ERROR) {
       yield put(
@@ -59,6 +64,8 @@ export function* getLeaderboardByUserType(
       pageNo: action.payload.pageNo,
       pageSize: action.payload.pageSize,
     });
+    const isAuthenticated = yield checkAuthentication(result);
+    if (isAuthenticated === false) return;
     yield put(LeaderboardActions.updateError(result.error));
     if (result.type !== resType.ERROR) {
       yield put(
@@ -83,6 +90,8 @@ export function* getLeaderboardLeaderboardByDivAndType(
       pageNo: action.payload.pageNo,
       pageSize: action.payload.pageSize,
     });
+    const isAuthenticated = yield checkAuthentication(result);
+    if (isAuthenticated === false) return;
     yield put(LeaderboardActions.updateError(result.error));
     if (result.type !== resType.ERROR) {
       yield put(
@@ -107,6 +116,8 @@ export function* getLeaderboardSearch(
       pageSize: action.payload.pageSize,
       username: action.payload.username,
     });
+    const isAuthenticated = yield checkAuthentication(result);
+    if (isAuthenticated === false) return;
     yield put(LeaderboardActions.updateError(result.okay));
 
     if (result.type !== resType.ERROR) {
@@ -124,7 +135,9 @@ export function* getLeaderboardSearch(
 export function* getTimerSaga() {
   try {
     const result = yield call(LeaderboardFetch.getTimer);
-    const time = Number(result);
+    const isAuthenticated = yield checkAuthentication(result);
+    if (isAuthenticated === false) return;
+    const time = Number(result.body);
     yield put(LeaderboardActions.setTimer(time));
   } catch (err) {
     console.error(err);

src/app/sagas/MatchView.ts

@@ -16,9 +16,9 @@ export function* getMatches(action: ActionType<typeof MatchActions.getMatches>)
     const isAuthenticated = yield checkAuthentication(res);
     if (isAuthenticated === false) return;
 
-    if (isArray(res)) {
+    if (isArray(res.body)) {
       const username = yield select((state: RootState) => state.user.username);
-      const matchData = mapMatchResponse(res, username);
+      const matchData = mapMatchResponse(res.body, username);
       yield put(MatchActions.updateMatches(matchData));
     } else yield put(NotificationActions.error(res.message));
   } catch (err) {
@@ -39,9 +39,9 @@ export function* getTopMatches(action: ActionType<typeof MatchActions.getTopMatc
     const isAuthenticated = yield checkAuthentication(res);
     if (isAuthenticated === false) return;
 
-    if (isArray(res)) {
+    if (isArray(res.body)) {
       const username = yield select((state: RootState) => state.user.username);
-      const matchData = mapMatchResponse(res, username);
+      const matchData = mapMatchResponse(res.body, username);
       yield put(MatchActions.updateTopMatches(matchData));
     } else yield put(NotificationActions.error(res.message));
   } catch (err) {
@@ -52,13 +52,14 @@ export function* getTopMatches(action: ActionType<typeof MatchActions.getTopMatc
 export function* getGameLogs(action: ActionType<typeof MatchActions.getGameLogs>) {
   try {
     const res = yield call(MatchFetch.getGameLogs, action.payload.gameId);
+    const isAuthenticated = yield checkAuthentication(res);
+    if (isAuthenticated === false) return;
 
     if (res.type === resType.ERROR) {
       yield put(MatchActions.updateError(res.error));
     } else {
       yield put(GameLogActions.setHideDebugLog(true));
       yield put(GameLogActions.clearDisplayDebugLog());
-      console.log('GameLOG from backend', res);
 
       const userId = yield select((state: RootState) => state.user.userId);
 

src/app/sagas/Notification.ts

@@ -18,7 +18,11 @@ export function* getUnreadGlobalNotifications(
       return;
     }
 
-    const notifications = res.notifications;
+    const notifications = res.body.notifications;
+
+    if (notifications && notifications.length > 0) {
+      yield put(NotificationActions.info('You have some unread notifications'));
+    }
 
     notifications.forEach((notification: Notification) => {
       NotificationActions.info(notification.message);
@@ -37,6 +41,11 @@ export function* getAllGlobalNotifications(
 ) {
   try {
     const res = yield call(NotificationFetch.getAllGlobalNotifications);
+    const isAuthenticated = yield checkAuthentication(res);
+
+    if (isAuthenticated === false) {
+      return;
+    }
     const notifications = res.body;
     yield put(NotificationActions.updateGlobalNotifications(notifications));
   } catch (err) {
@@ -49,8 +58,17 @@ export function* getAllGlobalAnnouncements(
 ) {
   try {
     const res = yield call(NotificationFetch.getAllGlobalAnnouncements);
+
+    const isAuthenticated = yield checkAuthentication(res);
+
+    if (isAuthenticated === false) {
+      return;
+    }
     const announcements = res.body;
     yield put(NotificationActions.updateGlobalAnnouncements(announcements));
+    if (announcements && announcements.length > 0) {
+      yield put(NotificationActions.info('You have some unread announcements'));
+    }
   } catch (err) {
     console.error(err);
   }

src/app/sagas/Submission.ts

@@ -40,8 +40,6 @@ export function* previousCommitMatch(
 
     yield put(CodeActions.save());
 
-    console.log(action.payload);
-
     yield put(
       SubmissionActions.changeStateCurrentRequest(
         RequestState.COMPILE_PREVIOUS_COMMIT_CODE,

src/app/sagas/User.ts

@@ -84,10 +84,7 @@ export function* logout(action: ActionType<typeof UserActions.logout>) {
   try {
     const res = yield call(UserFetch.userLogout);
 
-    const isAuthenticated = yield checkAuthentication({
-      error: res.error,
-      type: res.type,
-    });
+    const isAuthenticated = yield checkAuthentication(res);
     if (isAuthenticated === false) return;
 
     yield put(UserActions.updateErrorMessage(res.message));
@@ -111,6 +108,12 @@ export function* register(action: ActionType<typeof UserActions.register>) {
   try {
     const res = yield call(UserFetch.userRegister, action.payload.registerDetails);
 
+    const isAuthenticated = yield checkAuthentication(res);
+
+    if (isAuthenticated === false) {
+      return;
+    }
+
     // res.error has error string if type = 'Error', else empty
     yield put(UserActions.updateErrorMessage(res.error ? res.body.message : ''));
 
@@ -133,6 +136,7 @@ export function* register(action: ActionType<typeof UserActions.register>) {
 export function* getUserDetails(action: ActionType<typeof UserActions.getUserDetails>) {
   try {
     const res = yield call(UserFetch.userGetDetails);
+
     // res.error has error string if type = 'Error', else empty
     yield put(UserActions.updateErrorMessage(res.error));
     const isAuthenticated = yield checkAuthentication(res);
@@ -223,6 +227,12 @@ export function* checkUsernameExists(action: ActionType<typeof UserActions.check
   try {
     const res = yield call(UserFetch.checkUsernameExists, action.payload.username);
 
+    const isAuthenticated = yield checkAuthentication(res);
+
+    if (isAuthenticated === false) {
+      return;
+    }
+
     // Call returns error if email already exists, else empty
     yield put(UserActions.updateErrorMessage(res.error));
   } catch (err) {

src/app/sagas/utils/index.ts

@@ -4,12 +4,13 @@ import * as MatchVewInterfaces from 'app/types/MatchView';
 import { put } from 'redux-saga/effects';
 
 export interface ResponseStructure {
+  status: number | undefined;
   type: string | undefined;
   error: string | undefined;
 }
 
 export function* checkAuthentication(result: ResponseStructure) {
-  if (result && result.error && result.error === 'Unauthorised') {
+  if (result && (result.status === 401 || result.status === 403)) {
     yield put(
       UserActions.updateUserDetails({
         country: '',
@@ -18,7 +19,6 @@ export function* checkAuthentication(result: ResponseStructure) {
         username: '',
       }),
     );
-    yield put(UserActions.setIsAuthenticationOpen(true));
     return false;
   }
   return true;