Skip to content

C
converse.js
Commit 6126781d authored by JC Brand's avatar JC Brand
Browse files
Options

Proper checking of disco support for push notifications

parent 6cd9d2e8
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 50 deletions
dist/converse.js
View file @ 6126781d
...@@ -73337,7 +73337,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -73337,7 +73337,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
const _converse$env = converse.env, const _converse$env = converse.env,
Strophe = _converse$env.Strophe, Strophe = _converse$env.Strophe,
$iq = _converse$env.$iq; $iq = _converse$env.$iq,
_ = _converse$env._;
Strophe.addNamespace('PUSH', 'urn:xmpp:push:0'); Strophe.addNamespace('PUSH', 'urn:xmpp:push:0');
converse.plugins.add('converse-push', { converse.plugins.add('converse-push', {
initialize() { initialize() {
...@@ -73359,32 +73360,42 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -73359,32 +73360,42 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
} }
if (_converse.push_service && _converse.push_service_node) { if (_converse.push_service && _converse.push_service_node) {
Promise.all([_converse.api.disco.getIdentity('pubsub', 'push', _converse.push_service), _converse.api.disco.supports(Strophe.NS.PUSH, _converse.push_service)]).then(() => _converse.api.disco.supports(Strophe.NS.PUSH, _converse.bare_jid)).then(() => { _converse.api.disco.getIdentity('pubsub', 'push', _converse.push_service).then(identity => {
const stanza = $iq({ if (!identity) {
'type': 'set' return _converse.log(`Not enabling push the service "${_converse.push_service}", it doesn't have the right disco identtiy.`, Strophe.LogLevel.WARN);
}).c('enable', {
'xmlns': Strophe.NS.PUSH,
'jid': _converse.push_service,
'node': _converse.push_service_node
});
if (_converse.push_service_secret) {
stanza.c('x', {
'xmlns': Strophe.NS.XFORM,
'type': 'submit'
}).c('field', {
'var': 'FORM_TYPE'
}).c('value').t(`${Strophe.NS.PUBSUB}#publish-options`).up().up().c('field', {
'var': 'secret'
}).c('value').t(_converse.push_service_secret);
} }
_converse.api.sendIQ(stanza).then(() => _converse.session.set('push_enabled', true)).catch(e => { return Promise.all([_converse.api.disco.supports(Strophe.NS.PUSH, _converse.push_service), _converse.api.disco.supports(Strophe.NS.PUSH, _converse.bare_jid)]).then(result => {
_converse.log(`Could not enable push service for ${_converse.push_service}`, Strophe.LogLevel.ERROR); if (!result[0].length && !result[1].length) {
return _converse.log(`Not enabling push service "${_converse.push_service}", no disco support`, Strophe.LogLevel.WARN);
}
_converse.log(e, Strophe.LogLevel.ERROR); const stanza = $iq({
}); 'type': 'set'
}); }).c('enable', {
'xmlns': Strophe.NS.PUSH,
'jid': _converse.push_service,
'node': _converse.push_service_node
});
if (_converse.push_service_secret) {
stanza.c('x', {
'xmlns': Strophe.NS.XFORM,
'type': 'submit'
}).c('field', {
'var': 'FORM_TYPE'
}).c('value').t(`${Strophe.NS.PUBSUB}#publish-options`).up().up().c('field', {
'var': 'secret'
}).c('value').t(_converse.push_service_secret);
}
_converse.api.sendIQ(stanza).then(() => _converse.session.set('push_enabled', true)).catch(e => {
_converse.log(`Could not enable push service for ${_converse.push_service}`, Strophe.LogLevel.ERROR);
_converse.log(e, Strophe.LogLevel.ERROR);
});
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
} }
} }
src/converse-push.js
View file @ 6126781d
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
define(["converse-core"], factory); define(["converse-core"], factory);
}(this, function (converse) { }(this, function (converse) {
"use strict"; "use strict";
const { Strophe, $iq } = converse.env; const { Strophe, $iq, _ } = converse.env;
Strophe.addNamespace('PUSH', 'urn:xmpp:push:0'); Strophe.addNamespace('PUSH', 'urn:xmpp:push:0');
...@@ -37,31 +37,45 @@ ...@@ -37,31 +37,45 @@
return; return;
} }
if (_converse.push_service && _converse.push_service_node) { if (_converse.push_service && _converse.push_service_node) {
Promise.all([ _converse.api.disco.getIdentity('pubsub', 'push', _converse.push_service)
_converse.api.disco.getIdentity('pubsub', 'push', _converse.push_service), .then((identity) => {
_converse.api.disco.supports(Strophe.NS.PUSH, _converse.push_service) if (!identity) {
]).then(() => _converse.api.disco.supports(Strophe.NS.PUSH, _converse.bare_jid)) return _converse.log(
.then(() => { `Not enabling push the service "${_converse.push_service}", it doesn't have the right disco identtiy.`,
const stanza = $iq({'type': 'set'}) Strophe.LogLevel.WARN
.c('enable', { );
'xmlns': Strophe.NS.PUSH, }
'jid': _converse.push_service, return Promise.all([
'node': _converse.push_service_node _converse.api.disco.supports(Strophe.NS.PUSH, _converse.push_service),
}); _converse.api.disco.supports(Strophe.NS.PUSH, _converse.bare_jid)
if (_converse.push_service_secret) { ]).then((result) => {
stanza.c('x', {'xmlns': Strophe.NS.XFORM, 'type': 'submit'}) if (!result[0].length && !result[1].length) {
.c('field', {'var': 'FORM_TYPE'}) return _converse.log(
.c('value').t(`${Strophe.NS.PUBSUB}#publish-options`).up().up() `Not enabling push service "${_converse.push_service}", no disco support`,
.c('field', {'var': 'secret'}) Strophe.LogLevel.WARN
.c('value').t(_converse.push_service_secret); );
} }
_converse.api.sendIQ(stanza) const stanza = $iq({'type': 'set'})
.then(() => _converse.session.set('push_enabled', true)) .c('enable', {
.catch((e) => { 'xmlns': Strophe.NS.PUSH,
_converse.log(`Could not enable push service for ${_converse.push_service}`, Strophe.LogLevel.ERROR); 'jid': _converse.push_service,
_converse.log(e, Strophe.LogLevel.ERROR); 'node': _converse.push_service_node
}); });
}); if (_converse.push_service_secret) {
stanza.c('x', {'xmlns': Strophe.NS.XFORM, 'type': 'submit'})
.c('field', {'var': 'FORM_TYPE'})
.c('value').t(`${Strophe.NS.PUBSUB}#publish-options`).up().up()
.c('field', {'var': 'secret'})
.c('value').t(_converse.push_service_secret);
}
_converse.api.sendIQ(stanza)
.then(() => _converse.session.set('push_enabled', true))
.catch((e) => {
_converse.log(`Could not enable push service for ${_converse.push_service}`, Strophe.LogLevel.ERROR);
_converse.log(e, Strophe.LogLevel.ERROR);
});
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
} }
} }
_converse.api.listen.on('statusInitialized', enablePush); _converse.api.listen.on('statusInitialized', enablePush);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7