Skip to content

Commit d102a07

Browse files
hardillbSteve-Mcl
andauthored
Apply suggestions from code review
Co-authored-by: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
1 parent 162c053 commit d102a07

3 files changed

Lines changed: 3 additions & 28 deletions

File tree

docs/admin/sso/ldap.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ can modify their user details to their preferred values.
7575

7676
LDAP implementations can also be used to group users
7777

78-
To enable tis option, select the `Manage roles using group assertions` in the SSO configuration.
78+
To enable this option, select the `Manage roles using group assertions` in the SSO configuration.
7979

8080
The following configuration options should then be set:
8181

@@ -114,7 +114,7 @@ be done with care.
114114

115115
## Managing Admin users
116116

117-
The SSO Configuration can be configured to managed the admin users of the platform by enabling the
117+
The SSO Configuration can be configured to manage the admin users of the platform by enabling the
118118
`Manage Admin roles using group assertions` option. Once enabled, the name of a group can be provided
119119
that will be used to identify whether a user is an admin or not.
120120

forge/ee/lib/sso/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,7 @@ module.exports.init = async function (app) {
431431
// LDAP Group Membership
432432
async function updateTeamMembershipLDAP (adminClient, user, userDN, providerOpts) {
433433
const filter = `(|(uniqueMember=${userDN})(member=${userDN}))`
434-
// const { searchEntries } = await adminClient.search(providerOpts.options.groupsDN, {
435-
const { searchEntries } = await adminClient.search('ou=groups,dc=hardill,dc=me,dc=uk', {
434+
const { searchEntries } = await adminClient.search(providerOpts.options.groupsDN, {
436435
filter,
437436
attributes: ['cn']
438437
})

frontend/src/pages/admin/Settings/SSO/createEditProvider.vue

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,30 +93,6 @@
9393
<div v-if="input.options.tls" class="pl-4 space-y-6">
9494
<FormRow v-model="input.options.tlsVerifyServer" type="checkbox">Verify Server Certificate</FormRow>
9595
</div>
96-
<!-- <FormRow v-model="input.options.groupMapping" type="checkbox">Manage roles using group membership</FormRow>
97-
<div v-if="input.options.groupMapping" class="pl-4 space-y-6">
98-
<FormRow v-model="input.options.groupsDN" :error="groupsDNError">
99-
Group Base DN
100-
<template #description>The name of the base object to search for groups</template>
101-
</FormRow>
102-
<FormRow v-model="input.options.groupAllTeams" :options="[{ value:true, label: 'Apply to all teams' }, { value:false, label: 'Apply to selected teams' }]">
103-
Team Scope
104-
<template #description>Should this apply to all teams on the platform, or just a restricted list of teams</template>
105-
</FormRow>
106-
<FormRow v-if="input.options.groupAllTeams === false" v-model="input.options.groupTeams" class="pl-4">
107-
<template #description>A list of team <b>slugs</b> that will managed by this configuration - one per line</template>
108-
<template #input><textarea v-model="input.options.groupTeams" class="font-mono w-full" rows="6" /></template>
109-
</FormRow>
110-
<FormRow v-if="input.options.groupAllTeams === false" v-model="input.options.groupOtherTeams" type="checkbox" class="pl-4">
111-
Allow users to be in other teams
112-
<template #description>
113-
If enabled, users can be members of any teams not listed above and their membership/roles are not managed
114-
by this SSO configuration.
115-
</template>
116-
</FormRow>
117-
<FormRow v-model="input.options.groupAdmin" type="checkbox">Manage Admin roles using group assertions</FormRow>
118-
<FormRow v-if="input.options.groupAdmin" v-model="input.options.groupAdminName" :error="groupAdminNameError" class="pl-4">Admin Users SAML Group name</FormRow>
119-
</div> -->
12096
</template>
12197
<FormRow v-model="input.options.groupMapping" type="checkbox">Manage roles using group assertions</FormRow>
12298
<div v-if="input.options.groupMapping" class="pl-4 space-y-6">

0 commit comments

Comments
 (0)