MM-21290: Checks for license AND config prior to overriding user's di… (

#1024) * MM-21290: Checks for license AND config prior to overriding user's display name account setting. * MM-21290: Adds license to mock.
mattermost · Dec 27, 2019 · b1535aa · b1535aa
1 parent bf8facc
commit b1535aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/selectors/entities/users.test.js b/src/selectors/entities/users.test.js
@@ -447,7 +447,10 @@ describe('Selectors.Users', () => {
  config: {
  TeammateNameDisplay: General.TEAMMATE_NAME_DISPLAY.SHOW_USERNAME, 
  LockTeammateNameDisplay: 'false', 
- }
+ },
+ license: {
+ LockTeammateNameDisplay: 'true',
+ },
  },
  },
  };

diff --git a/src/selectors/entities/users.ts b/src/selectors/entities/users.ts
@@ -490,8 +490,9 @@ export function makeGetDisplayName(): (a: GlobalState, b: $ID<UserProfile>, c: b
  getTeammateNameDisplaySetting,
  (state, _, useFallbackUsername = true) => useFallbackUsername,
  getConfig,
- (user, teammateNameDisplaySetting, useFallbackUsername, config) => {
- const useAdminTemmateNameDisplaySetting = config.LockTeammateNameDisplay === 'true';
+ getLicense,
+ (user, teammateNameDisplaySetting, useFallbackUsername, config, license) => {
+ const useAdminTemmateNameDisplaySetting = license.LockTeammateNameDisplay === 'true' && config.LockTeammateNameDisplay === 'true';
  const adminTeammateNameDisplaySetting = config.TeammateNameDisplay;
  return displayUsername(user, teammateNameDisplaySetting!, useFallbackUsername, useAdminTemmateNameDisplaySetting, adminTeammateNameDisplaySetting);
  }