erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SàT: plugin 0077 & 0100: fixed profile management

Browse source
This commit is contained in:
Goffi 2010-08-12 12:30:36 +08:00
commit 546a114cde
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/plugin_xep_0077.py
View file

@ -50,9 +50,9 @@ class XEP_0077():
host.bridge.addMethod("in_band_register", ".communication", in_sign='ss', out_sign='s', method=self.in_band_register)
host.bridge.addMethod("in_band_submit", ".request", in_sign='sa(ss)', out_sign='s', method=self.in_band_submit)
def addTrigger(self, target, cb):
def addTrigger(self, target, cb, profile):
"""Add a callback which is called when registration to target is successful"""
self.triggers[target] = cb
self.triggers[target] = (cb, profile)
def reg_ok(self, answer):
"""Called after the first get IQ"""
@ -99,7 +99,8 @@ class XEP_0077():
answer_data={"message":_("Registration successfull")}
self.host.bridge.actionResult(answer_type, answer['id'], answer_data)
if self.triggers.has_key(answer["from"]):
self.triggers[answer["from"]](answer["from"])
callback,profile = self.triggers[answer["from"]]
callback(answer["from"], profile)
del self.triggers[answer["from"]]
def registrationFailure(self, failure):
@ -117,9 +118,9 @@ class XEP_0077():
if self.triggers.has_key(answer["from"]):
del self.triggers[answer["from"]]
def in_band_submit(self, action, target, fields):
def in_band_submit(self, action, target, fields, profile):
"""Submit a form for registration, using data_form"""
id, deferred = self.host.submitForm(action, target, fields)
id, deferred = self.host.submitForm(action, target, fields, profile)
if action == 'CANCEL':
deferred.addCallbacks(self.unregistrationAnswer, self.unregistrationFailure)
else:

16
plugins/plugin_xep_0100.py
View file

@ -44,7 +44,7 @@ class XEP_0100():
self.host = host
self.__gateways = {} #dict used to construct the answer to findGateways. Key = target jid
host.bridge.addMethod("findGateways", ".communication", in_sign='ss', out_sign='s', method=self.findGateways)
host.bridge.addMethod("gatewayRegister", ".request", in_sign='ssa(ss)', out_sign='s', method=self.gatewayRegister)
host.bridge.addMethod("gatewayRegister", ".request", in_sign='ssa(ss)s', out_sign='s', method=self.gatewayRegister)
def __inc_handled_items(self, request_id):
self.__gateways[request_id]['__handled_items']+=1
@ -97,17 +97,19 @@ class XEP_0100():
self.host.bridge.actionResult("ERROR", request_id, message_data)
def registrationSuccessful(self, target):
def registrationSuccessful(self, target, profile):
"""Called when in_band registration is ok, we must now follow the rest of procedure"""
debug (_("Registration successful, doing the rest"))
self.host.addContact(target)
self.host.setPresence(target)
self.host.addContact(target, profile)
self.host.setPresence(target, profile)
def gatewayRegister(self, action, target, fields):
def gatewayRegister(self, action, target, fields, profile_key='@DEFAULT@'):
"""Register gateway using in-band registration, then log-in to gateway"""
profile = self.host.memory.getProfileName(profile_key)
assert(profile) #FIXME: return an error here
if action == 'SUBMIT':
self.host.plugins["XEP_0077"].addTrigger(target, self.registrationSuccessful)
return self.host.plugins["XEP_0077"].in_band_submit(action, target, fields)
self.host.plugins["XEP_0077"].addTrigger(target, self.registrationSuccessful, profile)
return self.host.plugins["XEP_0077"].in_band_submit(action, target, fields, profile)
def findGateways(self, target, profile_key='@DEFAULT@'):
"""Find gateways in the target JID, using discovery protocol