From 28235478041ad3f38fcecc5ebbcf236e2530e018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sarstr=C3=B6m?= Date: Thu, 9 Sep 2021 08:32:13 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Moved=20topologykey=20to?= =?UTF-8?q?=20config,=20also=20added=20getHeader()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.json | 3 ++- lib/api.ts | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/config.json b/config.json index 22d4f5d7..0a5ba0e1 100644 --- a/config.json +++ b/config.json @@ -12,7 +12,8 @@ "sec-fetch-mode": "cors", "sec-fetch-site": "same-site", "x-xsrf-token": "SfONpuvKXD1XHML3Kelvm3easB6Xn3xtbVPG52jdpc3Q7sRxJv7_6wfjo1qS3NOQWkfCvfPkJpJg0QIBmo358o7FdQY2aWvUOxA9MU2Fl0E1", - "y-xsrf-token11": "FyXUbtZUE2iT09J7FOLTpfZ_onjbj3WEIO6jOY9B1KaZzMrAs4WS03AuWbQhmKyCEX2inTPVDzyPc58tN2EM4L1vYD6aH_zhlc7gVo9jaPdLKQc4qnE6ue184cSamKE0" + "y-xsrf-token11": "FyXUbtZUE2iT09J7FOLTpfZ_onjbj3WEIO6jOY9B1KaZzMrAs4WS03AuWbQhmKyCEX2inTPVDzyPc58tN2EM4L1vYD6aH_zhlc7gVo9jaPdLKQc4qnE6ue184cSamKE0", + "topology-key": "make talk identify inside rubber title fold physical clump member pond divide hood churn put brief swap ride paddle solve enjoy home sound basket|" }, "referrer": "https://etjanst.stockholm.se/", "referrerPolicy": "strict-origin-when-cross-origin", diff --git a/lib/api.ts b/lib/api.ts index ae31e0ce..00a51865 100644 --- a/lib/api.ts +++ b/lib/api.ts @@ -113,6 +113,10 @@ export class Api extends EventEmitter { this.headers[name] = value } + private getHeader(name: string): void { + return this.headers[name] + } + public async login(personalNumber?: string): Promise { if (personalNumber !== undefined && personalNumber.endsWith('1212121212')) return this.fakeMode() @@ -305,13 +309,12 @@ export class Api extends EventEmitter { return parse.user(data) } - private static getTopology(): string { + private getTopology(): string { const currentTime = new Date().getTime() + 600000 - let topo = 'make talk identify inside rubber title fold physical clump member pond divide hood' + - ` churn put brief swap ride paddle solve enjoy home sound basket|${ currentTime}` - + let topo = `${this.getHeader('topology-key')}${currentTime}` + const secretNumberString = 'hijklmnopqrstuvwxyz' const numberOfBase64Iterations = 9 @@ -340,7 +343,7 @@ export class Api extends EventEmitter { headers: { Accept: 'application/json;odata=verbose', // Auth: token, - topology: Api.getTopology(), + topology: this.getTopology(), Host: 'etjanst.stockholm.se', Referer: 'https://etjanst.stockholm.se/vardnadshavare/inloggad2/hem', },