Logout after socket connection closes (#79)

* Logout after socket connection closes

* Change from logout() to resetUserState

* Update error message for unactivated accounts

Author: ElzaCS

src/app/actions/User.ts

@@ -49,22 +49,7 @@ export namespace UserActions {
   export const updateErrorMessage = (errorMessage: string) =>
     action(Type.UPDATE_ERROR_MESSAGE, { errorMessage });
 
-  interface UserDetails {
-    isLoggedIn: boolean;
-    isFirstLogin?: boolean;
-    userId?: number;
-    avatar?: string;
-    college?: string;
-    userType?: UserInterfaces.UserType;
-    fullName?: string;
-    username?: string;
-    email?: string;
-    errorMessage?: string;
-    country?: string;
-    isUserProfileModalOpen?: boolean;
-  }
-
-  export const updateUserDetails = (userDetails: UserDetails) =>
+  export const updateUserDetails = (userDetails: UserInterfaces.UserDetails) =>
     action(Type.UPDATE_USER_DETAILS, { userDetails });
 
   export const getUserDetails = () => action(Type.GET_USER_DETAILS);

src/app/components/SocketHandler.tsx

@@ -89,8 +89,7 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
       },
       // tslint:disable-next-line
       (closeEvent: any) => {
-        // const { logout } = this.props;
-        // logout();
+        this.props.resetUserState();
       },
     );
   }

src/app/containers/SocketHandler.ts

@@ -4,6 +4,7 @@ import { RootState } from 'app/reducers';
 import * as SubmissionInterfaces from 'app/types/code/Submission';
 import * as NotificationInterfaces from 'app/types/Notification';
 import * as SocketHandlerInterfaces from 'app/types/SocketHandler';
+import { UserDetails } from 'app/types/User';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 
@@ -46,6 +47,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => {
     info: (message: string) => dispatch(NotificationActions.info(message)),
     logout: () => dispatch(UserActions.logout()),
     resetNotificationState: () => dispatch(NotificationActions.resetNotificationState()),
+    resetUserState: () => dispatch(UserActions.resetUserState()),
     sendCompileError: (error: string) => dispatch(SubmissionActions.handleCompileError(error)),
     sendCompileSuccess: () => dispatch(SubmissionActions.handleCompileSuccess()),
     sendDebugRunError: () => dispatch(SubmissionActions.handleDebugRunError()),
@@ -69,6 +71,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => {
       dispatch(GameLogActions.updateMatchPlayerId(matchPlayerId)),
     updateRequest: (request: SubmissionInterfaces.Request) =>
       dispatch(SubmissionActions.changeCurrentRequest(request)),
+    updateUserDetails: (details: UserDetails) => dispatch(UserActions.updateUserDetails(details)),
   };
 };
 

src/app/sagas/User.ts

@@ -49,6 +49,8 @@ export function* login(action: ActionType<typeof UserActions.login>) {
     let errorMessage;
     switch (responseBody.message) {
       case 'User is disabled':
+        errorMessage = 'Please check your email to activate your account';
+        break;
       case 'Bad credentials':
         errorMessage = 'Your email or password was incorrect.';
         break;
@@ -183,6 +185,7 @@ export function* getQuestStatus(action: ActionType<typeof UserActions.getQuestSt
     }
   } catch (err) {
     console.error(err);
+    yield put(UserActions.resetUserState());
   }
 }
 

src/app/types/SocketHandler.ts

@@ -1,5 +1,6 @@
 import * as SubmissionInterfaces from 'app/types/code/Submission';
 import * as NotificationInterfaces from 'app/types/Notification';
+import { UserDetails } from 'app/types/User';
 
 export interface DispatchProps {
   add: (type: NotificationInterfaces.NotificationType, title: string, text: string) => void;
@@ -16,6 +17,7 @@ export interface DispatchProps {
   info: (message: string) => void;
   logout: () => void;
   resetNotificationState: () => void;
+  resetUserState: () => void;
   sendExecuteError: (error: string) => void;
   sendExecuteSuccess: (logs: string) => void;
   sendCompileError: (error: string) => void;
@@ -33,6 +35,7 @@ export interface DispatchProps {
   updateGlobalNotifications: (notifications: NotificationInterfaces.Notification[]) => void;
   updateMatchPlayerId: (matchPlayerId: number) => void;
   updateRequest: (request: SubmissionInterfaces.Request) => void;
+  updateUserDetails: (details: UserDetails) => void;
 }
 
 export enum MatchMode {

src/app/types/User.ts

@@ -41,6 +41,21 @@ export interface ActivateUser {
   userId: number;
 }
 
+export interface UserDetails {
+  isLoggedIn: boolean;
+  isFirstLogin?: boolean;
+  userId?: number;
+  avatar?: string;
+  college?: string;
+  userType?: UserType;
+  fullName?: string;
+  username?: string;
+  email?: string;
+  errorMessage?: string;
+  country?: string;
+  isUserProfileModalOpen?: boolean;
+}
+
 const actions = {
   ActivateUser: UserActions.activateUser,
   editUserPassword: UserActions.editUserPassword,