Improved the new permissions version checking (#445)

mattermost · Mar 28, 2018 · 8e13189 · 8e13189
1 parent 8f89bb7
commit 8e13189
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/selectors/entities/general.js b/src/selectors/entities/general.js
@@ -27,7 +27,9 @@ export function hasNewPermissions(state) {
  const version = state.entities.general.serverVersion;
 
  // FIXME This must be changed to 4, 9, 0 before we generate the 4.9.0 release
- return isMinimumServerVersion(version, 4, 9, 0) || (version.indexOf('dev') !== -1 && isMinimumServerVersion(version, 4, 8, 0));
+ return isMinimumServerVersion(version, 4, 9, 0) ||
+ (version.indexOf('dev') !== -1 && isMinimumServerVersion(version, 4, 8, 0)) ||
+ (version.match(/^4.8.0.\d\d\d\d.*$/) !== null && isMinimumServerVersion(version, 4, 8, 0));
 }
 
 export const canUploadFilesOnMobile = createSelector(

diff --git a/test/selectors/general.test.js b/test/selectors/general.test.js
@@ -263,6 +263,10 @@ describe('Selectors.General', () => {
  assert.equal(Selectors.hasNewPermissions(state), false);
  state.entities.general.serverVersion = '4.8.0.dev.123123';
  assert.equal(Selectors.hasNewPermissions(state), true);
+ state.entities.general.serverVersion = '4.8.0.4.8.1.ffffff';
+ assert.equal(Selectors.hasNewPermissions(state), false);
+ state.entities.general.serverVersion = '4.8.0.3607.2f31498e967dc08ed38d7a2d7a306825.true';
+ assert.equal(Selectors.hasNewPermissions(state), true);
  state.entities.general.serverVersion = '4.9.0';
  assert.equal(Selectors.hasNewPermissions(state), true);
  state.entities.general.serverVersion = '4.10.0';