From 435e193c93822ca3d8c050b0a43829cc48e85e38 Mon Sep 17 00:00:00 2001
From: Alan Friedman <d.alan.friedman@gmail.com>
Date: Mon, 27 May 2019 16:06:01 -0400
Subject: [PATCH] Rename actions and functions

---
 client/src/actions/room.js                  | 16 ++++-------
 client/src/components/Chat/Chat.test.js     |  4 +--
 client/src/components/Chat/index.js         | 12 ++++----
 client/src/components/FileTransfer/index.js |  4 +--
 client/src/components/Home/index.js         | 18 +++++-------
 client/src/containers/Chat/index.js         |  4 +--
 client/src/containers/Home/index.js         | 10 +++----
 client/src/reducers/activities.js           | 28 +++++++++----------
 client/src/reducers/app.js                  |  2 +-
 client/src/reducers/room.js                 | 31 +++++++--------------
 client/src/reducers/user.js                 |  2 +-
 client/src/stylesheets/app.sass             |  2 +-
 server/src/socket.js                        | 12 ++++----
 13 files changed, 61 insertions(+), 84 deletions(-)

diff --git a/client/src/actions/room.js b/client/src/actions/room.js
index 83b0d96..48e076c 100644
--- a/client/src/actions/room.js
+++ b/client/src/actions/room.js
@@ -6,11 +6,11 @@ import {
 } from 'utils/message'
 import { getSocket } from 'utils/socket'
 
