8000 [Feature] Implement logout function by saseungmin · Pull Request #42 · CodeSoom/ConStu · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[Feature] Implement logout function #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/components/common/Header.jsx
10000
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,20 @@ const Spacer = styled.div`
height: 6rem;
`;

const Header = ({ user }) => (
const Header = ({ user, onLogout }) => (
<>
<HeaderWrapper>
<Wrapper>
<TitleWrapper to="/">제목(미정)</TitleWrapper>
{user ? (
<div>
<button type="button">로그아웃</button>
<span>{user}</span>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 지금은 사용자의 이메일을 헤더에 나타나는데 회원가입할 때 사용자의 이름도 같이 입력받아서 이름으로 나타내도 좋을거 같다.

<button
>
type="button"
>
로그아웃
</button>
</div>
) : (
<div>
Expand Down
26 changes: 19 additions & 7 deletions src/components/common/Header.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,29 @@ import { render } from '@testing-library/react';
import Header from './Header';

describe('Header', () => {
const renderHeader = () => render((
const renderHeader = (user) => render((
<MemoryRouter>
<Header />
<Header user={user} />
</MemoryRouter>
));

it('renders Header text', () => {
const { container } = renderHeader();
context('with user', () => {
const user = 'seungmin@naver.com';

expect(container).toHaveTextContent('제목(미정)');
expect(container).toHaveTextContent('로그인');
expect(container).toHaveTextContent('회원가입');
it('renders Header text', () => {
const { container } = renderHeader(user);

expect(container).toHaveTextContent('로그아웃');
expect(container).toHaveTextContent(user);
});
});

context('without user', () => {
it('renders Header text', () => {
const { container } = renderHeader();

expect(container).toHaveTextContent('로그인');
expect(container).toHaveTextContent('회원가입');
});
});
});
16 changes: 14 additions & 2 deletions src/containers/common/HeaderContainer.jsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
import React from 'react';
import React, { useCallback } from 'react';

import { useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';

import { get } from '../../util/utils';
import { requestLogout } from '../../reducers/slice';

import Header from '../../components/common/Header';

const HeaderContainer = () => {
const dispatch = useDispatch();
const history = useHistory();

const user = useSelector(get('user'));

const => {
dispatch(requestLogout());

history.push('/');
}, [dispatch, history]);

return (
<Header
user={user}
>
/>
);
};
Expand Down
64 changes: 59 additions & 5 deletions src/containers/common/HeaderContainer.test.jsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,74 @@
import React from 'react';

import { render } from '@testing-library/react';

import { MemoryRouter } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';

import { fireEvent, render } from '@testing-library/react';

import HeaderContainer from './HeaderContainer';

const mockPush = jest.fn();

jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
useHistory() {
return { push: mockPush };
},
}));

describe('HeaderContainer', () => {
const dispatch = jest.fn();

beforeEach(() => {
dispatch.mockClear();
mockPush.mockClear();

useDispatch.mockImplementation(() => dispatch);

useSelector.mockImplementation((selector) => selector({
user: given.user,
}));
});

const renderHeaderContainer = () => render((
<MemoryRouter>
<HeaderContainer />
</MemoryRouter>
));

it('renders Header Title', () => {
const { container } = renderHeaderContainer();
context('with user', () => {
given('user', () => ('seungmin@naver.com'));

it('renders Header text', () => {
const { container } = renderHeaderContainer();

expect(container).toHaveTextContent('제목(미정)');
expect(container).toHaveTextContent('로그아웃');
});

it('logout event calls dispatch actions and redirection go to main page', () => {
const { getByText } = renderHeaderContainer();

const button = getByText('로그아웃');

expect(button).not.toBeNull();

fireEvent.click(button);

expect(dispatch).toBeCalled();
expect(mockPush).toBeCalledWith('/');
});
});

context('without user', () => {
given('user', () => (null));

it('renders Header text', () => {
const { container } = renderHeaderContainer();

expect(container).toHaveTextContent('제목(미정)');
expect(container).toHaveTextContent('제목(미정)');
expect(container).toHaveTextContent('로그인');
expect(container).toHaveTextContent('회원가입');
});
});
});
18 changes: 17 additions & 1 deletion src/reducers/slice.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import {
getStudyGroups,
postStudyGroup,
postUserLogin,
postUserLogout,
postUserRegister,
} from '../services/api';
import { saveItem } from '../services/storage';
import { removeItem, saveItem } from '../services/storage';

const writeInitialState = {
title: '',
Expand Down Expand Up @@ -140,6 +141,12 @@ const { actions, reducer } = createSlice({
user,
};
},
logout(state) {
return {
...state,
user: null,
};
},
},
});

Expand All @@ -155,6 +162,7 @@ export const {
setAuthError,
clearAuth,
setUser,
logout,
} = actions;

export const loadStudyGroups = (tag) => async (dispatch) => {
Expand Down Expand Up @@ -218,4 +226,12 @@ export const requestLogin = () => async (dispatch, getState) => {
}
};

export const requestLogout = () => async (dispatch) => {
await postUserLogout();

removeItem('user');

dispatch(logout());
};

export default reducer;
32 changes: 31 additions & 1 deletion src/reducers/slice.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ import reducer, {
requestRegister,
requestLogin,
setUser,
logout,
requestLogout,
} from './slice';

import STUDY_GROUPS from '../../fixtures/study-groups';
import STUDY_GROUP from '../../fixtures/study-group';
import WRITE_FORM from '../../fixtures/write-form';
import { postUserLogin, postUserRegister } from '../services/api';
import { postUserLogin, postUserLogout, postUserRegister } from '../services/api';

const middlewares = [thunk];
const mockStore = configureStore(middlewares);
Expand Down Expand Up @@ -285,6 +287,18 @@ describe('reducer', () => {
expect(user).toBe(userEmail);
});
});

describe('logout', () => {
const initialState = {
user: 'seungmin@naver.com',
};

it('after logout clear user', () => {
const { user } = reducer(initialState, logout());

expect(user).toBe(null);
});
});
});

describe('async actions', () => {
Expand Down Expand Up @@ -434,4 +448,20 @@ describe('async actions', () => {
});
});
});

describe('requestLogout', () => {
beforeEach(() => {
store = mockStore({});
});

postUserLogout.mockImplementationOnce(() => ({}));

it('dispatches requestLogout action success to logout', async () => {
await store.dispatch(requestLogout());

const actions = store.getActions();

expect(actions[0]).toEqual(logout());
});
});
});
2 changes: 2 additions & 0 deletions src/services/__mocks__/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ export const postStudyGroup = async () => {};
export const postUserRegister = jest.fn();

export const postUserLogin = jest.fn();

export const postUserLogout = jest.fn();
4 changes: 1 addition & 3 deletions src/services/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,5 @@ export const postUserLogin = async ({ userEmail, password }) => {
};

export const postUserLogout = async () => {
const response = await auth.signOut();

return response;
await auth.signOut();
};
6 changes: 2 additions & 4 deletions src/services/api.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,11 @@ describe('api', () => {

describe('postUserLogout', () => {
beforeEach(() => {
auth.signOut = jest.fn().mockResolvedValue(true);
auth.signOut = jest.fn();
});

it('returns true after success logout', async () => {
const response = await postUserLogout();

expect(response).toBe(true);
await postUserLogout();
});
});
});
0