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

Allow user lookup by apikey

Browse Source 
This plugin breaks the GCode Viewer as is. When using this plugin and accessing the GCode Viewer, one gets this error in the log:

TypeError: findUser() got an unexpected keyword argument 'apikey'

This commit ensures that the findUser function knows how to handle the 'apikey' parameter from ~/octoprint/server/util/__init__.py if submitted.
This commit is contained in:
Compunautics 2019-02-09 13:50:48 -06:00 committed by GitHub
parent d750a796ae
commit ef92234e65
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)):