From 264c25cfe0977e309f79bbaa8bef091c13f4521e Mon Sep 17 00:00:00 2001 From: sauls8t Date: Tue, 25 Jun 2019 17:05:25 +0100 Subject: [PATCH] Prevent space user invitation for non-Documize auth providers If running LDAP or Keycloak authentication, you cannot bypass user sync process to invite new users. Closes #284 --- .../components/folder/settings-permissions.js | 3 ++- .../components/folder/settings-permissions.hbs | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gui/app/components/folder/settings-permissions.js b/gui/app/components/folder/settings-permissions.js index 041791d5..22939bf4 100644 --- a/gui/app/components/folder/settings-permissions.js +++ b/gui/app/components/folder/settings-permissions.js @@ -16,10 +16,11 @@ import { debounce } from '@ember/runloop'; import { computed } from '@ember/object'; import Notifier from '../../mixins/notifier'; import Modals from '../../mixins/modal'; +import AuthProvider from '../../mixins/auth'; import stringUtil from '../../utils/string'; import Component from '@ember/component'; -export default Component.extend(Notifier, Modals, { +export default Component.extend(Notifier, Modals, AuthProvider, { groupSvc: service('group'), spaceSvc: service('folder'), userSvc: service('user'), diff --git a/gui/app/templates/components/folder/settings-permissions.hbs b/gui/app/templates/components/folder/settings-permissions.hbs index b9429cd7..209998b8 100644 --- a/gui/app/templates/components/folder/settings-permissions.hbs +++ b/gui/app/templates/components/folder/settings-permissions.hbs @@ -8,9 +8,9 @@
Space Permissions Explained {{#if showSpacePermExplain}} - + {{else}} - + {{/if}}
@@ -27,9 +27,9 @@
Document Permissions Explained {{#if showDocumentPermExplain}} - + {{else}} - + {{/if}}
@@ -61,10 +61,12 @@ {{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Person label="Add Existing User" onClick=(action "onShowAddModal")}} - {{ui/ui-button-gap}} - {{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Plus - label="Invite New User" - onClick=(action "onShowInviteModal")}} + {{#if isAuthProviderDocumize}} + {{ui/ui-button-gap}} + {{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Plus + label="Invite New User" + onClick=(action "onShowInviteModal")}} + {{/if}}