github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-27 03:58:02 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for formatting and broken rebase

Browse source 
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-04-25 18:06:22 +02:00
parent 6d2a70210a
commit c164746cae
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib/web/auth/ldap/index.ts
View file

@ -3,10 +3,10 @@ import passport from 'passport'
import LDAPStrategy from 'passport-ldapauth' import LDAPStrategy from 'passport-ldapauth'
import { config } from '../../../config' import { config } from '../../../config'
import { User } from '../../../models'
import { logger } from '../../../logger'
import { urlencodedParser } from '../../utils'
import { errors } from '../../../errors' import { errors } from '../../../errors'
import { logger } from '../../../logger'
import { User } from '../../../models'
import { urlencodedParser } from '../../utils'
import { AuthMiddleware } from '../interface' import { AuthMiddleware } from '../interface'
export const LdapMiddleware: AuthMiddleware = { export const LdapMiddleware: AuthMiddleware = {
@ -22,7 +22,7 @@ export const LdapMiddleware: AuthMiddleware = {
searchFilter: config.ldap.searchFilter || null, searchFilter: config.ldap.searchFilter || null,
searchAttributes: config.ldap.searchAttributes || null, searchAttributes: config.ldap.searchAttributes || null,
tlsOptions: config.ldap.tlsOptions || null, tlsOptions: config.ldap.tlsOptions || null,
starttls: config.ldap.starttls || null starttls: config.ldap.starttls || null
} }
}, function (user, done) { }, function (user, done) {
let uuid = user.uidNumber || user.uid || user.sAMAccountName || undefined let uuid = user.uidNumber || user.uid || user.sAMAccountName || undefined