godzil/crunchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly use the config info for API endpoint informations.

Browse Source
This commit is contained in:
Godzil
2018-08-01 00:49:49 +01:00
parent 22f70c86f5
commit da3a51991c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/my_request.ts
View File

@@ -38,14 +38,14 @@ function startSession(config: IConfig): Promise<string>
return rp(
{
method: 'GET',
url: 'CR_SESSION_URL',
url: config.crSessionUrl,
qs:
{
device_id: generateDeviceId(),
device_type: 'CR_DEVICE_TYPE',
access_token: 'CR_SESSION_KEY',
version: 'CR_API_VERSION',
locale: 'CR_LOCALE',
device_id: config.crDeviceId,
device_type: config.crDeviceType,
access_token: config.crSessionKey,
version: config.crAPIVersion,
locale: config.crLocale,
},
json: true,
})
@@ -55,18 +55,18 @@ function startSession(config: IConfig): Promise<string>
});
}
function login(sessionId: string, user: string, pass: string): Promise<any>
function login(config: IConfig, sessionId: string, user: string, pass: string): Promise<any>
{
return rp(
{
method: 'POST',
url: 'CR_LOGIN_URL',
url: config.crLoginUrl,
form:
{
account: user,
password: pass,
session_id: sessionId,
version: 'CR_API_VERSION',
version: config.crAPIVersion,
},
json: true,
jar: j,
@@ -168,11 +168,11 @@ function authenticate(config: IConfig, done: (err: Error) => void)
process.exit(-1);
}
startSession()
startSession(config)
.then((sessionId: string) =>
{
defaultHeaders.Cookie = `sess_id=${sessionId}; c_locale=enUS`;
return login(sessionId, config.user, config.pass);
return login(config, sessionId, config.user, config.pass);
})
.then((userData) =>
{