[MM-15379] Avoid possible reading of .name on undefined (#2778)

* Avoid possible reading of property on undefined

* Add unit test for handleSelectChannelByName

* Update mattermost-redux hash

app/actions/views/channel.js

@@ -394,7 +394,7 @@ export function handleSelectChannelByName(channelName, teamName) {
     return async (dispatch, getState) => {
         const state = getState();
         const {teams: currentTeams, currentTeamId} = state.entities.teams;
-        const currentTeamName = currentTeams[currentTeamId].name;
+        const currentTeamName = currentTeams[currentTeamId]?.name;
         const {data: channel} = await dispatch(getChannelByNameAndTeamName(teamName || currentTeamName, channelName));
         const currentChannelId = getCurrentChannelId(state);
         if (channel && currentChannelId !== channel.id) {

app/actions/views/channel.test.js

@@ -0,0 +1,96 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+
+import {handleSelectChannelByName} from 'app/actions/views/channel';
+
+jest.mock('mattermost-redux/selectors/entities/channels', () => ({
+    getChannel: () => ({data: 'received-channel-id'}),
+    getCurrentChannelId: () => 'current-channel-id',
+    getMyChannelMember: () => ({data: {member: {}}}),
+}));
+
+const mockStore = configureStore([thunk]);
+
+describe('Actions.Views.Channel', () => {
+    let store;
+
+    const MOCK_SELECT_CHANNEL_TYPE = 'MOCK_SELECT_CHANNEL_TYPE';
+    const MOCK_RECEIVE_CHANNEL_TYPE = 'MOCK_RECEIVE_CHANNEL_TYPE';
+
+    const actions = require('mattermost-redux/actions/channels');
+    actions.getChannelByNameAndTeamName = jest.fn((teamName) => {
+        if (teamName) {
+            return {
+                type: MOCK_RECEIVE_CHANNEL_TYPE,
+                data: 'received-channel-id',
+            };
+        }
+
+        return {
+            type: 'MOCK_ERROR',
+            error: 'error',
+        };
+    });
+    actions.selectChannel = jest.fn().mockReturnValue({
+        type: MOCK_SELECT_CHANNEL_TYPE,
+        data: 'selected-channel-id',
+    });
+
+    const currentUserId = 'current-user-id';
+    const currentChannelId = 'channel-id';
+    const currentChannelName = 'channel-name';
+    const currentTeamId = 'current-team-id';
+    const currentTeamName = 'current-team-name';
+    const storeObj = {
+        entities: {
+            users: {
+                currentUserId,
+            },
+            channels: {
+                currentChannelId,
+            },
+            teams: {
+                teams: {
+                    currentTeamId,
+                    currentTeams: {
+                        [currentTeamId]: {
+                            name: currentTeamName,
+                        },
+                    },
+                },
+            },
+        },
+    };
+
+    test('handleSelectChannelByName success', async () => {
+        store = mockStore(storeObj);
+
+        await store.dispatch(handleSelectChannelByName(currentChannelName, currentTeamName));
+
+        const storeActions = store.getActions();
+        const receivedChannel = storeActions.some((action) => action.type === MOCK_RECEIVE_CHANNEL_TYPE);
+        expect(receivedChannel).toBe(true);
+
+        const storeBatchActions = storeActions.filter(({type}) => type === 'BATCHING_REDUCER.BATCH');
+        const selectedChannel = storeBatchActions[0].payload.some((action) => action.type === MOCK_SELECT_CHANNEL_TYPE);
+        expect(selectedChannel).toBe(true);
+    });
+
+    test('handleSelectChannelByName failure from null currentTeamName', async () => {
+        const failStoreObj = {...storeObj};
+        failStoreObj.entities.teams.teams.currentTeamId = 'not-in-current-teams';
+        store = mockStore(storeObj);
+
+        await store.dispatch(handleSelectChannelByName(currentChannelName, null));
+
+        const storeActions = store.getActions();
+        const receivedChannel = storeActions.some((action) => action.type === MOCK_RECEIVE_CHANNEL_TYPE);
+        expect(receivedChannel).toBe(false);
+
+        const storeBatchActions = storeActions.some(({type}) => type === 'BATCHING_REDUCER.BATCH');
+        expect(storeBatchActions).toBe(false);
+    });
+});

package.json

@@ -18,8 +18,8 @@
     "intl": "1.2.5",
     "jail-monkey": "2.0.0",
     "jsc-android": "236355.1.1",
-    "mattermost-redux": "github:mattermost/mattermost-redux#ea818389dc3d27a5dc9f0f7588928febc773c4d6",
-    "mime-db": "1.38.0",
+    "mattermost-redux": "github:mattermost/mattermost-redux#a1c4fb58badd34cd9c382f90ada7eaa996e43773",
+    "mime-db": "1.40.0",
     "moment-timezone": "0.5.23",
     "prop-types": "15.7.2",
     "react": "16.8.2",