fixed some error. Now this plugin are working
This commit is contained in:
parent
11a8f0db3a
commit
3dd4c01e0d
2 changed files with 18 additions and 13 deletions
29
main.js
29
main.js
|
@ -16,7 +16,13 @@ async function register ({
|
||||||
private: true
|
private: true
|
||||||
})
|
})
|
||||||
|
|
||||||
|
registerSetting({
|
||||||
|
name: 'mail',
|
||||||
|
label: 'Mail',
|
||||||
|
type: 'input',
|
||||||
|
descriptionHTML: 'mail domain for each matrix user',
|
||||||
|
private: true
|
||||||
|
})
|
||||||
|
|
||||||
registerIdAndPassAuth({
|
registerIdAndPassAuth({
|
||||||
authName: 'matrix',
|
authName: 'matrix',
|
||||||
|
@ -24,7 +30,6 @@ async function register ({
|
||||||
login: options => login(peertubeHelpers, settingsManager, options)
|
login: options => login(peertubeHelpers, settingsManager, options)
|
||||||
})
|
})
|
||||||
|
|
||||||
setWeight(500)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +47,7 @@ async function login (peertubeHelpers, settingsManager, options) {
|
||||||
|
|
||||||
const settings = await settingsManager.getSettings([
|
const settings = await settingsManager.getSettings([
|
||||||
'url',
|
'url',
|
||||||
|
'mail'
|
||||||
])
|
])
|
||||||
// options.id, options.password
|
// options.id, options.password
|
||||||
|
|
||||||
|
@ -60,20 +66,19 @@ async function login (peertubeHelpers, settingsManager, options) {
|
||||||
initial_display_name: "PeerTube"
|
initial_display_name: "PeerTube"
|
||||||
})}).then(f => f.json())
|
})}).then(f => f.json())
|
||||||
if(r.access_token){
|
if(r.access_token){
|
||||||
const r2 = fetch(`https://${settings.url}/_matrix/client/v3/logout`, {
|
const r2 = await fetch(`https://${settings.url}/_matrix/client/v3/logout`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: r.access_token
|
Authorization: `Bearer ${r.access_token}`
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if(r2.statusCode == 200){
|
if(r2.status == 200){
|
||||||
return res(
|
return {
|
||||||
options.id,
|
username: options.id,
|
||||||
`${options.id}@0ut0f.space`
|
email: `${options.id}@${settings.mail}`
|
||||||
)
|
}
|
||||||
|
}else{
|
||||||
|
logger.warn(`Logout of session failed with code ${r2.status}: ${await r2.text()}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "peertube-plugin-auth-matrix",
|
"name": "peertube-plugin-auth-matrix",
|
||||||
"version": "0.0.14",
|
"version": "0.0.17",
|
||||||
"description": "Add Matrix support to login form in PeerTube.",
|
"description": "Add Matrix support to login form in PeerTube.",
|
||||||
"engine": {
|
"engine": {
|
||||||
"peertube": ">=2.2.0"
|
"peertube": ">=2.2.0"
|
||||||
|
|
Loading…
Reference in a new issue