From d3e278660dc52a4193b3efd1a2bf84fc64aaa68b Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 14 Sep 2024 19:08:44 +0000
Subject: [PATCH] api-client/session: pull URL from client

---
 packages/api-client/src/internal/session.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/api-client/src/internal/session.ts b/packages/api-client/src/internal/session.ts
index 7a709701..96219aee 100644
--- a/packages/api-client/src/internal/session.ts
+++ b/packages/api-client/src/internal/session.ts
@@ -1,29 +1,32 @@
 import { CobaltSession, CobaltResponseType, CobaltSessionResponse } from "../types/response";
 import { CobaltReachabilityError } from "../types/errors";
 import type { TurnstileObject } from "turnstile-types";
+import { CobaltAPIClient } from "../types/interface";
 
 const currentTime = () => Math.floor(new Date().getTime() / 1000);
 const EXPIRY_THRESHOLD_SECONDS = 2;
 
 export default class CobaltSessionHandler {
-    #baseURL: string;
+    #client: CobaltAPIClient;
     #turnstile: TurnstileObject;
     #session: CobaltSession | undefined;
 
-    constructor(baseURL: string, turnstile: TurnstileObject) {
-        this.#baseURL = baseURL;
+    constructor(client: CobaltAPIClient, turnstile: TurnstileObject) {
+        this.#client = client;
         this.#turnstile = turnstile;
     }
 
     async #requestSession(): Promise<CobaltSessionResponse> {
-        const endpoint = new URL('/session', this.#baseURL);
+        const baseURL = this.#client.getBaseURL();
+        if (!baseURL) throw "baseURL is undefined";
 
+        const endpoint = new URL('/session', baseURL);
         const response = await fetch(endpoint, {
             method: 'POST',
             redirect: 'manual',
             signal: AbortSignal.timeout(10000),
             headers: {
-                'cf-turnstile-response': this.#turnstile.getResponse('turnstile-widget')
+                'cf-turnstile-response': this.#turnstile.getResponse('#turnstile-widget')
             }
         })
         .then(r => r.json())
@@ -46,7 +49,7 @@ export default class CobaltSessionHandler {
             }
         }
 
-        this.#turnstile.reset('turnstile-widget');
+        this.#turnstile.reset('#turnstile-widget');
 
         return response;
     }
@@ -55,6 +58,10 @@ export default class CobaltSessionHandler {
         return this.#session && this.#session.exp - EXPIRY_THRESHOLD_SECONDS > currentTime();
     }
 
+    reset() {
+        this.#session = undefined;
+    }
+
     async getSession(): Promise<CobaltSessionResponse> {
         if (this.hasSession()) {
             return this.#session!;