Move `converse-oauth` to the `community-plugins` repo
This commit is contained in:
JC Brand
parent
0cfe2a18af
commit
45e989f048
|
|
@ -7,6 +7,7 @@
|
|||
- Show roster contacts with `subscription` set to `none`
|
||||
- Remove the `converse-carbons` plugin and make carbons part of the `converse-chat` plugin.
|
||||
- Remove the `message_carbons` configuration setting. Carbons are now always enabled.
|
||||
- Move the `converse-oauth` plugin to the [community-plugins](https://github.com/conversejs/community-plugins)
|
||||
- #2936: Fix documentation about enable_smacks option, which is true by default.
|
||||
|
||||
## 9.1.1 (2022-05-05)
|
||||
|
|
|
|||
|
|
@ -5,27 +5,6 @@
|
|||
@import "shared/styles/_mixins.scss";
|
||||
|
||||
.conversejs {
|
||||
.oauth-providers {
|
||||
text-align: center;
|
||||
.oauth-provider {
|
||||
margin: 1em 0;
|
||||
|
||||
.oauth-login {
|
||||
margin-left: 0;
|
||||
color: var(--link-color);
|
||||
font-size: var(--font-size-large);
|
||||
&:hover {
|
||||
color: var(--link-hover-color);
|
||||
}
|
||||
i {
|
||||
color: var(--link-color);
|
||||
font-size: var(--font-size-huge);
|
||||
margin-right: 0.5em;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.set-xmpp-status,
|
||||
.xmpp-status {
|
||||
.chat-status--online {
|
||||
|
|
|
|||
|
|
@ -1,130 +0,0 @@
|
|||
/**
|
||||
* @module converse-oauth
|
||||
* @copyright 2022, the Converse.js contributors
|
||||
* @license Mozilla Public License (MPLv2)
|
||||
*/
|
||||
import { Collection } from "@converse/skeletor/src/collection";
|
||||
import { View } from '@converse/skeletor/src/view.js';
|
||||
import { Model } from '@converse/skeletor/src/model.js';
|
||||
import { converse } from "@converse/headless/core";
|
||||
import hello from "hellojs";
|
||||
import tpl_oauth_providers from "../templates/oauth_providers.js";
|
||||
|
||||
|
||||
// The following line registers your plugin.
|
||||
converse.plugins.add("converse-oauth", {
|
||||
|
||||
/* Optional dependencies are other plugins which might be
|
||||
* overridden or relied upon, and therefore need to be loaded before
|
||||
* this plugin. They are called "optional" because they might not be
|
||||
* available, in which case any overrides applicable to them will be
|
||||
* ignored.
|
||||
*
|
||||
* NB: These plugins need to have already been loaded via require.js.
|
||||
*
|
||||
* It's possible to make optional dependencies non-optional.
|
||||
* If the setting "strict_plugin_dependencies" is set to true,
|
||||
* an error will be raised if the plugin is not found.
|
||||
*/
|
||||
'optional_dependencies': ['converse-register'],
|
||||
|
||||
/* If you want to override some function or a Model or
|
||||
* View defined elsewhere in converse.js, then you do that under
|
||||
* the "overrides" namespace.
|
||||
*/
|
||||
'overrides': {
|
||||
/* For example, the private *_converse* object has a
|
||||
* method "onConnected". You can override that method as follows:
|
||||
*/
|
||||
LoginPanel: {
|
||||
|
||||
insertOAuthProviders () {
|
||||
const { _converse } = this.__super__;
|
||||
if (this.oauth_providers_view === undefined) {
|
||||
this.oauth_providers_view =
|
||||
new _converse.OAuthProvidersView({'model': _converse.oauth_providers});
|
||||
|
||||
this.oauth_providers_view.render();
|
||||
this.el.querySelector('.buttons').insertAdjacentElement(
|
||||
'afterend',
|
||||
this.oauth_providers_view.el
|
||||
);
|
||||
}
|
||||
this.oauth_providers_view.render();
|
||||
},
|
||||
|
||||
render () {
|
||||
const { _converse } = this.__super__;
|
||||
const { api } = _converse;
|
||||
const result = this.__super__.render.apply(this, arguments);
|
||||
if (_converse.oauth_providers && !api.settings.get("auto_login")) {
|
||||
this.insertOAuthProviders();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
initialize () {
|
||||
/* The initialize function gets called as soon as the plugin is
|
||||
* loaded by converse.js's plugin machinery.
|
||||
*/
|
||||
const { _converse } = this;
|
||||
const { api } = _converse;
|
||||
const { __ } = _converse;
|
||||
|
||||
api.settings.extend({
|
||||
'oauth_providers': [],
|
||||
});
|
||||
|
||||
_converse.OAuthProviders = Collection.extend({
|
||||
'sync': function sync () {},
|
||||
|
||||
initialize () {
|
||||
api.settings.get('oauth_providers').forEach(provider => {
|
||||
const item = new Model(Object.assign(provider, {
|
||||
'login_text': __('Log in with %1$s', provider.name)
|
||||
}));
|
||||
this.add(item, {'silent': true});
|
||||
});
|
||||
}
|
||||
});
|
||||
_converse.oauth_providers = new _converse.OAuthProviders();
|
||||
|
||||
|
||||
_converse.OAuthProvidersView = View.extend({
|
||||
toHTML () {
|
||||
return tpl_oauth_providers(
|
||||
Object.assign({
|
||||
'providers': this.model.toJSON(),
|
||||
'oauthLogin': ev => this.oauthLogin(ev)
|
||||
}));
|
||||
},
|
||||
|
||||
async fetchOAuthProfileDataAndLogin () {
|
||||
const profile = await this.oauth_service.api('me');
|
||||
const response = this.oauth_service.getAuthResponse();
|
||||
api.user.login(
|
||||
`${profile.name}@${this.provider.get('host')}`,
|
||||
response.access_token
|
||||
);
|
||||
},
|
||||
|
||||
async oauthLogin (ev) {
|
||||
ev.preventDefault();
|
||||
const id = ev.target.getAttribute('data-id');
|
||||
this.provider = _converse.oauth_providers.get(id);
|
||||
this.oauth_service = hello(id);
|
||||
|
||||
const data = {};
|
||||
data[id] = this.provider.get('client_id');
|
||||
hello.init(data, {
|
||||
'redirect_uri': '/redirect.html'
|
||||
});
|
||||
|
||||
await this.oauth_service.login();
|
||||
this.fetchOAuthProfileDataAndLogin();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
import { html } from "lit";
|
||||
|
||||
const tpl_provider = (o, provider) => html`
|
||||
<p class="oauth-provider">
|
||||
<a @click=${o.oauthLogin} class="oauth-login" data-id="${provider.id}">
|
||||
<i class="fa ${provider.class}"></i>${provider.login_text}
|
||||
</a>
|
||||
</p>
|
||||
`;
|
||||
|
||||
export default (o) => html`
|
||||
<fieldset class="oauth-providers">
|
||||
${ o.providers.map(provider => tpl_provider(o, provider)) }
|
||||
</fieldset>
|
||||
`;
|
||||
Loading…
Reference in New Issue