macbid-ts-api 0.1.4 → 1.0.0-beta.0

package/MacBid.d.ts

@@ -3,7 +3,11 @@ export interface AuthInfo {
     email?: string;
     password?: string;
     token?: string;
+    token_expiration?: Date;
     user_id?: string;
+    refresh_token?: string;
+    refresh_token_expiration?: Date;
+    validation_code?: string;
 }
 export interface WatchlistFull {
     auction_lot_id: number;
@@ -70,8 +74,28 @@ export declare class MacBid {
     private check_auth;
     /**
      * Do the login request
+     * @param email - User email
+     * @param password - User password
+     * @param validation_code - Optional validation code. If not provided, will check auth_info.validation_code
      */
-    login: (email: string, password: string) => Promise<boolean>;
+    login: (email: string, password: string, validation_code?: string) => Promise<boolean>;
+    get_refresh_token_expiration: () => Date;
+    /**
+     * Check if the access token is expired or about to expire (within 5 minutes)
+     */
+    private isTokenExpired;
+    /**
+     * Check if the refresh token is expired
+     */
+    private isRefreshTokenExpired;
+    /**
+     * Refresh the access token using the refresh token
+     */
+    refreshToken: () => Promise<boolean>;
+    /**
+     * Ensure the access token is valid, refreshing if necessary
+     */
+    private ensureValidToken;
     /**
      * Returns the logged in user's favorites, and all of their (visible) attributes.
      */

package/MacBid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MacBid.d.ts","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,WAAW,QAAQ;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,IAAI,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,IAAI,CAAC;IAClB,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,mBAAmB,EAAE,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,IAAI,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,IAAI,CAAC;IAC1B,cAAc,EAAE,IAAI,CAAC;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,aAAa,CAAC;IAC9B,QAAQ,EAAE,IAAI,GAAG,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,WAAW,CAAC;CAC3B;AAED,oBAAY,WAAW;IACrB,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,oBAAY,aAAa;IACvB,OAAO,YAAY;IACnB,OAAO,aAAa;IACpB,OAAO,aAAa;CACrB;AAED,MAAM,WAAW,iBAAkB,SAAQ,QAAQ;IACjD,IAAI,EAAE,MAAM,OAAO,CAAC;QAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC,CAAC;CACJ;AAED,qBAAa,MAAM;IACV,cAAc,SAAyB;IACvC,QAAQ,SAAiC;IAEhD,OAAO,CAAC,sBAAsB,CAK5B;IACF,OAAO,CAAC,SAAS,CAAW;gBAEhB,SAAS,EAAE,QAAQ;IAKxB,YAAY,sBAajB;IAEK,GAAG,SAAgB,MAAM,KAAG,QAAQ,iBAAiB,CAAC,CAGlC;IAEpB,IAAI,SACH,MAAM,YACF,WAAW,KACpB,QAAQ,iBAAiB,CAAC,CAOF;IAE3B;;OAEG;IACH,OAAO,CAAC,UAAU,CAKhB;IAEF;;OAEG;IACI,KAAK,UAAiB,MAAM,YAAY,MAAM,KAAG,QAAQ,OAAO,CAAC,CA2BtE;IAEF;;OAEG;IACI,aAAa,QAAa,QAAQ,aAAa,EAAE,CAAC,CAOvD;CACH;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"MacBid.d.ts","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"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"}

package/MacBid.js

@@ -15,8 +15,6 @@ export class MacBid {
     API_ROOT = "https://api.macdiscount.com";
     macbid_session_headers = {
         "Content-Type": "application/json",
-        Origin: "https://mac.bid",
-        "User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0",
     };
     auth_info;
     constructor(auth_info) {
@@ -39,16 +37,25 @@ export class MacBid {
             }
         }
     };
-    get = async (path) => (await fetch(this.API_ROOT + path, {
-        headers: this.macbid_session_headers,
-    }));
-    post = async (path, options) => (await fetch(this.API_ROOT + path, {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        headers: this.macbid_session_headers,
-        method: "POST",
-        ...options,
-    }));
+    get = async (path) => {
+        await this.ensureValidToken();
+        return (await fetch(this.API_ROOT + path, {
+            headers: this.macbid_session_headers,
+        }));
+    };
+    post = async (path, options) => {
+        // Don't refresh token for auth endpoints
+        if (!path.includes("/auth/")) {
+            await this.ensureValidToken();
+        }
+        return (await fetch(this.API_ROOT + path, {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            headers: this.macbid_session_headers,
+            method: "POST",
+            ...options,
+        }));
+    };
     /**
      * Raise an exception if an endpoint requiring login is called without valid auth
      */
@@ -60,28 +67,147 @@ export class MacBid {
     };
     /**
      * Do the login request
+     * @param email - User email
+     * @param password - User password
+     * @param validation_code - Optional validation code. If not provided, will check auth_info.validation_code
      */
-    login = async (email, password) => {
+    login = async (email, password, validation_code) => {
         const login_params = {
+            device_id: crypto.randomUUID(),
             email: email,
             password: password,
+            ref_code: null,
+            ref_r: null,
+            remember_me: true,
+            utm_campaign: null,
+            utm_medium: null,
+            utm_source: null,
         };
-        const res = await this.post("/token", {
+        // https://api.macdiscount.com/auth/auth-validation
+        const res = await this.post("/auth/auth-validation", {
             body: JSON.stringify(login_params),
         });
-        console.log(login_params);
-        console.log(res);
         const resJson = await res.json();
-        const token = resJson["token"];
-        const user_id = resJson["user_id"];
-        if (token) {
-            this.auth_info.token = token;
-            this.auth_info.user_id = user_id;
+        if (resJson["message"] === "Login validation code sent") {
+            // Get validation code from parameter, auth_info, or throw error
+            const code = validation_code ||
+                this.auth_info.validation_code ||
+                process.env.MACBID_VALIDATION_CODE;
+            if (!code) {
+                throw new Error("Validation code required. Provide it via:\n" +
+                    "  1. login() method parameter: login(email, password, validation_code)\n" +
+                    "  2. AuthInfo.validation_code when creating MacBid instance\n" +
+                    "  3. MACBID_VALIDATION_CODE environment variable");
+            }
+            const validation_params = {
+                code: code,
+                device_id: login_params.device_id,
+                new_password: "",
+                remember_me: true,
+            };
+            const validation_res = await this.post("/auth/validate-access-code", {
+                body: JSON.stringify(validation_params),
+            });
+            const validation_resJson = await validation_res.json();
+            const access_token = validation_resJson["access_token"];
+            const refresh_token = validation_resJson["refresh_token"];
+            const user_id = validation_resJson["user_id"];
+            const expires = validation_resJson["expires"];
+            const expiration_refresh = validation_resJson["expiration_refresh"];
+            if (access_token) {
+                this.auth_info.token = access_token;
+                this.auth_info.user_id = user_id;
+                this.macbid_session_headers["Authorization"] = this.auth_info.token;
+                this.auth_info.token_expiration = new Date(expires * 1000);
+                this.auth_info.refresh_token = refresh_token;
+                this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
+                return true;
+            }
+        }
+        console.error(JSON.stringify(resJson, null, 2));
+        throw new Error("Login failed");
+    };
+    get_refresh_token_expiration = () => {
+        if (this.auth_info.refresh_token_expiration) {
+            return this.auth_info.refresh_token_expiration;
+        }
+        else {
+            throw new Error("Refresh token expiration not set, make sure to login first.");
+        }
+    };
+    /**
+     * Check if the access token is expired or about to expire (within 5 minutes)
+     */
+    isTokenExpired = () => {
+        if (!this.auth_info.token_expiration) {
+            return true;
+        }
+        // Refresh if token expires within 5 minutes
+        const bufferTime = 5 * 60 * 1000; // 5 minutes in milliseconds
+        return Date.now() >= this.auth_info.token_expiration.getTime() - bufferTime;
+    };
+    /**
+     * Check if the refresh token is expired
+     */
+    isRefreshTokenExpired = () => {
+        if (!this.auth_info.refresh_token_expiration) {
+            return true;
+        }
+        return Date.now() >= this.auth_info.refresh_token_expiration.getTime();
+    };
+    /**
+     * Refresh the access token using the refresh token
+     */
+    refreshToken = async () => {
+        if (!this.auth_info.refresh_token) {
+            throw new Error("No refresh token available. Please login again.");
+        }
+        if (this.isRefreshTokenExpired()) {
+            throw new Error("Refresh token has expired. Please login again.");
+        }
+        const refresh_params = {
+            refresh_token: this.auth_info.refresh_token,
+        };
+        // Use fetch directly to avoid triggering ensureValidToken and use PUT method
+        const res = await fetch(this.API_ROOT + "/auth/refresh-token", {
+            method: "PUT",
+            body: JSON.stringify(refresh_params),
+            headers: {
+                "Content-Type": "application/json",
+            },
+        });
+        const resJson = (await res.json());
+        // Check for error response
+        if (resJson["error"]) {
+            throw new Error(`Failed to refresh token: ${resJson["error"]}`);
+        }
+        const access_token = resJson["access_token"];
+        const refresh_token = resJson["refresh_token"];
+        const expires = resJson["expires"];
+        const expiration_refresh = resJson["expiration_refresh"];
+        if (access_token) {
+            this.auth_info.token = access_token;
             this.macbid_session_headers["Authorization"] = this.auth_info.token;
+            this.auth_info.token_expiration = new Date(expires * 1000);
+            // Update refresh token if a new one is provided
+            if (refresh_token) {
+                this.auth_info.refresh_token = refresh_token;
+            }
+            if (expiration_refresh) {
+                this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
+            }
             return true;
         }
         else {
-            throw new Error("Login failed");
+            throw new Error("Failed to refresh token: no access token in response");
+        }
+    };
+    /**
+     * Ensure the access token is valid, refreshing if necessary
+     */
+    ensureValidToken = async () => {
+        if (this.isTokenExpired()) {
+            await this.refreshToken();
         }
     };
     /**

package/MacBid.js.map

@@ -1 +1 @@
-{"version":3,"file":"MacBid.js","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MacBid.js","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,YAAY,CAAC;AAkD7C,MAAM,CAAN,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,gCAAiB,CAAA;IACjB,oCAAqB,CAAA;AACvB,CAAC,EAHW,WAAW,KAAX,WAAW,QAGtB;AAED,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,qCAAoB,CAAA;IACpB,qCAAoB,CAAA;AACtB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB;AAQD,MAAM,OAAO,MAAM;IACV,cAAc,GAAG,qBAAqB,CAAC;IACvC,QAAQ,GAAG,6BAA6B,CAAC;IAExC,sBAAsB,GAA8B;QAC1D,cAAc,EAAE,kBAAkB;KACnC,CAAC;IACM,SAAS,CAAW;IAE5B,YAAY,SAAmB;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAEM,YAAY,GAAG,KAAK,IAAI,EAAE;QAC/B,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;gBACxB,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,SAAS;qBAC1D,KAAe,CAAC;aACpB;iBAAM;gBACL,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;oBACnD,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;iBACjE;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;iBACtC;aACF;SACF;IACH,CAAC,CAAC;IAEK,GAAG,GAAG,KAAK,EAAE,IAAY,EAA8B,EAAE;QAC9D,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,EAAE;YACxC,OAAO,EAAE,IAAI,CAAC,sBAAsB;SACrC,CAAC,CAAsB,CAAC;IAC3B,CAAC,CAAC;IAEK,IAAI,GAAG,KAAK,EACjB,IAAY,EACZ,OAAqB,EACO,EAAE;QAC9B,yCAAyC;QACzC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC5B,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;QACD,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,EAAE;YACxC,6DAA6D;YAC7D,aAAa;YACb,OAAO,EAAE,IAAI,CAAC,sBAAsB;YACpC,MAAM,EAAE,MAAM;YACd,GAAG,OAAO;SACX,CAAC,CAAsB,CAAC;IAC3B,CAAC,CAAC;IAEF;;OAEG;IACK,UAAU,GAAG,GAAY,EAAE;QACjC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,EAAE;YACjD,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF;;;;;OAKG;IACI,KAAK,GAAG,KAAK,EAClB,KAAa,EACb,QAAgB,EAChB,eAAwB,EACN,EAAE;QACpB,MAAM,YAAY,GAAG;YACnB,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE;YAC9B,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;SACjB,CAAC;QACF,mDAAmD;QACnD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE;YACnD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;SACnC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjC,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,4BAA4B,EAAE;YACvD,gEAAgE;YAChE,MAAM,IAAI,GACR,eAAe;gBACf,IAAI,CAAC,SAAS,CAAC,eAAe;gBAC9B,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;YAErC,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CACb,6CAA6C;oBAC3C,0EAA0E;oBAC1E,+DAA+D;oBAC/D,kDAAkD,CACrD,CAAC;aACH;YAED,MAAM,iBAAiB,GAAG;gBACxB,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,IAAI;aAClB,CAAC;YAEF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE;gBACnE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC;aACxC,CAAC,CAAC;YAEH,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;YAEvD,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAW,CAAC;YAClE,MAAM,aAAa,GAAG,kBAAkB,CAAC,eAAe,CAAW,CAAC;YACpE,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAW,CAAC;YACxD,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAW,CAAC;YACxD,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,oBAAoB,CAAW,CAAC;YAE9E,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,YAAsB,CAAC;gBAC9C,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,OAAiB,CAAC;gBAC3C,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;gBACpE,IAAI,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;gBAC3D,IAAI,CAAC,SAAS,CAAC,aAAa,GAAG,aAAa,CAAC;gBAC7C,IAAI,CAAC,SAAS,CAAC,wBAAwB,GAAG,IAAI,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;gBAC9E,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC,CAAC;IAEK,4BAA4B,GAAG,GAAS,EAAE;QAC/C,IAAI,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE;YAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC;SAChD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;SAChF;IACH,CAAC,CAAA;IAED;;OAEG;IACK,cAAc,GAAG,GAAY,EAAE;QACrC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE;YACpC,OAAO,IAAI,CAAC;SACb;QACD,4CAA4C;QAC5C,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,4BAA4B;QAC9D,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC;IAC9E,CAAC,CAAA;IAED;;OAEG;IACK,qBAAqB,GAAG,GAAY,EAAE;QAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE;YAC5C,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC;IACzE,CAAC,CAAA;IAED;;OAEG;IACI,YAAY,GAAG,KAAK,IAAsB,EAAE;QACjD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;SACpE;QAED,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QAED,MAAM,cAAc,GAAG;YACrB,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa;SAC5C,CAAC;QAEF,6EAA6E;QAC7E,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,qBAAqB,EAAE;YAC7D,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;YACpC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAMhC,CAAC;QAEF,2BAA2B;QAC3B,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SACjE;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAW,CAAC;QACvD,MAAM,aAAa,GAAG,OAAO,CAAC,eAAe,CAAuB,CAAC;QACrE,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAW,CAAC;QAC7C,MAAM,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAuB,CAAC;QAE/E,IAAI,YAAY,EAAE;YAChB,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,YAAY,CAAC;YACpC,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YACpE,IAAI,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;YAE3D,gDAAgD;YAChD,IAAI,aAAa,EAAE;gBACjB,IAAI,CAAC,SAAS,CAAC,aAAa,GAAG,aAAa,CAAC;aAC9C;YACD,IAAI,kBAAkB,EAAE;gBACtB,IAAI,CAAC,SAAS,CAAC,wBAAwB,GAAG,IAAI,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;aAC/E;YAED,OAAO,IAAI,CAAC;SACb;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;SACzE;IACH,CAAC,CAAA;IAED;;OAEG;IACK,gBAAgB,GAAG,KAAK,IAAmB,EAAE;QACnD,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;YACzB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;SAC3B;IACH,CAAC,CAAA;IAED;;OAEG;IACI,aAAa,GAAG,KAAK,IAA8B,EAAE;QAC1D,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CACxB,sBAAsB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,kBAAkB,CAClE,CAAC;QAEF,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,gBAAgB,CAAoB,CAAC;IACjE,CAAC,CAAC;CACH;AAED,eAAe,MAAM,CAAC"}

package/MacBid.ts

@@ -4,7 +4,11 @@ export interface AuthInfo {
   email?: string;
   password?: string;
   token?: string;
+  token_expiration?: Date;
   user_id?: string;
+  refresh_token?: string;
+  refresh_token_expiration?: Date;
+  validation_code?: string;
 }
 
 export interface WatchlistFull {
@@ -90,22 +94,29 @@ export class MacBid {
     }
   };
 
-  public get = async (path: string): Promise<MacBidApiResponse> =>
-    (await fetch(this.API_ROOT + path, {
+  public get = async (path: string): Promise<MacBidApiResponse> => {
+    await this.ensureValidToken();
+    return (await fetch(this.API_ROOT + path, {
       headers: this.macbid_session_headers,
     })) as MacBidApiResponse;
+  };
 
   public post = async (
     path: string,
     options?: RequestInit
-  ): Promise<MacBidApiResponse> =>
-    (await fetch(this.API_ROOT + path, {
+  ): Promise<MacBidApiResponse> => {
+    // Don't refresh token for auth endpoints
+    if (!path.includes("/auth/")) {
+      await this.ensureValidToken();
+    }
+    return (await fetch(this.API_ROOT + path, {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       headers: this.macbid_session_headers,
       method: "POST",
       ...options,
     })) as MacBidApiResponse;
+  };
 
   /**
    * Raise an exception if an endpoint requiring login is called without valid auth
@@ -119,31 +130,182 @@ export class MacBid {
 
   /**
    * Do the login request
+   * @param email - User email
+   * @param password - User password
+   * @param validation_code - Optional validation code. If not provided, will check auth_info.validation_code
    */
-  public login = async (email: string, password: string): Promise<boolean> => {
+  public login = async (
+    email: string,
+    password: string,
+    validation_code?: string
+  ): Promise<boolean> => {
     const login_params = {
+      device_id: crypto.randomUUID(), // TODO: keep this the same to persist sms validation?
       email: email,
       password: password,
+      ref_code: null,
+      ref_r: null,
+      remember_me: true,
+      utm_campaign: null,
+      utm_medium: null,
+      utm_source: null,
     };
-
-    const res = await this.post("/token", {
+    // https://api.macdiscount.com/auth/auth-validation
+    const res = await this.post("/auth/auth-validation", {
       body: JSON.stringify(login_params),
     });
 
     const resJson = await res.json();
-    const token = resJson["token"];
-    const user_id = resJson["user_id"];
 
-    if (token) {
-      this.auth_info.token = token as string;
-      this.auth_info.user_id = user_id as string;
+    if (resJson["message"] === "Login validation code sent") {
+      // Get validation code from parameter, auth_info, or throw error
+      const code =
+        validation_code ||
+        this.auth_info.validation_code ||
+        process.env.MACBID_VALIDATION_CODE;
+
+      if (!code) {
+        throw new Error(
+          "Validation code required. Provide it via:\n" +
+            "  1. login() method parameter: login(email, password, validation_code)\n" +
+            "  2. AuthInfo.validation_code when creating MacBid instance\n" +
+            "  3. MACBID_VALIDATION_CODE environment variable"
+        );
+      }
+
+      const validation_params = {
+        code: code,
+        device_id: login_params.device_id,
+        new_password: "",
+        remember_me: true,
+      };
+
+      const validation_res = await this.post("/auth/validate-access-code", {
+        body: JSON.stringify(validation_params),
+      });
+
+      const validation_resJson = await validation_res.json();
+
+      const access_token = validation_resJson["access_token"] as string;
+      const refresh_token = validation_resJson["refresh_token"] as string;
+      const user_id = validation_resJson["user_id"] as string;
+      const expires = validation_resJson["expires"] as number;
+      const expiration_refresh = validation_resJson["expiration_refresh"] as number;
+
+      if (access_token) {
+        this.auth_info.token = access_token as string;
+        this.auth_info.user_id = user_id as string;
+        this.macbid_session_headers["Authorization"] = this.auth_info.token;
+        this.auth_info.token_expiration = new Date(expires * 1000);
+        this.auth_info.refresh_token = refresh_token;
+        this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
+        return true;
+      }
+    }
+    console.error(JSON.stringify(resJson, null, 2));
+    throw new Error("Login failed");
+  };
+
+  public get_refresh_token_expiration = (): Date => {
+    if (this.auth_info.refresh_token_expiration) {
+      return this.auth_info.refresh_token_expiration;
+    } else {
+      throw new Error("Refresh token expiration not set, make sure to login first.");
+    }
+  }
+
+  /**
+   * Check if the access token is expired or about to expire (within 5 minutes)
+   */
+  private isTokenExpired = (): boolean => {
+    if (!this.auth_info.token_expiration) {
+      return true;
+    }
+    // Refresh if token expires within 5 minutes
+    const bufferTime = 5 * 60 * 1000; // 5 minutes in milliseconds
+    return Date.now() >= this.auth_info.token_expiration.getTime() - bufferTime;
+  }
+
+  /**
+   * Check if the refresh token is expired
+   */
+  private isRefreshTokenExpired = (): boolean => {
+    if (!this.auth_info.refresh_token_expiration) {
+      return true;
+    }
+    return Date.now() >= this.auth_info.refresh_token_expiration.getTime();
+  }
+
+  /**
+   * Refresh the access token using the refresh token
+   */
+  public refreshToken = async (): Promise<boolean> => {
+    if (!this.auth_info.refresh_token) {
+      throw new Error("No refresh token available. Please login again.");
+    }
+
+    if (this.isRefreshTokenExpired()) {
+      throw new Error("Refresh token has expired. Please login again.");
+    }
+
+    const refresh_params = {
+      refresh_token: this.auth_info.refresh_token,
+    };
+
+    // Use fetch directly to avoid triggering ensureValidToken and use PUT method
+    const res = await fetch(this.API_ROOT + "/auth/refresh-token", {
+      method: "PUT",
+      body: JSON.stringify(refresh_params),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+
+    const resJson = (await res.json()) as {
+      error?: string;
+      access_token?: string;
+      refresh_token?: string;
+      expires?: number;
+      expiration_refresh?: number;
+    };
+
+    // Check for error response
+    if (resJson["error"]) {
+      throw new Error(`Failed to refresh token: ${resJson["error"]}`);
+    }
+
+    const access_token = resJson["access_token"] as string;
+    const refresh_token = resJson["refresh_token"] as string | undefined;
+    const expires = resJson["expires"] as number;
+    const expiration_refresh = resJson["expiration_refresh"] as number | undefined;
+
+    if (access_token) {
+      this.auth_info.token = access_token;
       this.macbid_session_headers["Authorization"] = this.auth_info.token;
+      this.auth_info.token_expiration = new Date(expires * 1000);
+
+      // Update refresh token if a new one is provided
+      if (refresh_token) {
+        this.auth_info.refresh_token = refresh_token;
+      }
+      if (expiration_refresh) {
+        this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
+      }
 
       return true;
     } else {
-      throw new Error("Login failed");
+      throw new Error("Failed to refresh token: no access token in response");
     }
-  };
+  }
+
+  /**
+   * Ensure the access token is valid, refreshing if necessary
+   */
+  private ensureValidToken = async (): Promise<void> => {
+    if (this.isTokenExpired()) {
+      await this.refreshToken();
+    }
+  }
 
   /**
    * Returns the logged in user's favorites, and all of their (visible) attributes.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "macbid-ts-api",
-    "version": "0.1.4",
+    "version": "1.0.0-beta.0",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/pkmnct/macbid-ts-api.git"