-export const receiveSocketMessage = payload => async (dispatch, getState) => {
+export const receiveEncryptedMessage = payload => async (dispatch, getState) => {
   const state = getState()
   const message = await processMessage(payload, state)
-  // Pass current state to all HANDLE_SOCKET_MESSAGE reducers for convenience, since each may have different needs
-  dispatch({ type: `HANDLE_SOCKET_MESSAGE_${message.type}`, payload: { payload: message.payload, state } })
+  // Pass current state to all RECEIVE_ENCRYPTED_MESSAGE reducers for convenience, since each may have different needs
+  dispatch({ type: `RECEIVE_ENCRYPTED_MESSAGE_${message.type}`, payload: { payload: message.payload, state } })
 }
 
 export const createUser = payload => async (dispatch) => {
@@ -52,11 +52,11 @@ export const onFileTransfer = payload => async (dispatch) => {
   dispatch({ type: 'PREFLIGHT_FILE_TRANSFER', payload })
 }
 
-export const sendSocketMessage = payload => async (dispatch, getState) => {
+export const sendEncryptedMessage = payload => async (dispatch, getState) => {
   const state = getState()
   const msg = await prepareMessage(payload, state)
-  dispatch({ type: `SEND_SOCKET_MESSAGE_${msg.original.type}`, payload: msg.original.payload })
-  getSocket().emit('PAYLOAD', msg.toSend)
+  dispatch({ type: `SEND_ENCRYPTED_MESSAGE_${msg.original.type}`, payload: msg.original.payload })
+  getSocket().emit('ENCRYPTED_MESSAGE', msg.toSend)
 }
 
 export const toggleLockRoom = () => async (dispatch, getState) => {
@@ -94,10 +94,6 @@ export const clearActivities = () => async (dispatch) => {
   dispatch({ type: 'CLEAR_ACTIVITIES' })
 }
 
-export const onConnected = payload => async (dispatch) => {
-  dispatch({ type: 'CONNECTED', payload })
-}
-
 export const sendUserDisconnect = () => async () => {
   getSocket().emit('USER_DISCONNECT')
 }
diff --git a/client/src/components/Chat/Chat.test.js b/client/src/components/Chat/Chat.test.js
index a33de83..a1b6235 100644
--- a/client/src/components/Chat/Chat.test.js
+++ b/client/src/components/Chat/Chat.test.js
@@ -3,11 +3,11 @@ import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import { Chat } from './index.js'
 
-const sendSocketMessage = jest.fn()
+const sendEncryptedMessage = jest.fn()
 
 test('Chat Component', () => {
   const component = mount(
-    <Chat scrollToBottom={() => {}} focusChat={false} userId="foo" username="user" showNotice={() => {}} clearActivities={() => {}} sendSocketMessage={sendSocketMessage} />
+    <Chat scrollToBottom={() => {}} focusChat={false} userId="foo" username="user" showNotice={() => {}} clearActivities={() => {}} sendEncryptedMessage={sendEncryptedMessage} />
   )
 
   const componentJSON = toJson(component)
diff --git a/client/src/components/Chat/index.js b/client/src/components/Chat/index.js
index f2ba71d..1148fe0 100644
--- a/client/src/components/Chat/index.js
+++ b/client/src/components/Chat/index.js
@@ -51,7 +51,7 @@ export class Chat extends Component {
           })
         }
 
-        this.props.sendSocketMessage({
+        this.props.sendEncryptedMessage({
           type: 'CHANGE_USERNAME',
           payload: {
             id: this.props.userId,
@@ -85,7 +85,7 @@ export class Chat extends Component {
           return false
         }
 
-        this.props.sendSocketMessage({
+        this.props.sendEncryptedMessage({
           type: 'USER_ACTION',
           payload: {
             action: actionMessage,
@@ -216,8 +216,8 @@ export class Chat extends Component {
         return
       }
     } else {
-      this.props.sendSocketMessage({
-        type: 'SEND_MESSAGE',
+      this.props.sendEncryptedMessage({
+        type: 'TEXT_MESSAGE',
         payload: {
           text: message,
           timestamp: Date.now(),
@@ -256,7 +256,7 @@ export class Chat extends Component {
           placeholder="Type here"
           onChange={this.handleInputChange.bind(this)} />
         <div className="input-controls">
-          <FileTransfer sendSocketMessage={this.props.sendSocketMessage} />
+          <FileTransfer sendEncryptedMessage={this.props.sendEncryptedMessage} />
           {touchSupport &&
             <button onClick={this.handleSendClick.bind(this)} className={`icon is-right send btn btn-link ${this.canSend() ? 'active' : ''}`}>
               <CornerDownRight className={this.canSend() ? '' : 'disabled'} />
@@ -269,7 +269,7 @@ export class Chat extends Component {
 }
 
 Chat.propTypes = {
-  sendSocketMessage: PropTypes.func.isRequired,
+  sendEncryptedMessage: PropTypes.func.isRequired,
   showNotice: PropTypes.func.isRequired,
   userId: PropTypes.string.isRequired,
   username: PropTypes.string.isRequired,
diff --git a/client/src/components/FileTransfer/index.js b/client/src/components/FileTransfer/index.js
index d8fd2ed..00381a5 100644
--- a/client/src/components/FileTransfer/index.js
+++ b/client/src/components/FileTransfer/index.js
@@ -81,7 +81,7 @@ export default class FileTransfer extends Component {
       this.setState({
         localFileQueue,
       }, async () => {
-        this.props.sendSocketMessage({
+        this.props.sendEncryptedMessage({
           type: 'SEND_FILE',
           payload: {
             fileName: fileData.fileName,
@@ -112,5 +112,5 @@ export default class FileTransfer extends Component {
 }
 
 FileTransfer.propTypes = {
-  sendSocketMessage: PropTypes.func.isRequired,
+  sendEncryptedMessage: PropTypes.func.isRequired,
 }
diff --git a/client/src/components/Home/index.js b/client/src/components/Home/index.js
index 1cd145d..4e983d0 100644
--- a/client/src/components/Home/index.js
+++ b/client/src/components/Home/index.js
@@ -41,6 +41,7 @@ export default class Home extends Component {
   }
 
   async componentWillMount() {
+    console.log(this.props.dispatch);
     const roomId = encodeURI(this.props.match.params.roomId)
 
     const user = await this.createUser()
@@ -70,7 +71,7 @@ export default class Home extends Component {
 
     socket.on('USER_ENTER', (payload) => {
       this.props.receiveUserEnter(payload)
-      this.props.sendSocketMessage({
+      this.props.sendEncryptedMessage({
         type: 'ADD_USER',
         payload: {
           username: this.props.username,
@@ -85,18 +86,14 @@ export default class Home extends Component {
       this.props.receiveUserExit(payload)
     })
 
-    socket.on('PAYLOAD', (payload) => {
-      this.props.receiveSocketMessage(payload)
+    socket.on('ENCRYPTED_MESSAGE', (payload) => {
+      this.props.receiveEncryptedMessage(payload)
     })
 
     socket.on('TOGGLE_LOCK_ROOM', (payload) => {
       this.props.receiveToggleLockRoom(payload)
     })
 
-    socket.on('CONNECTED', (payload) => {
-      this.props.onConnected(payload);
-    });
-
     socket.on('ROOM_LOCKED', (payload) => {
       this.props.openModal('Room Locked')
     });
@@ -171,7 +168,7 @@ export default class Home extends Component {
 
   getActivityComponent(activity) {
     switch (activity.type) {
-      case 'SEND_MESSAGE':
+      case 'TEXT_MESSAGE':
         return (
           <Message
             sender={activity.username}
@@ -411,8 +408,8 @@ Home.defaultProps = {
 }
 
 Home.propTypes = {
-  receiveSocketMessage: PropTypes.func.isRequired,
-  sendSocketMessage: PropTypes.func.isRequired,
+  receiveEncryptedMessage: PropTypes.func.isRequired,
+  sendEncryptedMessage: PropTypes.func.isRequired,
   createUser: PropTypes.func.isRequired,
   receiveUserExit: PropTypes.func.isRequired,
   receiveUserEnter: PropTypes.func.isRequired,
@@ -441,5 +438,4 @@ Home.propTypes = {
   toggleSoundEnabled: PropTypes.func.isRequired,
   toggleSocketConnected: PropTypes.func.isRequired,
   socketConnected: PropTypes.bool.isRequired,
-  onConnected: PropTypes.func.isRequired
 }
diff --git a/client/src/containers/Chat/index.js b/client/src/containers/Chat/index.js
index 82d046f..182ace8 100644
--- a/client/src/containers/Chat/index.js
+++ b/client/src/containers/Chat/index.js
@@ -1,12 +1,12 @@
 import { connect } from 'react-redux'
-import { sendSocketMessage } from 'actions'
+import { sendEncryptedMessage } from 'actions'
 import ChatInput from 'components/Chat'
 
 const mapStateToProps = () => ({
 })
 
 const mapDispatchToProps = {
-  sendSocketMessage,
+  sendEncryptedMessage,
 }
 
 export default connect(
diff --git a/client/src/containers/Home/index.js b/client/src/containers/Home/index.js
index 3d426a3..6329912 100644
--- a/client/src/containers/Home/index.js
+++ b/client/src/containers/Home/index.js
@@ -1,8 +1,8 @@
 import { connect } from 'react-redux'
 import Home from 'components/Home'
 import {
-  receiveSocketMessage,
-  sendSocketMessage,
+  receiveEncryptedMessage,
+  sendEncryptedMessage,
   createUser,
   receiveUserExit,
   receiveUserEnter,
@@ -15,7 +15,6 @@ import {
   toggleWindowFocus,
   toggleSoundEnabled,
   toggleSocketConnected,
-  onConnected,
   sendUserDisconnect
 } from 'actions'
 
@@ -42,8 +41,8 @@ const mapStateToProps = (state) => {
 }
 
 const mapDispatchToProps = {
-  receiveSocketMessage,
-  sendSocketMessage,
+  receiveEncryptedMessage,
+  sendEncryptedMessage,
   receiveUserExit,
   receiveUserEnter,
   createUser,
@@ -56,7 +55,6 @@ const mapDispatchToProps = {
   toggleWindowFocus,
   toggleSoundEnabled,
   toggleSocketConnected,
-  onConnected,
   sendUserDisconnect
 }
 
diff --git a/client/src/reducers/activities.js b/client/src/reducers/activities.js
index 35a1bc3..98f55b3 100644
--- a/client/src/reducers/activities.js
+++ b/client/src/reducers/activities.js
@@ -16,7 +16,7 @@ const activities = (state = initialState, action) => {
         ...state,
         items: [],
       }
-    case 'SEND_SOCKET_MESSAGE_SLASH_COMMAND':
+    case 'SEND_ENCRYPTED_MESSAGE_SLASH_COMMAND':
       return {
         ...state,
         items: [
@@ -27,7 +27,7 @@ const activities = (state = initialState, action) => {
           },
         ],
       }
-    case 'SEND_SOCKET_MESSAGE_FILE_TRANSFER':
+    case 'SEND_ENCRYPTED_MESSAGE_FILE_TRANSFER':
       return {
         ...state,
         items: [
@@ -38,29 +38,29 @@ const activities = (state = initialState, action) => {
           },
         ],
       }
-    case 'SEND_SOCKET_MESSAGE_SEND_MESSAGE':
+    case 'SEND_ENCRYPTED_MESSAGE_TEXT_MESSAGE':
       return {
         ...state,
         items: [
           ...state.items,
           {
             ...action.payload,
-            type: 'SEND_MESSAGE',
+            type: 'TEXT_MESSAGE',
           },
         ],
       }
-    case 'HANDLE_SOCKET_MESSAGE_SEND_MESSAGE':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_TEXT_MESSAGE':
       return {
         ...state,
         items: [
           ...state.items,
           {
             ...action.payload.payload,
-            type: 'SEND_MESSAGE',
+            type: 'TEXT_MESSAGE',
           },
         ],
       }
-    case 'SEND_SOCKET_MESSAGE_SEND_FILE':
+    case 'SEND_ENCRYPTED_MESSAGE_SEND_FILE':
       return {
         ...state,
         items: [
@@ -71,7 +71,7 @@ const activities = (state = initialState, action) => {
           },
         ],
       }
-    case 'HANDLE_SOCKET_MESSAGE_SEND_FILE':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_SEND_FILE':
       return {
         ...state,
         items: [
@@ -82,7 +82,7 @@ const activities = (state = initialState, action) => {
           },
         ],
       }
-    case 'HANDLE_SOCKET_MESSAGE_ADD_USER':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_ADD_USER':
       const newUserId = action.payload.payload.id
 
       const haveUser = action.payload.state.room.members.find(m => m.id === newUserId)
@@ -159,7 +159,7 @@ const activities = (state = initialState, action) => {
           },
         ],
       }
-    case 'SEND_SOCKET_MESSAGE_CHANGE_USERNAME':
+    case 'SEND_ENCRYPTED_MESSAGE_CHANGE_USERNAME':
       return {
         ...state,
         items: [
@@ -179,7 +179,7 @@ const activities = (state = initialState, action) => {
           return item
         }),
       }
-    case 'HANDLE_SOCKET_MESSAGE_CHANGE_USERNAME':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_CHANGE_USERNAME':
       return {
         ...state,
         items: [
@@ -190,7 +190,7 @@ const activities = (state = initialState, action) => {
             newUsername: action.payload.payload.newUsername,
           },
         ].map((item) => {
-          if (['SEND_MESSAGE', 'USER_ACTION'].includes(item.type) && item.sender === action.payload.payload.sender) {
+          if (['TEXT_MESSAGE', 'USER_ACTION'].includes(item.type) && item.sender === action.payload.payload.sender) {
             return {
               ...item,
               username: action.payload.payload.newUsername,
@@ -199,7 +199,7 @@ const activities = (state = initialState, action) => {
           return item
         }),
       }
-    case 'SEND_SOCKET_MESSAGE_USER_ACTION':
+    case 'SEND_ENCRYPTED_MESSAGE_USER_ACTION':
       return {
         ...state,
         items: [
@@ -210,7 +210,7 @@ const activities = (state = initialState, action) => {
           },
         ],
       }
-    case 'HANDLE_SOCKET_MESSAGE_USER_ACTION':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_USER_ACTION':
       return {
         ...state,
         items: [
diff --git a/client/src/reducers/app.js b/client/src/reducers/app.js
index 265d26c..703e9b8 100644
--- a/client/src/reducers/app.js
+++ b/client/src/reducers/app.js
@@ -30,7 +30,7 @@ const app = (state = initialState, action) => {
         windowIsFocused: action.payload,
         unreadMessageCount: 0,
       }
-    case 'HANDLE_SOCKET_MESSAGE_SEND_MESSAGE':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_TEXT_MESSAGE':
       return {
         ...state,
         unreadMessageCount: state.windowIsFocused ? 0 : state.unreadMessageCount + 1,
diff --git a/client/src/reducers/room.js b/client/src/reducers/room.js
index 6f3a396..96a956b 100644
--- a/client/src/reducers/room.js
+++ b/client/src/reducers/room.js
@@ -15,15 +15,6 @@ const initialState = {
 
 const room = (state = initialState, action) => {
   switch (action.type) {
-    case 'CONNECTED':
-      const size = action.payload.users ? action.payload.users.length : 1;
-      return {
-        ...state,
-        id: action.payload.id,
-        isLocked: Boolean(action.payload.isLocked),
-        size,
-        joining: false
-      }
     case 'USER_EXIT':
       const memberPubKeys = action.payload.members.map(m => JSON.stringify(m.publicKey))
       return {
@@ -38,7 +29,7 @@ const room = (state = initialState, action) => {
             }
           }),
       }
-    case 'HANDLE_SOCKET_MESSAGE_ADD_USER':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_ADD_USER':
       const membersWithId = state.members.filter(m => m.id)
       const joining = false
 
@@ -70,17 +61,15 @@ const room = (state = initialState, action) => {
         ],
       }
     case 'USER_ENTER':
-      /*
-      In this payload the server sends all users' public keys. Normally the server
-      will have all the users the client does, but in some cases - such as when
-      new users join before this client has registered with the server (this can
-      happen when lots of users join in quick succession) - the client
-      will receive a USER_ENTER event that doesn't contain itself. In that case we
-      want to prepend "me" to the members payload
-      */
-      const members = _.uniqBy(action.payload, member => member.publicKey.n);
+      const members = _.uniqBy(action.payload.users, member => member.publicKey.n);
+      const size = action.payload.users ? action.payload.users.length : 1;
+
       return {
         ...state,
+        id: action.payload.id,
+        isLocked: Boolean(action.payload.isLocked),
+        size,
+        joining: false,
         members: members.reduce((acc, user) => {
           const exists = state.members.find(m => m.publicKey.n === user.publicKey.n)
           if (exists) {
@@ -112,7 +101,7 @@ const room = (state = initialState, action) => {
         ...state,
         isLocked: action.payload.locked,
       }
-    case 'SEND_SOCKET_MESSAGE_CHANGE_USERNAME':
+    case 'SEND_ENCRYPTED_MESSAGE_CHANGE_USERNAME':
       const newUsername = action.payload.newUsername
       const userId = action.payload.id
       return {
@@ -125,7 +114,7 @@ const room = (state = initialState, action) => {
             } : member
         )),
       }
-    case 'HANDLE_SOCKET_MESSAGE_CHANGE_USERNAME':
+    case 'RECEIVE_ENCRYPTED_MESSAGE_CHANGE_USERNAME':
       const newUsername2 = action.payload.payload.newUsername
       const userId2 = action.payload.payload.id
       return {
diff --git a/client/src/reducers/user.js b/client/src/reducers/user.js
index 39ec677..da9d0ef 100644
--- a/client/src/reducers/user.js
+++ b/client/src/reducers/user.js
@@ -12,7 +12,7 @@ const user = (state = initialState, action) => {
         ...action.payload,
         id: action.payload.publicKey.n,
       }
-    case 'SEND_SOCKET_MESSAGE_CHANGE_USERNAME':
+    case 'SEND_ENCRYPTED_MESSAGE_CHANGE_USERNAME':
       return {
         ...state,
         username: action.payload.newUsername,
diff --git a/client/src/stylesheets/app.sass b/client/src/stylesheets/app.sass
index 114c73b..867b3bf 100644
--- a/client/src/stylesheets/app.sass
+++ b/client/src/stylesheets/app.sass
@@ -142,7 +142,7 @@ textarea
 
 .activity-item
   margin-bottom: 15px
-  &.SEND_MESSAGE
+  &.TEXT_MESSAGE
     .chat-meta
       font-size: 13px
       .timestamp
diff --git a/server/src/socket.js b/server/src/socket.js
index 4fc9c3c..1c7db12 100644
--- a/server/src/socket.js
+++ b/server/src/socket.js
@@ -75,11 +75,11 @@ export default class Socket {
   }
 
   async handleSocket(socket) {
-    socket.on('PAYLOAD', (payload) => {
-      socket.to(this._roomId).emit('PAYLOAD', payload);
+    socket.on('ENCRYPTED_MESSAGE', (payload) => {
+      socket.to(this._roomId).emit('ENCRYPTED_MESSAGE', payload);
     });
 
-    socket.on('USER_ENTER', async payload => {
+    socket.on('USER_ENTER', async (payload) => {
       let room = await this.fetchRoom()
       if (_.isEmpty(room)) {
         room = {
@@ -99,10 +99,8 @@ export default class Socket {
         }]
       }
       await this.saveRoom(newRoom)
-      getIO().to(this._roomId).emit('USER_ENTER', newRoom.users.map(u => ({
-        publicKey: u.publicKey,
-        isOwner: u.isOwner,
-      })));
+
+      getIO().to(this._roomId).emit('USER_ENTER', newRoom);
     })
 
     socket.on('TOGGLE_LOCK_ROOM', async (data, callback) => {