public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove admin/superadmin tests

Browse source
This commit is contained in:
joker-x 2020-09-01 14:25:35 +02:00
parent 6af4c0db9e
commit 14ec6d468a
8 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/channels/CUD.js
View file

@ -255,7 +255,7 @@ export default class CUD extends Component {
componentDidMount() { componentDidMount() {
const t = this.props.t; const t = this.props.t;
if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageChannels) { if (!mailtrainConfig.globalPermissions.manageChannels) {
this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageChannels'); this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageChannels');
} }
if (this.props.entity) { if (this.props.entity) {

2
client/src/channels/List.js
View file

@ -34,7 +34,7 @@ export default class List extends Component {
componentDidMount() { componentDidMount() {
const t = this.props.t; const t = this.props.t;
if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageChannels) { if (!mailtrainConfig.globalPermissions.manageChannels) {
this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageChannels'); this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageChannels');
} }
} }

2
client/src/lists/CUD.js
View file

@ -75,7 +75,7 @@ export default class CUD extends Component {
componentDidMount() { componentDidMount() {
const t = this.props.t; const t = this.props.t;
if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { if (!mailtrainConfig.globalPermissions.manageLists) {
this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists');
} }
if (this.props.entity) { if (this.props.entity) {

2
client/src/lists/List.js
View file

@ -29,7 +29,7 @@ export default class List extends Component {
componentDidMount() { componentDidMount() {
const t = this.props.t; const t = this.props.t;
if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { if (!mailtrainConfig.globalPermissions.manageLists) {
this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists');
} }
} }

2
client/src/lists/subscriptions/CUD.js
View file

@ -91,7 +91,7 @@ export default class CUD extends Component {
componentDidMount() { componentDidMount() {
const t = this.props.t; const t = this.props.t;
if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { if (!mailtrainConfig.globalPermissions.manageLists) {
this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists');
} }

2
client/src/lists/subscriptions/List.js
View file

@ -60,7 +60,7 @@ export default class List extends Component {
componentDidMount() { componentDidMount() {
const t = this.props.t; const t = this.props.t;
if (!mailtrainConfig.user.admin && !mailtrainConfig.globalPermissions.manageLists) { if (!mailtrainConfig.globalPermissions.manageLists) {
this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists'); this.navigateToWithFlashMessage('/', 'danger', t('permissionDenied')+': manageLists');
} }
this.populateFormValues({ this.populateFormValues({

17
client/src/root.js
View file

@ -70,13 +70,12 @@ class Root extends Component {
if (mailtrainConfig.isAuthenticated) { if (mailtrainConfig.isAuthenticated) {
const gP = mailtrainConfig.globalPermissions; const gP = mailtrainConfig.globalPermissions;
const superadmin = mailtrainConfig.user.admin;
for (const entryKey of topLevelMenuKeys) { for (const entryKey of topLevelMenuKeys) {
const entry = topLevelItems[entryKey.toLowerCase()]; const entry = topLevelItems[entryKey.toLowerCase()];
const link = entry.link || entry.externalLink; const link = entry.link || entry.externalLink;
if (superadmin || gP["manage"+entryKey]) { if (gP["manage"+entryKey]) {
if (link && path.startsWith(link)) { if (link && path.startsWith(link)) {
topLevelMenu.push(<NavLink key={entryKey.toLowerCase()} className="active" to={link}>{entry.title} <span className="sr-only">{t('current')}</span></NavLink>); topLevelMenu.push(<NavLink key={entryKey.toLowerCase()} className="active" to={link}>{entry.title} <span className="sr-only">{t('current')}</span></NavLink>);
} else { } else {
@ -89,20 +88,20 @@ class Root extends Component {
<> <>
<ul className="navbar-nav mt-navbar-nav-left"> <ul className="navbar-nav mt-navbar-nav-left">
{topLevelMenu} {topLevelMenu}
{(superadmin || gP.manageUsers || gP.manageNamespaces || gP.manageSettings || {(gP.manageUsers || gP.manageNamespaces || gP.manageSettings ||
gP.manageSendConfigurations || gP.manageBlacklist || gP.manageApi) && gP.manageSendConfigurations || gP.manageBlacklist || gP.manageApi) &&
<NavDropdown label={t('administration')}> <NavDropdown label={t('administration')}>
{(superadmin || gP.manageUsers) && {(gP.manageUsers) &&
<DropdownLink to="/users">{t('users')}</DropdownLink>} <DropdownLink to="/users">{t('users')}</DropdownLink>}
{(superadmin || gP.manageNamespaces) && {(gP.manageNamespaces) &&
<DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>} <DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>}
{(superadmin || gP.manageSettings) && {(gP.manageSettings) &&
<DropdownLink to="/settings">{t('globalSettings')}</DropdownLink>} <DropdownLink to="/settings">{t('globalSettings')}</DropdownLink>}
{(superadmin || gP.manageSendConfigurations) && {(gP.manageSendConfigurations) &&
<DropdownLink to="/send-configurations">{t('sendConfigurations')}</DropdownLink>} <DropdownLink to="/send-configurations">{t('sendConfigurations')}</DropdownLink>}
{(superadmin || gP.manageBlacklist) && {(gP.manageBlacklist) &&
<DropdownLink to="/blacklist">{t('blacklist')}</DropdownLink>} <DropdownLink to="/blacklist">{t('blacklist')}</DropdownLink>}
{(superadmin || gP.manageApi) && {(gP.manageApi) &&
<DropdownLink to="/account/api">{t('api')}</DropdownLink>} <DropdownLink to="/account/api">{t('api')}</DropdownLink>}
</NavDropdown>} </NavDropdown>}
</ul> </ul>

3
server/lib/client-helpers.js
View file

@ -40,8 +40,7 @@ async function getAuthenticatedConfig(context) {
user: { user: {
id: context.user.id, id: context.user.id,
username: context.user.username, username: context.user.username,
namespace: context.user.namespace, namespace: context.user.namespace
admin: (config.roles.global[context.user.role]["admin"] || false)
}, },
globalPermissions, globalPermissions,
editors: config.editors, editors: config.editors,