aux
/
mx-puppet-xmpp
mirror of https://github.com/plantroon/mx-puppet-xmpp.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/spaced-password' of https://github.com/tchapi/mx-puppet-skype

This commit is contained in:
Sorunome 2021-02-06 22:09:49 +01:00
parent c57093f69b 297f87c55d
commit d627758dd6
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.ts
View File

@ -238,7 +238,7 @@ export class Client extends EventEmitter {
} }
const cookieJar = new toughCookie.CookieJar(this.api.context.cookies); const cookieJar = new toughCookie.CookieJar(this.api.context.cookies);
return await Util.DownloadFile(url, { return await Util.DownloadFile(url, {
responseType: "buffer", responseType: "buffer",
headers: { headers: {
Authorization: "skypetoken=" + this.api.context.skypeToken.value, Authorization: "skypetoken=" + this.api.context.skypeToken.value,
RegistrationToken: this.api.context.registrationToken.raw, RegistrationToken: this.api.context.registrationToken.raw,

7
src/index.ts
View File

@ -46,7 +46,7 @@ if (options.help) {
console.log(commandLineUsage([ console.log(commandLineUsage([
{ {
header: "Matrix Skype Puppet Bridge", header: "Matrix Skype Puppet Bridge",
content: "A matrix puppet bridge for skype", content: "A matrix puppet bridge for Skype",
}, },
{ {
header: "Options", header: "Options",
@ -117,7 +117,8 @@ async function run() {
const retData = { const retData = {
success: false, success: false,
} as IRetData; } as IRetData;
const [username, password] = str.split(" "); const TOKENS_TO_EXTRACT = 2;
const [username, password] = str.split(/ (.+)/, TOKENS_TO_EXTRACT);
const data: any = { const data: any = {
username, username,
password, password,
@ -128,7 +129,7 @@ async function run() {
data.state = client.getState; data.state = client.getState;
await client.disconnect(); await client.disconnect();
} catch (err) { } catch (err) {
log.verbose("Failed to log in as new user, perhaps the password is worng?"); log.verbose("Failed to log in as new user, perhaps the password is wrong?");
log.silly(err); log.silly(err);
retData.error = "Username or password wrong"; retData.error = "Username or password wrong";
return retData; return retData;