jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow for more credential values to be user specified instead of auto-filled.

Browse Source
This commit is contained in:
Lance Stout 2012-11-27 19:53:04 -05:00
parent 7a1ed64985
commit 2c2498b658
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sleekxmpp/features/feature_mechanisms/mechanisms.py
View File

@ -92,11 +92,7 @@ class FeatureMechanisms(BasePlugin):
values = required_values.union(optional_values) values = required_values.union(optional_values)
for value in values: for value in values:
if value == 'username': if value == 'username':
result[value] = self.xmpp.requested_jid.user result[value] = creds.get('username', self.xmpp.requested_jid.user)
elif value == 'password':
result[value] = creds['password']
elif value == 'authzid':
result[value] = creds.get('authzid', '')
elif value == 'email': elif value == 'email':
jid = self.xmpp.requested_jid.bare jid = self.xmpp.requested_jid.bare
result[value] = creds.get('email', jid) result[value] = creds.get('email', jid)
@ -106,13 +102,13 @@ class FeatureMechanisms(BasePlugin):
else: else:
result[value] = None result[value] = None
elif value == 'host': elif value == 'host':
result[value] = self.xmpp.requested_jid.domain result[value] = creds.get('host', self.xmpp.requested_jid.domain)
elif value == 'realm': elif value == 'realm':
result[value] = self.xmpp.requested_jid.domain result[value] = creds.get('realm', self.xmpp.requested_jid.domain)
elif value == 'service-name': elif value == 'service-name':
result[value] = self.xmpp._service_name result[value] = creds.get('service-name', self.xmpp._service_name)
elif value == 'service': elif value == 'service':
result[value] = 'xmpp' result[value] = creds.get('service', 'xmpp')
elif value in creds: elif value in creds:
result[value] = creds[value] result[value] = creds[value]
return result return result