diff --git a/client/src/channels/CUD.js b/client/src/channels/CUD.js index 3d5fae17..21fcdf8e 100644 --- a/client/src/channels/CUD.js +++ b/client/src/channels/CUD.js @@ -255,7 +255,7 @@ export default class CUD extends Component { componentDidMount() { const t = this.props.t; - if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageChannels) { + if (!mailtrainConfig.globalPermissions.manageChannels) { this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageChannels'); } if (this.props.entity) { diff --git a/client/src/channels/List.js b/client/src/channels/List.js index 2b5a32be..3d3a8ad6 100644 --- a/client/src/channels/List.js +++ b/client/src/channels/List.js @@ -34,7 +34,7 @@ export default class List extends Component { componentDidMount() { const t = this.props.t; - if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageChannels) { + if (!mailtrainConfig.globalPermissions.manageChannels) { this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageChannels'); } } diff --git a/client/src/lists/CUD.js b/client/src/lists/CUD.js index e187349f..bc651622 100644 --- a/client/src/lists/CUD.js +++ b/client/src/lists/CUD.js @@ -75,7 +75,7 @@ export default class CUD extends Component { componentDidMount() { const t = this.props.t; - if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { + if (!mailtrainConfig.globalPermissions.manageLists) { this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); } if (this.props.entity) { diff --git a/client/src/lists/List.js b/client/src/lists/List.js index 78fa55e1..511b6fe6 100644 --- a/client/src/lists/List.js +++ b/client/src/lists/List.js @@ -29,7 +29,7 @@ export default class List extends Component { componentDidMount() { const t = this.props.t; - if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { + if (!mailtrainConfig.globalPermissions.manageLists) { this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); } } diff --git a/client/src/lists/subscriptions/CUD.js b/client/src/lists/subscriptions/CUD.js index 56f20ead..df20ed37 100644 --- a/client/src/lists/subscriptions/CUD.js +++ b/client/src/lists/subscriptions/CUD.js @@ -91,7 +91,7 @@ export default class CUD extends Component { componentDidMount() { const t = this.props.t; - if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { + if (!mailtrainConfig.globalPermissions.manageLists) { this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); } diff --git a/client/src/lists/subscriptions/List.js b/client/src/lists/subscriptions/List.js index db5d784f..3c154173 100644 --- a/client/src/lists/subscriptions/List.js +++ b/client/src/lists/subscriptions/List.js @@ -60,7 +60,7 @@ export default class List extends Component { componentDidMount() { const t = this.props.t; - if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { + if (!mailtrainConfig.globalPermissions.manageLists) { this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); } this.populateFormValues({ diff --git a/client/src/root.js b/client/src/root.js index e2a5fcd6..b51af63b 100644 --- a/client/src/root.js +++ b/client/src/root.js @@ -70,13 +70,12 @@ class Root extends Component { if (mailtrainConfig.isAuthenticated) { const gP = mailtrainConfig.globalPermissions; - const superadmin = mailtrainConfig.user.admin; for (const entryKey of topLevelMenuKeys) { const entry = topLevelItems[entryKey.toLowerCase()]; const link = entry.link || entry.externalLink; - if (superadmin || gP["manage"+entryKey]) { + if (gP["manage"+entryKey]) { if (link && path.startsWith(link)) { topLevelMenu.push({entry.title} {t('current')}); } else { @@ -89,20 +88,20 @@ class Root extends Component { <> diff --git a/server/lib/client-helpers.js b/server/lib/client-helpers.js index f0e8d57b..2e61b332 100644 --- a/server/lib/client-helpers.js +++ b/server/lib/client-helpers.js @@ -40,8 +40,7 @@ async function getAuthenticatedConfig(context) { user: { id: context.user.id, username: context.user.username, - namespace: context.user.namespace, - admin: (config.roles.global[context.user.role]["admin"] || false) + namespace: context.user.namespace }, globalPermissions, editors: config.editors,