cazagen/octoprint-ldap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8 from compunautics/patch-1

Browse Source 
Allow user lookup by apikey
This commit is contained in:
Guillaume GILL 2019-02-09 23:53:30 +01:00 committed by GitHub
commit 0c5c0eb510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octoprint_auth_ldap/__init__.py
View File

@ -50,8 +50,8 @@ class LDAPUserManager(FilebasedUserManager,
if FilebasedUserManager.findUser(self, username) is not None: if FilebasedUserManager.findUser(self, username) is not None:
return FilebasedUserManager.changeUserPassword(self, username, password) return FilebasedUserManager.changeUserPassword(self, username, password)
def findUser(self, userid=None, session=None): def findUser(self, userid=None, apikey=None, session=None):
local_user = FilebasedUserManager.findUser(self, userid, session) local_user = FilebasedUserManager.findUser(self, userid, apikey, session)
#If user not exists in local database, search it on LDAP #If user not exists in local database, search it on LDAP
if userid and not local_user: if userid and not local_user:
if(self.findLDAPUser(userid)): if(self.findLDAPUser(userid)):