Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

European login update #241

Merged
merged 10 commits into from
Apr 7, 2023
Merged

European login update #241

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5211b4b
european login: don't follow url.
jacs-zbc Apr 7, 2023
ad50c48
don't need logger
jacs-zbc Apr 7, 2023
b5b6120
removed userId check in authResult url
jacs-zbc Apr 7, 2023
c8c922b
Merge branch 'master' into HEAD
jacs-zbc Apr 7, 2023
f02ad56
removed userId check in authResult url
jacs-zbc Apr 7, 2023
ff17544
Merge branch 'master' of https://github.com/chubby1968/bluelinky
jacs-zbc Apr 7, 2023
e72cdd2
format
jacs-zbc Apr 7, 2023
6e98c77
format
jacs-zbc Apr 7, 2023
86fbc11
format
jacs-zbc Apr 7, 2023
96e7626
format
jacs-zbc Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/controllers/authStrategies/european.brandAuth.strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { CookieJar } from 'tough-cookie';
import { EULanguages, EuropeanBrandEnvironment } from '../../constants/europe';
import { AuthStrategy, Code, initSession } from './authStrategy';
import Url, { URLSearchParams } from 'url';
import logger from '../../logger';

const stdHeaders = {
'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_1 like Mac OS X) AppleWebKit/604.3.5 (KHTML, like Gecko) Version/11.0 Mobile/15B92 Safari/604.1'
Expand Down Expand Up @@ -56,6 +55,7 @@ export class EuropeanBrandAuthStrategy implements AuthStrategy {
'Content-Type': 'application/x-www-form-urlencoded',
...stdHeaders
},
followRedirect: false,
}));
if(!redirectTo) {
const errorMessage = /<span class="kc-feedback-text">(.+)<\/span>/gm.exec(afterAuthForm);
Expand Down Expand Up @@ -108,19 +108,10 @@ export class EuropeanBrandAuthStrategy implements AuthStrategy {
url = authResult.url;
htmlPage = authResult.body;
}
const { intUserId: appUser } = Url.parse(url, true).query;
if (!appUser) {
logger.warn('@EuropeanBrandAuthStrategy.login: Cannot find the argument userId, please use the following url and connect from a browser.');
logger.warn(this.environment.endpoints.session);
throw new Error(`@EuropeanBrandAuthStrategy.login: Cannot find the argument userId in ${url}.
Please use the following url and connect from a browser, it may probably ask you to "Change your password" or "Accept the new conditions"
Once done, try again.
${this.environment.endpoints.session}`);
}
const { body, statusCode } = await got.post(this.environment.endpoints.silentSignIn, {
cookieJar,
body: {
intUserId: appUser
intUserId: ''
},
json: true,
headers: {
Expand Down