anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Open new connection to send filled-in registration form

Browse source 
fixes #644
This commit is contained in:
fiaxh 2019-11-18 16:55:36 +01:00
parent 05561dd677
commit fcce176b91
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libdino/src/service/registration.vala
View file

@ -104,7 +104,6 @@ public class Register : StreamInteractionModule, Object{
stream.add_module(new Xep.SrvRecordsTls.Module()); stream.add_module(new Xep.SrvRecordsTls.Module());
stream.add_module(new Xep.InBandRegistration.Module()); stream.add_module(new Xep.InBandRegistration.Module());
Xep.InBandRegistration.Form? form = null;
SourceFunc callback = get_registration_form.callback; SourceFunc callback = get_registration_form.callback;
stream.stream_negotiated.connect(() => { stream.stream_negotiated.connect(() => {
@ -125,14 +124,50 @@ public class Register : StreamInteractionModule, Object{
}); });
yield; yield;
Xep.InBandRegistration.Form? form = null;
if (stream.negotiation_complete) { if (stream.negotiation_complete) {
form = yield stream.get_module(Xep.InBandRegistration.Module.IDENTITY).get_from_server(stream, jid); form = yield stream.get_module(Xep.InBandRegistration.Module.IDENTITY).get_from_server(stream, jid);
} }
try {
stream.disconnect();
} catch (Error e) {}
return form; return form;
} }
public static async string submit_form(Jid jid, Xep.InBandRegistration.Form form) { public static async string? submit_form(Jid jid, Xep.InBandRegistration.Form form) {
return yield form.stream.get_module(Xep.InBandRegistration.Module.IDENTITY).submit_to_server(form.stream, jid, form); XmppStream stream = new XmppStream();
stream.log = new XmppLog(jid.to_string(), Application.print_xmpp);
stream.add_module(new Tls.Module());
stream.add_module(new Iq.Module());
stream.add_module(new Xep.SrvRecordsTls.Module());
stream.add_module(new Xep.InBandRegistration.Module());
SourceFunc callback = submit_form.callback;
stream.stream_negotiated.connect(() => {
if (callback != null) {
Idle.add((owned)callback);
}
});
stream.connect.begin(jid.domainpart, (_, res) => {
try {
stream.connect.end(res);
} catch (Error e) {
debug("Error connecting to stream: %s", e.message);
}
if (callback != null) {
Idle.add((owned)callback);
}
});
yield;
if (stream.negotiation_complete) {
return yield stream.get_module(Xep.InBandRegistration.Module.IDENTITY).submit_to_server(stream, jid, form);
}
return null;
} }
} }

2
xmpp-vala/src/module/xep/0077_in_band_registration.vala
View file

@ -20,7 +20,7 @@ public class Module : XmppStreamNegotiationModule {
return form; return form;
} }
public async string submit_to_server(XmppStream stream, Jid jid, Form form) { public async string? submit_to_server(XmppStream stream, Jid jid, Form form) {
StanzaNode query_node = new StanzaNode.build("query", NS_URI).add_self_xmlns(); StanzaNode query_node = new StanzaNode.build("query", NS_URI).add_self_xmlns();
query_node.put_node(form.get_submit_node()); query_node.put_node(form.get_submit_node());
Iq.Stanza iq = new Iq.Stanza.set(query_node); Iq.Stanza iq = new Iq.Stanza.set(query_node);