feat: no more need to login again when sending multilples messages

Author: paulmusso

src/Components/Feedy.js

@@ -49,13 +49,12 @@ class Feedy extends Component {
 			ReactDom.findDOMNode(this).style.bottom = 0;
 		}
 		else {
-
 			ReactDom.findDOMNode(this).style.bottom = `${-this.getInnerHeight()}px`;
 		}
 	}
 
 	getInnerHeight() {
-		return outerHeight(ReactDom.findDOMNode(this)) - outerHeight(this.refs.header)
+		return outerHeight(ReactDom.findDOMNode(this)) - outerHeight(this.refs.header);
 	}
 
 	componentDidMount() {

src/Components/SendMessage.js

@@ -57,17 +57,21 @@ class SendMessage extends Component {
 		}
 	}
 
+	logout() {
+		this.props.dispatch(actions.logout());
+	}
+
 	render() {
 		return (
 			<div>
 				<p>
 					Laissez-nous un message. Nous vous contacterons dès que possible.
 				</p>
-				<p>
+				{!this.props.logged && <p>
 					Pas de compte ?
 					{' '}
 					<Link to="/createAccount">Créez en un !</Link>
-				</p>
+				</p>}
 				<form ref="form" onSubmit={this.sendMessage.bind(this)}>
 					<div className={s.error} id="sendMessageError">{this.props.errorMsg}</div>
 					{!this.props.logged && <div className={s.group}>
@@ -86,6 +90,10 @@ class SendMessage extends Component {
 							required
 							onChange={this.resetErrorMsg.bind(this)}></input>
 					</div>}
+					{this.props.logged && <div className={s.group}>
+						Bonjour {this.props.email} !
+						<div><a onClick={this.logout.bind(this)}>Se déconnecter</a></div>
+					</div>}
 					<div className={s.group}>
 						<label htmlFor="textareaContent">Message</label>
 						<textarea id="textareaContent" ref="message" rows="6" required></textarea>
@@ -104,5 +112,6 @@ class SendMessage extends Component {
 
 export default connect(state => ({
 	logged: state.main.logged,
+	email: state.main.auth && state.main.auth.email,
 	errorMsg: state.main.sendMessageError
 }))(SendMessage);

src/actions/index.js

@@ -6,7 +6,9 @@ export const toggleVisibility = createAction('TOGGLE_VISIBILITY');
 export const sendMessage = createAction('SEND_MESSAGE');
 export const sendMessageError = createAction('SEND_MESSAGE_ERROR');
 export const loginAndSendMessage = createAction('LOGIN_AND_SEND_MESSAGE');
+export const logout = createAction('LOGOUT');
+export const logged = createAction('LOGGED');
+export const unlogged = createAction('UNLOGGED');
 export const createUser = createAction('CREATE_USER');
-export const userCreated = createAction('USER_CREATED');
 export const createUserError = createAction('CREATE_USER_ERROR');
 export const resetErrorMsg = createAction('RESET_ERROR_MSG');

src/reducers/main.js

@@ -16,12 +16,17 @@ export default function(state=initialState, {type, payload}) {
 	case 'LOGGED':
 		return {
 			...state,
-			logged: true
+			logged: true,
+			auth: {
+				email: payload.email,
+				uid: payload.uid
+			}
 		};
 	case 'UNLOGGED':
 		return {
 			...state,
-			logged: false
+			logged: false,
+			email: undefined
 		};
 	case 'SEND_MESSAGE_ERROR':
 		return {
@@ -39,13 +44,6 @@ export default function(state=initialState, {type, payload}) {
 			createUserError: null,
 			sendMessageError: null
 		};
-	case 'USER_CREATED':
-		return {
-			...state,
-			auth: { 
-				...payload.auth
-			}
-		};
 	default:
 		return state;
 	}

src/sagas/index.js

@@ -4,20 +4,21 @@ import {
 	init, 
 	login as webcomLogin, 
 	createAccount, 
-	logout, 
+	logout as logoutWebcom, 
 	push, 
 	getUserData,
 	screenshot
 } from 'services';
 import { Components, Component } from 'actions';
 import * as actions from 'actions';
+import { getAuth } from './selectors';
 
 let appRouter;
 
 export function* login(email, password) {
 	try {
 		const auth = yield call(webcomLogin, email, password);
-		yield put(actions.logged, auth);
+		yield put(actions.logged({email: auth.email, uid: auth.uid}));
 		return auth;
 	}
 	catch (e) {
@@ -45,7 +46,9 @@ export function* sendMessage(message, auth, takeScreenshot) {
 		};
 	}
 
-	yield call(push, 'message', data);
+	const path = `${encodeURIComponent(data.domain)}}/messages`;
+
+	yield call(push, path, data);
 	yield call(appRouter.push, '/messageSent');
 }
 
@@ -58,13 +61,15 @@ export function* watchInit() {
 export function* watchSendMessage() {
 	while (true) {
 		const { payload: { 
-			content,
+			message,
 			takeScreenshot } 
 		} = yield take('SEND_MESSAGE');
 
+		const auth = yield select(getAuth);
+
 		// get auth
 		if ( auth ) {
-			yield call(sendMessage, content, auth, takeScreenshot);
+			yield call(sendMessage, message, auth, takeScreenshot);
 		}
 	}
 }
@@ -105,9 +110,18 @@ export function* watchCreateUser() {
 	}
 }
 
+export function* watchLogout() {
+	while (true) {
+		yield take('LOGOUT');
+		yield call(logoutWebcom);
+		yield put(actions.unlogged());
+	}
+}
+
 export default function* root() {
 	yield [
 		fork(watchInit),
+		fork(watchLogout),
 		fork(watchSendMessage),
 		fork(watchLoginAndSendMessage),
 		fork(watchCreateUser)

src/sagas/selectors/index.js

@@ -0,0 +1 @@
+export const getAuth = state => state.main.auth;

src/services/index.js

@@ -71,6 +71,7 @@ const removeUndefined = obj => {
 export function getUserData() {
 	return {
 		url: window.location.toString(),
+		domain: window.location.host,
 		userAgent: removeUndefined((new uaParser()).getResult())
 	};
 }