Skip to content

fix: get all Set-Cookie headers to support both cookies #47

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

Closed
adaclaw wants to merge 1 commit into from
Closed

fix: get all Set-Cookie headers to support both cookies #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/core/baseClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export abstract class BaseClient {
const requestOptions = {
...fetchOptions,
headers: {
Cookie: this?.authCookies?.join(";") ?? [],
Cookie: this?.authCookies?.join("; ") ?? [],
Authorization: `Basic ${this.sessionId}`,
"User-Agent":
"classcharts-api https://github.com/classchartsapi/classcharts-api-js",
Expand Down
20 changes: 16 additions & 4 deletions src/core/parentClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,23 @@ export class ParentClient extends BaseClient {
);
}

const cookies = String(response.headers.get("set-cookie"));
// this.authCookies = cookies.split(";");
const sessionCookies = parseCookies(cookies);
// Get ALL Set-Cookie headers (get() only returns the first one!)
const setCookieHeaders = response.headers.getSetCookie();
if (!setCookieHeaders || setCookieHeaders.length < 2) {
await response.body?.cancel();
throw new Error("Unauthenticated: Missing Set-Cookie headers");
}

// Parse both cookies
const cookie1 = parseCookies(setCookieHeaders[0]);
const cookie2 = parseCookies(setCookieHeaders[1]);

// Store only the name=value portion of each Set-Cookie header
this.authCookies = setCookieHeaders.map((h) => h.split(";")[0].trim());

// Get session ID from parent_session_credentials cookie
const sessionID = JSON.parse(
String(sessionCookies.parent_session_credentials),
String(cookie1.parent_session_credentials || cookie2.parent_session_credentials),
);
this.sessionId = sessionID.session_id;
this.pupils = await this.getPupils();
Expand Down