reddy-api-srm 1.0.9 → 1.0.11

package/dist/src/auth/terminateSessions.d.ts

@@ -7,6 +7,8 @@ export interface TerminateSessionsInput {
     digest: string;
     /** Optional CSRF token (value of iamcsr cookie, without the prefix) */
     csrfToken?: string;
+    /** Optional cookie string from validatePassword pre-announcement flow */
+    sessionCookie?: string;
 }
 
 export interface TerminateSessionsResult {

package/dist/src/auth/terminateSessions.js

@@ -27,7 +27,11 @@ exports.terminateSessions = terminateSessions;
  * @param {string} digest      - Zoho digest from verifyUser
  * @param {string} [csrfToken] - Optional x-zcsrf-token value (extracted from iamcsr cookie)
  */
-async function terminateSessions({ flowId, identifier, digest, csrfToken }) {
+async function terminateSessions({ flowId, identifier, digest, csrfToken, sessionCookie }) {
+    const normalizedCsrfToken = csrfToken ??
+        (((sessionCookie ?? "").match(/(?:^|;\s*)iamcsr=([^;]+)/) ??
+            (sessionCookie ?? "").match(/(?:^|;\s*)_zcsr_tmp=([^;]+)/) ??
+            [])[1] ?? null);
     // ── Strategy 1: Block-Sessions preannouncement POST ────────────────────────
     // This is what fires when the user clicks "Terminate All Sessions" on the
     // SRM concurrent-sessions warning page during a fresh login attempt.
@@ -58,9 +62,10 @@ async function terminateSessions({ flowId, identifier, digest, csrfToken }) {
                 "sec-fetch-dest": "empty",
                 "sec-fetch-mode": "cors",
                 "sec-fetch-site": "same-origin",
-                ...(csrfToken
-                    ? { "x-zcsrf-token": `iamcsrcoo=${csrfToken}` }
+                ...(normalizedCsrfToken
+                    ? { "x-zcsrf-token": `iamcsrcoo=${normalizedCsrfToken}` }
                     : {}),
+                ...(sessionCookie ? { cookie: sessionCookie } : {}),
                 Referer:
                     "https://academia.srmist.edu.in/accounts/p/40-10002227248/signin?hide_fp=true&servicename=ZohoCreator&service_language=en&dcc=true&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin",
                 "Referrer-Policy": "strict-origin-when-cross-origin",
@@ -92,9 +97,10 @@ async function terminateSessions({ flowId, identifier, digest, csrfToken }) {
                     accept: "application/json, text/javascript, */*; q=0.01",
                     "accept-language": "en-US,en;q=0.9",
                     "x-requested-with": "XMLHttpRequest",
-                    ...(csrfToken
-                        ? { "x-zcsrf-token": `iamcsrcoo=${csrfToken}` }
+                    ...(normalizedCsrfToken
+                        ? { "x-zcsrf-token": `iamcsrcoo=${normalizedCsrfToken}` }
                         : {}),
+                    ...(sessionCookie ? { cookie: sessionCookie } : {}),
                     Referer: "https://accounts.zoho.in/",
                     "Referrer-Policy": "strict-origin-when-cross-origin",
                 },
@@ -111,6 +117,41 @@ async function terminateSessions({ flowId, identifier, digest, csrfToken }) {
             console.warn("[terminateSessions] Strategy 2 error:", e2);
         }
     }
+    // ── Strategy 3: Announcement pre-blocksessions DELETE ───────────────────────
+    // This is what current SRM preannouncement page JS calls.
+    if (sessionCookie) {
+        try {
+            const preBlockUrl = "https://academia.srmist.edu.in/accounts/p/40-10002227248/webclient/v1/announcement/pre/blocksessions";
+            const res3 = await fetch(preBlockUrl, {
+                method: "DELETE",
+                headers: {
+                    accept: "application/json, text/javascript, */*; q=0.01",
+                    "accept-language": "en-US,en;q=0.9",
+                    "content-type": "application/x-www-form-urlencoded;charset=UTF-8",
+                    ...(normalizedCsrfToken
+                        ? {
+                            "x-zcsrf-token": `iamcsrcoo=${encodeURIComponent(normalizedCsrfToken)}`,
+                            "X-ZCSRF-TOKEN": `iamcsrcoo=${encodeURIComponent(normalizedCsrfToken)}`,
+                        }
+                        : {}),
+                    cookie: sessionCookie,
+                    Referer: "https://academia.srmist.edu.in/accounts/p/40-10002227248/preannouncement/block-sessions",
+                    "Referrer-Policy": "strict-origin-when-cross-origin",
+                },
+            });
+            let data = null;
+            try {
+                data = await res3.json();
+            } catch (_) { }
+            if (res3.ok || res3.status === 200 || res3.status === 202 || res3.status === 204 ||
+                (data && (String(data.status_code) === "204" || data.code === "SUCCESS"))) {
+                return { success: true, status: res3.status, strategy: "announcement-pre-blocksessions", data };
+            }
+            console.warn("[terminateSessions] Strategy 3 (announcement pre-blocksessions DELETE) returned:", res3.status, data);
+        } catch (e3) {
+            console.warn("[terminateSessions] Strategy 3 error:", e3);
+        }
+    }
 
     // Both strategies failed — return a non-fatal "best-effort" result.
     // The caller (handleTerminateAndRetry) will still attempt to re-login because

package/dist/src/auth/validatePassword.js

@@ -1,9 +1,85 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePassword = validatePassword;
+function parseCookiePairsFromSetCookie(headers) {
+    const pairs = [];
+    for (const header of headers) {
+        const pair = header.split(";")[0]?.trim();
+        if (pair && pair.includes("="))
+            pairs.push(pair);
+    }
+    return pairs;
+}
+function parseCookiePairsFromCookieString(cookie) {
+    if (!cookie)
+        return [];
+    return cookie
+        .split(";")
+        .map((v) => v.trim())
+        .filter((v) => v.includes("="));
+}
+function mergeCookies(...cookieSources) {
+    const cookieMap = new Map();
+    for (const source of cookieSources) {
+        for (const pair of parseCookiePairsFromCookieString(source)) {
+            const idx = pair.indexOf("=");
+            if (idx <= 0)
+                continue;
+            const name = pair.slice(0, idx).trim();
+            cookieMap.set(name, pair.trim());
+        }
+    }
+    return `${Array.from(cookieMap.values()).join("; ")};`;
+}
+function getCookieValue(cookie, name) {
+    const match = (cookie || "").match(new RegExp(`(?:^|;\\s*)${name}=([^;]+)`));
+    return match ? match[1] : null;
+}
+function getFlowIdFromUrl(urlValue) {
+    if (!urlValue)
+        return null;
+    try {
+        const u = new URL(urlValue, "https://academia.srmist.edu.in");
+        return u.searchParams.get("flowId") ?? u.searchParams.get("flow_id") ?? null;
+    }
+    catch (_) {
+        return null;
+    }
+}
+async function getSigninSessionHeaders() {
+    const signinUrl = "https://academia.srmist.edu.in/accounts/p/40-10002227248/signin?hide_fp=true&servicename=ZohoCreator&service_language=en&dcc=true&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin";
+    const seedRes = await fetch(signinUrl, {
+        method: "GET",
+        redirect: "manual",
+        headers: {
+            accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+            "accept-language": "en-US,en;q=0.9",
+        },
+    });
+    const setCookieHeaders = (typeof seedRes.headers.getSetCookie === "function"
+        ? seedRes.headers.getSetCookie()
+        : [seedRes.headers.get("set-cookie")].filter(Boolean));
+    const cookiePairs = [];
+    let csrfToken = null;
+    for (const header of setCookieHeaders) {
+        const pair = header.split(";")[0]?.trim();
+        if (!pair || !pair.includes("="))
+            continue;
+        cookiePairs.push(pair);
+        if (pair.startsWith("iamcsr="))
+            csrfToken = pair.slice("iamcsr=".length);
+        if (!csrfToken && pair.startsWith("_zcsr_tmp="))
+            csrfToken = pair.slice("_zcsr_tmp=".length);
+    }
+    return {
+        cookie: cookiePairs.join("; "),
+        csrfToken,
+    };
+}
 async function validatePassword({ identifier, digest, password, }) {
     let res;
     try {
+        const seed = await getSigninSessionHeaders();
         res = await fetch(`https://academia.srmist.edu.in/accounts/p/40-10002227248/signin/v2/primary/${identifier}/password?digest=${digest}&cli_time=${Date.now()}&servicename=ZohoCreator&service_language=en&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin`, {
             headers: {
                 accept: "*/*",
@@ -12,12 +88,25 @@ async function validatePassword({ identifier, digest, password, }) {
                 "sec-fetch-dest": "empty",
                 "sec-fetch-mode": "cors",
                 "sec-fetch-site": "same-origin",
+                ...(seed.csrfToken ? { "x-zcsrf-token": `iamcsrcoo=${seed.csrfToken}` } : {}),
+                ...(seed.cookie ? { cookie: seed.cookie } : {}),
                 Referer: "https://academia.srmist.edu.in/accounts/p/40-10002227248/signin?hide_fp=true&servicename=ZohoCreator&service_language=en&dcc=true&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin",
                 "Referrer-Policy": "strict-origin-when-cross-origin",
             },
             body: `{"passwordauth":{"password":"${password}"}}`,
             method: "POST",
+            redirect: "manual",
         });
+        const location = res.headers.get("location") ?? "";
+        if ([301, 302, 303, 307, 308].includes(res.status) && location.includes("sessions-reminder")) {
+            let flowId = null;
+            try {
+                const u = new URL(location, "https://academia.srmist.edu.in");
+                flowId = u.searchParams.get("flowId") ?? u.searchParams.get("flow_id") ?? null;
+            }
+            catch (_) { }
+            return { data: { statusCode: 435, message: "Maximum concurrent sessions reached. Please terminate existing sessions to continue.", captcha: { required: false, digest: null }, isConcurrentLimit: true, flowId }, isAuthenticated: false };
+        }
         // ── Detect redirect to Zoho sessions-reminder page ───────────────────────
         if (res.redirected && res.url && res.url.includes("sessions-reminder")) {
             let flowId = null;
@@ -36,23 +125,95 @@ async function validatePassword({ identifier, digest, password, }) {
             }
             return { error: "Internal Server Error", errorReason: new Error("Non-JSON response from login endpoint") };
         }
-        if (response.status_code === 201) {
-            const setCookieHeaders = (typeof res.headers.getSetCookie === "function"
-                ? res.headers.getSetCookie()
-                : [res.headers.get("set-cookie")].filter(Boolean));
-            if (!setCookieHeaders.length)
+        const responseSetCookieHeaders = (typeof res.headers.getSetCookie === "function"
+            ? res.headers.getSetCookie()
+            : [res.headers.get("set-cookie")].filter(Boolean));
+        const responseCookies = parseCookiePairsFromSetCookie(responseSetCookieHeaders).join("; ");
+        const sessionCookie = mergeCookies(seed.cookie, responseCookies);
+        const sessionCsrfToken = getCookieValue(sessionCookie, "iamcsr") ?? getCookieValue(sessionCookie, "_zcsr_tmp");
+        const preAnnouncementRedirect = response?.passwordauth?.redirect_uri ?? null;
+        const isPreAnnouncementFlow = response?.code === "SI303" ||
+            (typeof response?.message === "string" &&
+                response.message.toLowerCase().includes("pre announcement")) ||
+            (typeof preAnnouncementRedirect === "string" &&
+                preAnnouncementRedirect.includes("/preannouncement/block-sessions"));
+        if (isPreAnnouncementFlow) {
+            return {
+                data: {
+                    statusCode: 435,
+                    message: "Maximum concurrent sessions reached. Please terminate existing sessions to continue.",
+                    captcha: { required: false, digest: null },
+                    isConcurrentLimit: true,
+                    flowId: getFlowIdFromUrl(preAnnouncementRedirect),
+                    sessionCookie,
+                    csrfToken: sessionCsrfToken,
+                },
+                isAuthenticated: false,
+            };
+        }
+        if (response.status_code === 201 || response.status_code === 200) {
+            if (!responseSetCookieHeaders.length)
                 throw new Error("Couldn't able to get cookie from response header ");
-            const combinedCookieHeader = setCookieHeaders.join("; ");
-            const matches = [
-                ...combinedCookieHeader.matchAll(/(_(?:iamadt|iambdt)_client_\d+|_z_identity)=[^;]+/g),
-            ];
-            const extractedCookies = matches.map((m) => m[0]).join("; ") + ";";
+            let extractedCookies = sessionCookie;
+            // Complete the service redirect once to receive portal/session cookies needed by data APIs.
+            try {
+                const bridgeRes = await fetch("https://academia.srmist.edu.in/portal/academia-academic-services/redirectFromLogin", {
+                    method: "GET",
+                    headers: {
+                        accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+                        "accept-language": "en-US,en;q=0.9",
+                        cookie: extractedCookies,
+                    },
+                });
+                const bridgeSetCookies = (typeof bridgeRes.headers.getSetCookie === "function"
+                    ? bridgeRes.headers.getSetCookie()
+                    : [bridgeRes.headers.get("set-cookie")].filter(Boolean));
+                if (bridgeSetCookies.length) {
+                    extractedCookies = mergeCookies(extractedCookies, parseCookiePairsFromSetCookie(bridgeSetCookies).join("; "));
+                }
+            }
+            catch (_) { }
             const data = {
                 cookies: extractedCookies,
-                statusCode: 201,
+                statusCode: response.status_code,
             };
             return { data, isAuthenticated: true };
         }
+        if ([301, 302, 303, 307, 308].includes(res.status) &&
+            (location.includes("redirectFromLogin") || location.includes("/portal/academia-academic-services"))) {
+            const setCookieHeaders = (typeof res.headers.getSetCookie === "function"
+                ? res.headers.getSetCookie()
+                : [res.headers.get("set-cookie")].filter(Boolean));
+            const loginCookies = parseCookiePairsFromSetCookie(setCookieHeaders).join("; ");
+            let extractedCookies = mergeCookies(seed.cookie, loginCookies);
+            try {
+                const redirectUrl = new URL(location, "https://academia.srmist.edu.in").toString();
+                const bridgeRes = await fetch(redirectUrl, {
+                    method: "GET",
+                    headers: {
+                        accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+                        "accept-language": "en-US,en;q=0.9",
+                        cookie: extractedCookies,
+                    },
+                });
+                const bridgeSetCookies = (typeof bridgeRes.headers.getSetCookie === "function"
+                    ? bridgeRes.headers.getSetCookie()
+                    : [bridgeRes.headers.get("set-cookie")].filter(Boolean));
+                if (bridgeSetCookies.length) {
+                    extractedCookies = mergeCookies(extractedCookies, parseCookiePairsFromSetCookie(bridgeSetCookies).join("; "));
+                }
+            }
+            catch (_) { }
+            if (extractedCookies.length > 1) {
+                return {
+                    data: {
+                        cookies: extractedCookies,
+                        statusCode: 201,
+                    },
+                    isAuthenticated: true,
+                };
+            }
+        }
         // ── Concurrent / device-limit detection ──────────────────────────────────
         const msg = (response.localized_message ?? response.message ?? "").toLowerCase();
         const isConcurrentLimit =

package/dist/src/auth/validateUser.js

@@ -1,8 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateUser = validateUser;
+async function getSigninSessionHeaders() {
+    const signinUrl = "https://academia.srmist.edu.in/accounts/p/40-10002227248/signin?hide_fp=true&servicename=ZohoCreator&service_language=en&dcc=true&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin";
+    const seedRes = await fetch(signinUrl, {
+        method: "GET",
+        redirect: "manual",
+        headers: {
+            accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+            "accept-language": "en-US,en;q=0.9",
+        },
+    });
+    const setCookieHeaders = (typeof seedRes.headers.getSetCookie === "function"
+        ? seedRes.headers.getSetCookie()
+        : [seedRes.headers.get("set-cookie")].filter(Boolean));
+    const cookiePairs = [];
+    let csrfToken = null;
+    for (const header of setCookieHeaders) {
+        const pair = header.split(";")[0]?.trim();
+        if (!pair || !pair.includes("="))
+            continue;
+        cookiePairs.push(pair);
+        if (pair.startsWith("iamcsr="))
+            csrfToken = pair.slice("iamcsr=".length);
+        if (!csrfToken && pair.startsWith("_zcsr_tmp="))
+            csrfToken = pair.slice("_zcsr_tmp=".length);
+    }
+    return {
+        cookie: cookiePairs.join("; "),
+        csrfToken,
+    };
+}
 async function validateUser(username) {
     try {
+        const seed = await getSigninSessionHeaders();
         const res = await fetch(`https://academia.srmist.edu.in/accounts/p/40-10002227248/signin/v2/lookup/${username}`, {
             headers: {
                 accept: "*/*",
@@ -11,6 +42,8 @@ async function validateUser(username) {
                 "sec-fetch-dest": "empty",
                 "sec-fetch-mode": "cors",
                 "sec-fetch-site": "same-origin",
+                ...(seed.csrfToken ? { "x-zcsrf-token": `iamcsrcoo=${seed.csrfToken}` } : {}),
+                ...(seed.cookie ? { cookie: seed.cookie } : {}),
                 Referer: "https://academia.srmist.edu.in/accounts/p/40-10002227248/signin?hide_fp=true&servicename=ZohoCreator&service_language=en&dcc=true&serviceurl=https%3A%2F%2Facademia.srmist.edu.in%2Fportal%2Facademia-academic-services%2FredirectFromLogin",
                 "Referrer-Policy": "strict-origin-when-cross-origin",
             },
@@ -27,7 +60,6 @@ async function validateUser(username) {
         return { data };
     }
     catch (e) {
-        console.error(e);
         return {
             error: "Internal Server Error",
             errorReason: e,

package/dist/src/index.d.ts

@@ -3,7 +3,7 @@ export type { PasswordInput, UserResponse, AuthResult, UserValidationResult, Log
 export declare function verifyUser(username: string): Promise<UserValidationResult>;
 export declare function verifyPassword({ identifier, digest, password, }: PasswordInput): Promise<AuthResult>;
 export declare function logoutUser(cookie: string): Promise<LogoutResponse>;
-export interface TerminateSessionsInput { flowId: string | null; identifier: string; digest: string; csrfToken?: string; }
+export interface TerminateSessionsInput { flowId: string | null; identifier: string; digest: string; csrfToken?: string; sessionCookie?: string; }
 export interface TerminateSessionsResult { success: boolean; status?: number; strategy?: string; data?: unknown; error?: string; errorReason?: unknown; }
 export declare function terminateSessions(params: TerminateSessionsInput): Promise<TerminateSessionsResult>;
 export declare function getTimetable(cookie: string): Promise<TimetableResponse>;
@@ -13,4 +13,4 @@ export declare function getUserInfo(cookie: string): Promise<UserInfoResponse>;
 export declare function getCalendar(cookie: string): Promise<CalendarResponse>;
 export declare function getDayOrder(cookie: string): Promise<DayOrderResponse>;
 export declare function getCourse(cookie: string): Promise<CourseResponse>;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist/src/index.js

@@ -42,8 +42,8 @@ async function logoutUser(cookie) {
     return await (0, fetchLogout_1.fetchLogout)(cookie);
 }
 // Terminate concurrent sessions (2-device limit bypass)
-async function terminateSessions({ flowId, identifier, digest, csrfToken }) {
-    return await (0, terminateSessions_1.terminateSessions)({ flowId, identifier, digest, csrfToken });
+async function terminateSessions({ flowId, identifier, digest, csrfToken, sessionCookie }) {
+    return await (0, terminateSessions_1.terminateSessions)({ flowId, identifier, digest, csrfToken, sessionCookie });
 }
 // Get TimeTable
 async function getTimetable(cookie) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reddy-api-srm",
   "description": "SRMIST KTR Academia portal",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "exports": {