@explita/cloud-auth-client 0.0.1 → 0.1.0

package/dist/contexts/auth-provider.js

@@ -42,7 +42,7 @@ const loader_1 = require("../components/loader");
 const error_1 = require("../lib/error");
 const use_token_refresher_1 = require("../hooks/use-token-refresher");
 const optional_otp_wrapper_1 = require("../components/optional-otp-wrapper");
-const refresh_helper_1 = require("../lib/refresh-helper");
+const constants_1 = require("../lib/constants");
 const AuthContext = (0, react_1.createContext)(undefined);
 function AuthProvider({ children, config }) {
     const [twoFAData, setTwoFAData] = (0, react_1.useState)(null);
@@ -53,12 +53,11 @@ function AuthProvider({ children, config }) {
     const [transition, startTransition] = (0, react_1.useTransition)();
     const withFullObject = (0, utils_1.shouldPassFullUserObject)();
     const computedRouteContext = (0, utils_1.buildRouteContext)(config);
-    const { loginUrl, resetPasswordUrl, dashboardUrl, returnPath, isExcluded } = computedRouteContext;
+    const { loginUrl, resetPasswordUrl, dashboardUrl, returnPathRaw, isExcluded, } = computedRouteContext;
     const { disableLoading = false } = config || {};
     async function redirectAfterLogin(authToken, tempRefreshToken) {
-        var _a;
-        await ((_a = config === null || config === void 0 ? void 0 : config.cookieOverride) === null || _a === void 0 ? void 0 : _a.call(config, tempRefreshToken));
-        localStorage.setItem(refresh_helper_1.AUTH_TOKEN_KEY, authToken);
+        await config?.cookieOverride?.(tempRefreshToken);
+        localStorage.setItem(constants_1.AUTH_TOKEN_KEY, authToken);
         const returnPath = new URLSearchParams(window.location.search).get("returnPath");
         window.location.href = returnPath ? returnPath : dashboardUrl;
     }
@@ -72,7 +71,7 @@ function AuthProvider({ children, config }) {
         if (!navigator.onLine) {
             try {
                 const payload = (0, utils_1.parseJwt)(token);
-                setUser(payload === null || payload === void 0 ? void 0 : payload.user);
+                setUser(payload?.user);
                 setIsAuthenticated(true);
             }
             catch (e) {
@@ -89,7 +88,7 @@ function AuthProvider({ children, config }) {
         }
         catch (err) {
             console.warn("[ecp-auth] Failed to fetch user:", err);
-            await logout("session_expired");
+            await logout("server_unavailable");
         }
         finally {
             setLoading(false);
@@ -143,24 +142,30 @@ function AuthProvider({ children, config }) {
         }
     }
     async function logout(reason = "", params) {
-        var _a;
+        let logoutSucceeded = false;
         try {
             await (0, api_1.apiFactory)("/logout");
+            logoutSucceeded = true;
         }
         catch (err) {
-            console.log(err);
+            if ([401, 403].includes(err.status)) {
+                logoutSucceeded = true;
+            }
+            console.error("Logout failed:", err);
         }
-        finally {
-            localStorage.removeItem(refresh_helper_1.AUTH_TOKEN_KEY);
-            localStorage.removeItem(refresh_helper_1.LEADING_TAB_KEY);
-            localStorage.removeItem(refresh_helper_1.AUTH_RETRY_STATE_KEY);
-            await ((_a = config === null || config === void 0 ? void 0 : config.cookieOverride) === null || _a === void 0 ? void 0 : _a.call(config, ""));
+        const forceLogout = ["user_logout", "server_unavailable"].includes(reason);
+        if (logoutSucceeded || forceLogout) {
+            localStorage.removeItem(constants_1.AUTH_TOKEN_KEY);
+            localStorage.removeItem(constants_1.LEADING_TAB_KEY);
+            localStorage.removeItem(constants_1.AUTH_RETRY_STATE_KEY);
+            await config?.cookieOverride?.("");
             const fullParams = new URLSearchParams({
+                returnPath: returnPathRaw,
                 reason,
                 ...params,
             }).toString();
             if (typeof window !== "undefined") {
-                window.location.href = `${loginUrl}?${returnPath}&${fullParams}`;
+                window.location.href = `${loginUrl}?${fullParams}`;
             }
         }
     }
@@ -175,9 +180,8 @@ function AuthProvider({ children, config }) {
             return res;
         },
         onTokenRefreshed: (authToken, tempRefreshToken) => {
-            var _a;
-            localStorage.setItem(refresh_helper_1.AUTH_TOKEN_KEY, authToken);
-            (_a = config === null || config === void 0 ? void 0 : config.cookieOverride) === null || _a === void 0 ? void 0 : _a.call(config, tempRefreshToken);
+            localStorage.setItem(constants_1.AUTH_TOKEN_KEY, authToken);
+            config?.cookieOverride?.(tempRefreshToken);
         },
         revalidateUserWhenOnline: fetchCurrentUser,
         onRefreshFailed: async () => await logout("session_expired"),
@@ -198,6 +202,7 @@ function AuthProvider({ children, config }) {
                 logout: (params) => logout("user_logout", params),
                 hasPermission: (permission) => (0, utils_1.hasPermission)(user, permission),
                 revalidate: () => startTransition(fetchCurrentUser),
+                getToken: () => (0, utils_1.getClientToken)(),
             } }, children)));
 }
 function useAuth() {

package/dist/hooks/use-token-refresher.js

@@ -4,6 +4,7 @@ exports.useTokenRefresher = useTokenRefresher;
 const utils_1 = require("../lib/utils");
 const react_1 = require("react");
 const refresh_helper_1 = require("../lib/refresh-helper");
+const constants_1 = require("../lib/constants");
 function useTokenRefresher({ refreshTokenRequest, onRefreshFailed, onTokenRefreshed, revalidateUserWhenOnline, config, }) {
     const refreshing = (0, react_1.useRef)(false);
     const interval = (0, react_1.useRef)(null);
@@ -26,7 +27,7 @@ function useTokenRefresher({ refreshTokenRequest, onRefreshFailed, onTokenRefres
         refreshing.current = true;
         const token = (0, utils_1.getClientToken)();
         if (!token && !isExcluded) {
-            onRefreshFailed === null || onRefreshFailed === void 0 ? void 0 : onRefreshFailed();
+            onRefreshFailed?.();
             refreshing.current = false;
             return;
         }
@@ -40,7 +41,7 @@ function useTokenRefresher({ refreshTokenRequest, onRefreshFailed, onTokenRefres
                 const payload = (0, utils_1.parseJwt)(token);
                 const expiresAt = payload.exp * 1000;
                 const timeLeft = expiresAt - Date.now();
-                if (timeLeft < refresh_helper_1.thresholdMs) {
+                if (timeLeft < constants_1.thresholdMs) {
                     shouldRefresh = true;
                 }
                 else {
@@ -49,22 +50,22 @@ function useTokenRefresher({ refreshTokenRequest, onRefreshFailed, onTokenRefres
             }
             catch (e) {
                 console.warn("[ecp-auth] Invalid token format, skipping refresh.");
-                onRefreshFailed === null || onRefreshFailed === void 0 ? void 0 : onRefreshFailed();
+                onRefreshFailed?.();
             }
             if (shouldRefresh) {
                 const { authToken, tempRefreshToken } = await refreshTokenRequest();
                 if (!authToken) {
-                    onRefreshFailed === null || onRefreshFailed === void 0 ? void 0 : onRefreshFailed();
+                    onRefreshFailed?.();
                 }
                 else {
-                    onTokenRefreshed === null || onTokenRefreshed === void 0 ? void 0 : onTokenRefreshed(authToken, tempRefreshToken);
+                    onTokenRefreshed?.(authToken, tempRefreshToken);
                 }
             }
         }
         catch (err) {
             const success = await (0, refresh_helper_1.tryRefreshWithRetry)(refreshTokenRequest);
             if (!success) {
-                onRefreshFailed === null || onRefreshFailed === void 0 ? void 0 : onRefreshFailed();
+                onRefreshFailed?.();
                 console.warn("[ecp-auth] All retry attempts failed, triggering logout.");
             }
         }
@@ -74,7 +75,7 @@ function useTokenRefresher({ refreshTokenRequest, onRefreshFailed, onTokenRefres
     }
     (0, react_1.useEffect)(() => {
         refreshIfNeeded(); // run once on mount
-        interval.current = setInterval(refreshIfNeeded, refresh_helper_1.intervalMs);
+        interval.current = setInterval(refreshIfNeeded, constants_1.intervalMs);
         function onVisible() {
             if (document.visibilityState === "visible") {
                 refreshIfNeeded();
@@ -96,11 +97,10 @@ function useTokenRefresher({ refreshTokenRequest, onRefreshFailed, onTokenRefres
     }, []);
     (0, react_1.useEffect)(() => {
         function onStorage(e) {
-            if (e.key === refresh_helper_1.LEADING_TAB_KEY) {
+            if (e.key === constants_1.LEADING_TAB_KEY) {
                 // If leader changes, check if we need to act
-                // Optionally, you can trigger a refresh of local state here
             }
-            if (e.key === refresh_helper_1.AUTH_RETRY_STATE_KEY) {
+            if (e.key === constants_1.AUTH_RETRY_STATE_KEY) {
                 // Optionally, react to retry state changes
             }
         }
@@ -112,7 +112,7 @@ function useTokenRefresher({ refreshTokenRequest, onRefreshFailed, onTokenRefres
             return;
         const renewInterval = setInterval(() => {
             (0, refresh_helper_1.renewLeadership)();
-        }, refresh_helper_1.LEADER_TIMEOUT / 2); // Renew halfway before timeout
+        }, constants_1.LEADER_TIMEOUT / 2); // Renew halfway before timeout
         return () => clearInterval(renewInterval);
     }, [refresh_helper_1.isLeader]);
 }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./contexts/auth-provider";
 export * from "./components/message";
-export { buildRouteContext } from "./lib/utils";
-export type { AuthConfig, Project, Service, ServiceType, User, Role, Status, NewRole, UpdateUser, GeneralResponse, FormResponse, VerifyUser, VerifyUserResponse, ResetPasswordWithToken, ResetPasswordWithUserId, Signup, Login, Otp, } from "./types";
+export { buildRouteContext, getClientToken as getToken, hasPermission, } from "./lib/utils";
+export type { AuthConfig, User, Role, Status, NewRole, UpdateUser, GeneralResponse, FormResponse, VerifyUser, VerifyUserResponse, ResetPasswordWithToken, ResetPasswordWithUserId, CreateUser, Login, } from "./types";

package/dist/index.js

@@ -14,8 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRouteContext = void 0;
+exports.hasPermission = exports.getToken = exports.buildRouteContext = void 0;
 __exportStar(require("./contexts/auth-provider"), exports);
 __exportStar(require("./components/message"), exports);
 var utils_1 = require("./lib/utils");
 Object.defineProperty(exports, "buildRouteContext", { enumerable: true, get: function () { return utils_1.buildRouteContext; } });
+Object.defineProperty(exports, "getToken", { enumerable: true, get: function () { return utils_1.getClientToken; } });
+Object.defineProperty(exports, "hasPermission", { enumerable: true, get: function () { return utils_1.hasPermission; } });

package/dist/lib/api-client.js

@@ -5,34 +5,49 @@ const error_1 = require("./error");
 const utils_1 = require("./utils");
 // CLIENT: browser-side calls using public token
 async function apiClient(path, options) {
-    const [apiUrl, apiKey] = atob((0, utils_1.getPublicTokenEnv)()).split("$");
-    if (!apiUrl || !apiKey) {
+    const [apiUrl, version, workspaceId, apiKey] = atob((0, utils_1.getPublicTokenEnv)()).split("$");
+    if (!apiUrl || !apiKey || !version || !workspaceId) {
         throw new Error("Invalid API URL or API key. Please set ECP_AUTH_PUBLIC_TOKEN (or the VITE_/NEXT_PUBLIC_ equivalent) in your .env file. Check admin dashboard for env variables.");
     }
     const token = (0, utils_1.getClientToken)(); // from localStorage
-    const { method = "POST", body, headers, ...rest } = options !== null && options !== void 0 ? options : {};
-    const res = await fetch(`${apiUrl}${path}`, {
-        method,
-        body: body ? JSON.stringify(body) : undefined,
-        headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${token}`,
-            "x-api-key": apiKey,
-            "x-is-global": process.env.NEXT_PUBLIC_ECP_GLOBAL === "true" ? "true" : "false",
-            ...headers,
-        },
-        credentials: "include",
-        ...rest,
-    });
-    if (!res.ok) {
-        let errorData;
-        try {
-            errorData = await res.json();
+    const { method = "POST", body, headers, ...rest } = options ?? {};
+    try {
+        const res = await fetch(`${apiUrl}${path}`, {
+            method,
+            body: body ? JSON.stringify(body) : undefined,
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${token}`,
+                "x-api-key": apiKey,
+                "x-api-version": version,
+                "x-workspace-id": workspaceId,
+                "x-is-global": process.env.NEXT_PUBLIC_ECP_GLOBAL === "true" ? "true" : "false",
+                ...headers,
+            },
+            credentials: "include",
+            ...rest,
+        });
+        if (!res.ok) {
+            let errorData;
+            try {
+                errorData = await res.json();
+            }
+            catch {
+                errorData = { message: "Something went wrong." };
+            }
+            throw new error_1.APIError(errorData.message || "Unexpected error occurred.", errorData, res.status);
         }
-        catch {
-            errorData = { message: "Something went wrong." };
+        return (await res.json());
+    }
+    catch (err) {
+        // Handle network errors
+        if (err instanceof TypeError) {
+            // fetch throws TypeError for network errors
+            throw new error_1.APIError("Network error", {
+                message: "Network error: could not reach server. Please check your connection or try again later.",
+            }, 0);
         }
-        throw new error_1.APIError(errorData.message || "Unexpected error occurred.", errorData, res.status);
+        // Re-throw other errors
+        throw err;
     }
-    return (await res.json());
 }

package/dist/lib/api-server.js

@@ -6,13 +6,12 @@ const error_1 = require("./error");
 const server_token_1 = require("../server/server-token");
 // SERVER: secure-only calls using private key
 async function apiServer(apiPath, options) {
-    var _a;
-    let [apiUrl, apiKey] = atob((_a = process.env.ECP_AUTH_PRIVATE_TOKEN) !== null && _a !== void 0 ? _a : "").split("$");
-    if ((!apiUrl || !apiKey) && !(options === null || options === void 0 ? void 0 : options.adminCall)) {
+    let [apiUrl, version, workspaceId, apiKey] = atob(process.env.ECP_AUTH_PRIVATE_TOKEN ?? "").split("$");
+    if ((!apiUrl || !apiKey || !version || !workspaceId) && !options?.adminCall) {
         throw new Error("Invalid API URL or API key, please set ECP_AUTH_PRIVATE_TOKEN in your .env file. Check admin dashboard for env variables.");
     }
     let token = await (0, server_token_1.getServerToken)();
-    const { method = "POST", body, headers, adminCall, ...rest } = options !== null && options !== void 0 ? options : {};
+    const { method = "POST", body, headers, adminCall, ...rest } = options ?? {};
     const res = await fetch(`${apiUrl}${apiPath}`, {
         method,
         body: body ? JSON.stringify(body) : undefined,
@@ -20,6 +19,8 @@ async function apiServer(apiPath, options) {
             "Content-Type": "application/json",
             Authorization: `Bearer ${token}`,
             "x-api-key": apiKey,
+            "x-api-version": version,
+            "x-workspace-id": workspaceId,
             "x-is-global": process.env.NEXT_PUBLIC_ECP_GLOBAL === "true" ? "true" : "false",
             ...headers,
         },

package/dist/lib/constants.d.ts

@@ -0,0 +1,10 @@
+export declare const AUTH_TOKEN_KEY = "_ecp_auth_token";
+export declare const AUTH_RETRY_STATE_KEY = "_ecp_auth_retry_state";
+export declare const LEADING_TAB_KEY = "_ecp_leading_tab";
+export declare const LEADER_TIMEOUT: number;
+export declare const thresholdMs: number;
+export declare const intervalMs: number;
+export declare const retryDelayMs = 60000;
+export declare const maxRetries = 5;
+export declare const backoffFactor = 2;
+export declare const serverOnlyCall = "This function can only be called on the server";

package/dist/lib/constants.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serverOnlyCall = exports.backoffFactor = exports.maxRetries = exports.retryDelayMs = exports.intervalMs = exports.thresholdMs = exports.LEADER_TIMEOUT = exports.LEADING_TAB_KEY = exports.AUTH_RETRY_STATE_KEY = exports.AUTH_TOKEN_KEY = void 0;
+exports.AUTH_TOKEN_KEY = "_ecp_auth_token";
+exports.AUTH_RETRY_STATE_KEY = "_ecp_auth_retry_state";
+exports.LEADING_TAB_KEY = "_ecp_leading_tab";
+exports.LEADER_TIMEOUT = 2 * 60 * 1000;
+exports.thresholdMs = 2 * 60_000;
+exports.intervalMs = 1 * 60_000;
+exports.retryDelayMs = 60_000;
+exports.maxRetries = 5;
+exports.backoffFactor = 2;
+exports.serverOnlyCall = "This function can only be called on the server";

package/dist/lib/error.js

@@ -11,5 +11,5 @@ class APIError extends Error {
 }
 exports.APIError = APIError;
 function isAPIError(err) {
-    return (err === null || err === void 0 ? void 0 : err.data) !== undefined;
+    return err?.data !== undefined;
 }

package/dist/lib/refresh-helper.d.ts

@@ -1,10 +1,4 @@
 import { UseTokenRefresherOptions } from "../types";
-export declare const AUTH_TOKEN_KEY = "_ecp_auth_token";
-export declare const AUTH_RETRY_STATE_KEY = "_ecp_auth_retry_state";
-export declare const LEADING_TAB_KEY = "_ecp_leading_tab";
-export declare const LEADER_TIMEOUT: number;
-export declare const thresholdMs: number;
-export declare const intervalMs: number;
 export declare function tryRefreshWithRetry(refreshTokenRequest: UseTokenRefresherOptions["refreshTokenRequest"]): Promise<boolean>;
 export declare function isLeader(): boolean | undefined;
 export declare function becomeLeader(): void;

package/dist/lib/refresh-helper.js

@@ -1,38 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.intervalMs = exports.thresholdMs = exports.LEADER_TIMEOUT = exports.LEADING_TAB_KEY = exports.AUTH_RETRY_STATE_KEY = exports.AUTH_TOKEN_KEY = void 0;
 exports.tryRefreshWithRetry = tryRefreshWithRetry;
 exports.isLeader = isLeader;
 exports.becomeLeader = becomeLeader;
 exports.renewLeadership = renewLeadership;
 exports.tryToBecomeLeader = tryToBecomeLeader;
 const utils_1 = require("./utils");
-exports.AUTH_TOKEN_KEY = "_ecp_auth_token";
-exports.AUTH_RETRY_STATE_KEY = "_ecp_auth_retry_state";
-exports.LEADING_TAB_KEY = "_ecp_leading_tab";
-exports.LEADER_TIMEOUT = 2 * 60 * 1000;
-exports.thresholdMs = 2 * 60000;
-exports.intervalMs = 1 * 60000;
-const retryDelayMs = 60000;
-const maxRetries = 5;
-const backoffFactor = 2;
+const constants_1 = require("./constants");
 async function tryRefreshWithRetry(refreshTokenRequest) {
-    var _a;
-    const savedState = JSON.parse(localStorage.getItem(exports.AUTH_RETRY_STATE_KEY) || "{}");
-    for (let attempt = (_a = savedState === null || savedState === void 0 ? void 0 : savedState.attemptNumber) !== null && _a !== void 0 ? _a : 1; attempt <= maxRetries; attempt++) {
+    const savedState = JSON.parse(localStorage.getItem(constants_1.AUTH_RETRY_STATE_KEY) || "{}");
+    for (let attempt = savedState?.attemptNumber ?? 1; attempt <= constants_1.maxRetries; attempt++) {
         try {
             await refreshTokenRequest();
-            localStorage.removeItem(exports.AUTH_RETRY_STATE_KEY);
+            localStorage.removeItem(constants_1.AUTH_RETRY_STATE_KEY);
             return true; // ✅ success!
         }
         catch (err) {
             console.warn(`[ecp-auth] Silent refresh attempt ${attempt} failed`, err);
-            if (attempt < maxRetries) {
-                localStorage.setItem(exports.AUTH_RETRY_STATE_KEY, JSON.stringify({
+            if (attempt < constants_1.maxRetries) {
+                localStorage.setItem(constants_1.AUTH_RETRY_STATE_KEY, JSON.stringify({
                     lastAttempt: Date.now(),
                     attemptNumber: attempt,
                 }));
-                const delay = retryDelayMs * Math.pow(backoffFactor, attempt - 1);
+                const delay = constants_1.retryDelayMs * Math.pow(constants_1.backoffFactor, attempt - 1);
                 console.info(`[ecp-auth] Retrying in ${delay}ms...`);
                 await new Promise((res) => setTimeout(res, delay));
             }
@@ -50,11 +40,11 @@ const TAB_ID = (() => {
 function isLeader() {
     if (typeof localStorage === "undefined")
         return;
-    const leaderData = JSON.parse(localStorage.getItem(exports.LEADING_TAB_KEY) || "{}");
+    const leaderData = JSON.parse(localStorage.getItem(constants_1.LEADING_TAB_KEY) || "{}");
     if (!leaderData.id || !leaderData.timestamp)
         return false;
     // If leader is stale, allow takeover
-    if (Date.now() - leaderData.timestamp > exports.LEADER_TIMEOUT)
+    if (Date.now() - leaderData.timestamp > constants_1.LEADER_TIMEOUT)
         return false;
     return leaderData.id === TAB_ID;
 }
@@ -62,7 +52,7 @@ function becomeLeader() {
     const authToken = (0, utils_1.getClientToken)();
     if (!authToken)
         return;
-    localStorage.setItem(exports.LEADING_TAB_KEY, JSON.stringify({ id: TAB_ID, timestamp: Date.now() }));
+    localStorage.setItem(constants_1.LEADING_TAB_KEY, JSON.stringify({ id: TAB_ID, timestamp: Date.now() }));
 }
 function renewLeadership() {
     // Called periodically by leader to keep leadership
@@ -73,8 +63,8 @@ function renewLeadership() {
 function tryToBecomeLeader() {
     if (typeof localStorage === "undefined")
         return;
-    const leaderData = JSON.parse(localStorage.getItem(exports.LEADING_TAB_KEY) || "{}");
-    if (!leaderData.id || Date.now() - leaderData.timestamp > exports.LEADER_TIMEOUT) {
+    const leaderData = JSON.parse(localStorage.getItem(constants_1.LEADING_TAB_KEY) || "{}");
+    if (!leaderData.id || Date.now() - leaderData.timestamp > constants_1.LEADER_TIMEOUT) {
         becomeLeader();
         return true;
     }

package/dist/lib/utils.d.ts

@@ -1,4 +1,4 @@
-import { AuthConfig, User } from "../types";
+import { AuthConfig, QueryOpts, User } from "../types";
 export declare function cn(...classes: (string | false | null | undefined)[]): string;
 export declare function unstuckPointerEvents(): void;
 export declare function buildRouteContext(config?: AuthConfig, currentPath?: string): {
@@ -7,6 +7,7 @@ export declare function buildRouteContext(config?: AuthConfig, currentPath?: str
     dashboardUrl: string;
     resetPasswordUrl: string;
     returnPath: string;
+    returnPathRaw: string;
     currentPath: string;
     excludedPaths: string[];
     isExcluded: boolean;
@@ -14,6 +15,7 @@ export declare function buildRouteContext(config?: AuthConfig, currentPath?: str
 export declare function getClientToken(): string;
 export declare function hasPermission(user: User | null, permission: string): boolean;
 export declare function parseMessage(message: string): string;
+export declare function parseGroupId(data?: QueryOpts["groupIds"]): string;
 export declare function parseJwt(token: string): any;
 export declare function isOtpAvailable(): boolean;
 export declare function shouldPassFullUserObject(): boolean;

package/dist/lib/utils.js

@@ -6,11 +6,13 @@ exports.buildRouteContext = buildRouteContext;
 exports.getClientToken = getClientToken;
 exports.hasPermission = hasPermission;
 exports.parseMessage = parseMessage;
+exports.parseGroupId = parseGroupId;
 exports.parseJwt = parseJwt;
 exports.isOtpAvailable = isOtpAvailable;
 exports.shouldPassFullUserObject = shouldPassFullUserObject;
 exports.getPublicTokenEnv = getPublicTokenEnv;
 exports.getPrivateTokenEnv = getPrivateTokenEnv;
+const constants_1 = require("./constants");
 function cn(...classes) {
     return classes.filter(Boolean).join(" ");
 }
@@ -30,7 +32,6 @@ const defaultAuthConfig = {
     excludedPaths: [],
 };
 function buildRouteContext(config, currentPath = "") {
-    var _a;
     const finalConfig = { ...defaultAuthConfig, ...config };
     const hostOverride = finalConfig.hostOverride;
     currentPath =
@@ -50,7 +51,7 @@ function buildRouteContext(config, currentPath = "") {
     const excludedPaths = [
         normalize(loginUrl),
         normalize(signupUrl),
-        ...((_a = config === null || config === void 0 ? void 0 : config.excludedPaths) !== null && _a !== void 0 ? _a : []),
+        ...(config?.excludedPaths ?? []),
     ];
     try {
         if (resetPasswordUrl) {
@@ -62,15 +63,16 @@ function buildRouteContext(config, currentPath = "") {
     }
     const normalizedCurrentPath = normalize(currentPath);
     const isExcluded = excludedPaths.includes(normalizedCurrentPath);
-    const returnPath = typeof window !== "undefined"
-        ? encodeURIComponent(`${window.location.pathname}${window.location.search}`)
-        : encodeURIComponent(currentPath);
+    const returnPathRaw = typeof window !== "undefined"
+        ? `${window.location.pathname}${window.location.search}`
+        : currentPath;
     return {
         loginUrl,
         signupUrl,
         dashboardUrl,
         resetPasswordUrl,
-        returnPath,
+        returnPath: encodeURIComponent(returnPathRaw),
+        returnPathRaw,
         currentPath: normalizedCurrentPath,
         excludedPaths,
         isExcluded,
@@ -78,34 +80,38 @@ function buildRouteContext(config, currentPath = "") {
 }
 function getAbsoluteUrl(pathOrUrl, hostOverride) {
     try {
-        const url = new URL(pathOrUrl, hostOverride !== null && hostOverride !== void 0 ? hostOverride : "");
+        const url = new URL(pathOrUrl, hostOverride ?? "");
         return url.toString();
     }
     catch {
         if (typeof window !== "undefined") {
-            const base = hostOverride !== null && hostOverride !== void 0 ? hostOverride : window.location.origin;
+            const base = hostOverride ?? window.location.origin;
             return new URL(pathOrUrl.replace(/^\/+/, "/"), base).toString();
         }
         return `http://localhost${pathOrUrl.startsWith("/") ? "" : "/"}${pathOrUrl}`;
     }
 }
 function getClientToken() {
-    var _a;
     return typeof localStorage !== "undefined"
-        ? ((_a = localStorage.getItem("_ecp_auth_token")) !== null && _a !== void 0 ? _a : "")
+        ? localStorage.getItem(constants_1.AUTH_TOKEN_KEY) || ""
         : "";
 }
 function hasPermission(user, permission) {
-    var _a;
     if (!user)
         return false;
-    return ((_a = user.role.permissions) === null || _a === void 0 ? void 0 : _a.includes(permission)) || user.isSuperAdmin;
+    return user.role.permissions?.includes(permission) || user.isSuperAdmin;
 }
 function parseMessage(message) {
     return message == "fetch failed" || message == "Failed to fetch"
         ? "Please check your internet connection"
         : message;
 }
+function parseGroupId(data) {
+    const query = data
+        ?.map((id) => id ?? "null") // keep null as "null"
+        .join(",") || "";
+    return query ? `?groupIds=${encodeURIComponent(query)}` : "";
+}
 function base64UrlDecode(b64url) {
     // Replace URL-safe chars
     let base64 = b64url.replace(/-/g, "+").replace(/_/g, "/");
@@ -143,6 +149,5 @@ function getPublicTokenEnv() {
         "");
 }
 function getPrivateTokenEnv() {
-    var _a;
-    return (_a = process.env.ECP_AUTH_PRIVATE_TOKEN) !== null && _a !== void 0 ? _a : "";
+    return process.env.ECP_AUTH_PRIVATE_TOKEN ?? "";
 }

package/dist/server/index.d.ts

@@ -1,7 +1,8 @@
 export * from "./toggle-2fa";
 export * from "./reset-password";
-export * from "./users-accounts";
-export * from "./cookie";
+export * from "./user";
+export * from "./next-cookie-override";
 export * from "./server-session";
 export * from "./server-token";
 export * from "./role";
+export { hasPermission } from "../lib/utils";

package/dist/server/index.js

@@ -14,10 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasPermission = void 0;
 __exportStar(require("./toggle-2fa"), exports);
 __exportStar(require("./reset-password"), exports);
-__exportStar(require("./users-accounts"), exports);
-__exportStar(require("./cookie"), exports);
+__exportStar(require("./user"), exports);
+__exportStar(require("./next-cookie-override"), exports);
 __exportStar(require("./server-session"), exports);
 __exportStar(require("./server-token"), exports);
 __exportStar(require("./role"), exports);
+var utils_1 = require("../lib/utils");
+Object.defineProperty(exports, "hasPermission", { enumerable: true, get: function () { return utils_1.hasPermission; } });

package/dist/server/{cookie.js → next-cookie-override.js}

@@ -1,17 +1,17 @@
-"use server";
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setCookie = setCookie;
+const constants_1 = require("../lib/constants");
 async function setCookie(value) {
     try {
         // Dynamically import to avoid bundling next in non-Next environments
         const { cookies } = require("next/headers");
         const cookieStore = await cookies();
         if (!value) {
-            cookieStore.delete("_ecp_auth_token");
+            cookieStore.delete(constants_1.AUTH_TOKEN_KEY);
         }
         else {
-            cookieStore.set("_ecp_auth_token", value, {
+            cookieStore.set(constants_1.AUTH_TOKEN_KEY, value, {
                 httpOnly: true,
                 sameSite: "lax",
                 secure: process.env.NODE_ENV === "production",

package/dist/server/reset-password.js

@@ -6,8 +6,12 @@ exports.changePassword = changePassword;
 const utils_1 = require("../lib/utils");
 const api_1 = require("../lib/api");
 const error_1 = require("../lib/error");
+const constants_1 = require("../lib/constants");
 async function resetPassword(data) {
     try {
+        if (typeof window !== "undefined") {
+            throw new Error(constants_1.serverOnlyCall);
+        }
         const res = await (0, api_1.apiFactory)("/reset-password", {
             body: { ...data },
         });
@@ -22,6 +26,9 @@ async function resetPassword(data) {
 }
 async function changePassword(data) {
     try {
+        if (typeof window !== "undefined") {
+            throw new Error(constants_1.serverOnlyCall);
+        }
         const res = await (0, api_1.apiFactory)("/change-password", {
             method: "PUT",
             body: {

package/dist/server/role.d.ts

@@ -1,7 +1,5 @@
-import { Role, NewRole, FormResponse } from "../types";
-export declare function getRoles(options?: {
-    groupId: string;
-}): Promise<Role[]>;
+import { Role, NewRole, FormResponse, QueryOpts } from "../types";
+export declare function getRoles(options?: QueryOpts): Promise<Role[]>;
 export declare function addRole(role: NewRole): Promise<FormResponse<Role>>;
 export declare function updateRole(roleId: string, role: NewRole): Promise<FormResponse<Role>>;
 export declare function assignPermission(roleId: string, permissions: string[]): Promise<FormResponse<Role>>;