MM-11158: fix subpath logout (mattermost#1409)

Fall back to window.basename instead of window.location.origin, to ensure the subpath is reflected on logout.
jespino · Jul 6, 2018 · a35b9bd · a35b9bd
1 parent eb7857b
commit a35b9bd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/selectors/general.js b/selectors/general.js
@@ -17,5 +17,9 @@ export function areTimezonesEnabledAndSupported(state) {
 export function getBasePath(state) {
  const config = getConfig(state) || {};
 
- return new URL(config.SiteURL || window.location.origin).pathname;
+ if (config.SiteURL) {
+ return new URL(config.SiteURL).pathname;
+ }
+
+ return window.basename || window.location.origin;
 }