astro-tokenkit 1.0.9 → 1.0.11

package/dist/index.cjs

@@ -415,13 +415,23 @@ class TokenManager {
     /**
      * Perform login
      */
-    login(ctx, credentials, onLogin) {
+    login(ctx, credentials, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = this.baseURL + this.config.login;
+            const contentType = this.config.contentType || 'application/json';
+            const headers = Object.assign(Object.assign({ 'Content-Type': contentType }, this.config.headers), options === null || options === void 0 ? void 0 : options.headers);
+            const data = Object.assign(Object.assign(Object.assign({}, this.config.loginData), options === null || options === void 0 ? void 0 : options.data), credentials);
+            let requestBody;
+            if (contentType === 'application/x-www-form-urlencoded') {
+                requestBody = new URLSearchParams(data).toString();
+            }
+            else {
+                requestBody = JSON.stringify(data);
+            }
             const response = yield fetch(url, {
                 method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(credentials),
+                headers,
+                body: requestBody,
             }).catch(error => {
                 throw new AuthError(`Login request failed: ${error.message}`);
             });
@@ -442,8 +452,8 @@ class TokenManager {
             // Store in cookies
             storeTokens(ctx, bundle, this.config.cookies);
             // Call onLogin callback if provided
-            if (onLogin) {
-                yield onLogin(bundle, body, ctx);
+            if (options === null || options === void 0 ? void 0 : options.onLogin) {
+                yield options.onLogin(bundle, body, ctx);
             }
             return bundle;
         });
@@ -451,10 +461,10 @@ class TokenManager {
     /**
      * Perform token refresh
      */
-    refresh(ctx, refreshToken) {
+    refresh(ctx, refreshToken, options, headers) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.performRefresh(ctx, refreshToken);
+                return yield this.performRefresh(ctx, refreshToken, options, headers);
             }
             catch (error) {
                 clearTokens(ctx, this.config.cookies);
@@ -465,13 +475,24 @@ class TokenManager {
     /**
      * Internal refresh implementation
      */
-    performRefresh(ctx, refreshToken) {
+    performRefresh(ctx, refreshToken, options, extraHeaders) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = this.baseURL + this.config.refresh;
+            const contentType = this.config.contentType || 'application/json';
+            const headers = Object.assign(Object.assign({ 'Content-Type': contentType }, this.config.headers), extraHeaders);
+            const refreshField = this.config.refreshRequestField || 'refreshToken';
+            const data = Object.assign(Object.assign(Object.assign({}, this.config.refreshData), options === null || options === void 0 ? void 0 : options.data), { [refreshField]: refreshToken });
+            let requestBody;
+            if (contentType === 'application/x-www-form-urlencoded') {
+                requestBody = new URLSearchParams(data).toString();
+            }
+            else {
+                requestBody = JSON.stringify(data);
+            }
             const response = yield fetch(url, {
                 method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ refreshToken }),
+                headers,
+                body: requestBody,
             }).catch(error => {
                 throw new AuthError(`Refresh request failed: ${error.message}`);
             });
@@ -506,7 +527,7 @@ class TokenManager {
     /**
      * Ensure valid tokens (with automatic refresh)
      */
-    ensure(ctx) {
+    ensure(ctx, options, headers) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e;
             const now = Math.floor(Date.now() / 1000);
@@ -518,7 +539,7 @@ class TokenManager {
             // Token expired
             if (isExpired(tokens.expiresAt, now, this.config.policy)) {
                 const flightKey = this.createFlightKey(tokens.refreshToken);
-                const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken));
+                const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken, options, headers));
                 if (!bundle)
                     return null;
                 return {
@@ -530,7 +551,7 @@ class TokenManager {
             // Proactive refresh
             if (shouldRefresh(tokens.expiresAt, now, tokens.lastRefreshAt, this.config.policy)) {
                 const flightKey = this.createFlightKey(tokens.refreshToken);
-                const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken));
+                const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken, options, headers));
                 if (bundle) {
                     return {
                         accessToken: bundle.accessToken,
@@ -611,6 +632,7 @@ class TokenManager {
 let config = {
     runWithContext: undefined,
     getContextStore: undefined,
+    setContextStore: undefined,
     baseURL: "",
 };
 let tokenManager;
@@ -618,8 +640,13 @@ let tokenManager;
  * Set configuration
  */
 function setConfig(userConfig) {
-    // Store validated config
-    config = Object.assign(Object.assign({}, config), userConfig);
+    const finalConfig = Object.assign(Object.assign({}, config), userConfig);
+    // Validate that getter and setter are defined together
+    if ((finalConfig.getContextStore && !finalConfig.setContextStore) ||
+        (!finalConfig.getContextStore && finalConfig.setContextStore)) {
+        throw new Error("[TokenKit] getContextStore and setContextStore must be defined together.");
+    }
+    config = finalConfig;
     // Re-initialize global token manager if auth changed
     if (config.auth) {
         tokenManager = new TokenManager(config.auth, config.baseURL);
@@ -663,20 +690,17 @@ function runWithContext(ctx, fn) {
 /**
  * Get current Astro context (from middleware binding or explicit)
  */
-function getContextStore(explicitCtx) {
+function getContextStore() {
     const config = getConfig();
     const getStore = config.getContextStore;
     const context = config.context || als;
     const store = getStore
         ? getStore()
         : context.getStore();
-    const ctx = explicitCtx || store;
-    if (!ctx) {
-        throw new Error('Astro context not found. Either:\n' +
-            '1. Use api.middleware() to bind context automatically, or\n' +
-            '2. Pass context explicitly: api.get("/path", { ctx: Astro })');
+    if (!store) {
+        throw new Error('Astro context not found. Make sure to use api.middleware() to bind context automatically.');
     }
-    return ctx;
+    return store;
 }
 
 // packages/astro-tokenkit/src/utils/retry.ts
@@ -731,14 +755,14 @@ function createMiddleware() {
         const tokenManager = getTokenManager();
         const config = getConfig();
         const runLogic = () => __awaiter(this, void 0, void 0, function* () {
-            // Proactively ensure valid session if auth is configured
+            // Proactively ensure a valid session if auth is configured
             if (tokenManager) {
                 try {
                     // This handles token rotation (refresh) if needed
                     yield tokenManager.ensure(ctx);
                 }
                 catch (error) {
-                    // Log but don't block request if rotation fails
+                    // Log but don't block a request if rotation fails
                     console.error('[TokenKit] Automatic token rotation failed:', error);
                 }
             }
@@ -748,13 +772,14 @@ function createMiddleware() {
         // We skip runWithContext to avoid nesting ALS.run() unnecessarily,
         // UNLESS a custom runWithContext is provided.
         if (config.getContextStore && !config.runWithContext) {
-            const storage = config.getContextStore();
-            if (storage) {
+            let storage = config.getContextStore();
+            if (storage)
+                // Update existing reference
                 storage.cookies = ctx.cookies;
-            }
-            else {
-                console.error("[TokenKit] getContextStore returned null or undefined");
-            }
+            else if (config.setContextStore)
+                config.setContextStore({ cookies: ctx.cookies });
+            else
+                console.error("[TokenKit] getContextStore returned null or undefined and no setter was found");
             return runLogic();
         }
         const runner = (_a = config.runWithContext) !== null && _a !== void 0 ? _a : runWithContext;
@@ -862,7 +887,7 @@ class APIClient {
      */
     request(config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ctx = getContextStore(config.ctx);
+            const ctx = getContextStore();
             let attempt = 0;
             while (true) {
                 attempt++;
@@ -891,7 +916,7 @@ class APIClient {
             var _a, _b, _c, _d, _e;
             // Ensure valid session (if auth is enabled)
             if (this.tokenManager && !config.skipAuth) {
-                yield this.tokenManager.ensure(ctx);
+                yield this.tokenManager.ensure(ctx, config.auth, config.headers);
             }
             // Build full URL
             const fullURL = this.buildURL(config.url, config.params);
@@ -924,7 +949,7 @@ class APIClient {
                 // Handle 401 (try refresh and retry once)
                 if (response.status === 401 && this.tokenManager && !config.skipAuth && attempt === 1) {
                     // Clear and try fresh session
-                    const session = yield this.tokenManager.ensure(ctx);
+                    const session = yield this.tokenManager.ensure(ctx, config.auth, config.headers);
                     if (session) {
                         // Retry with new token
                         return this.executeRequest(config, ctx, attempt + 1);
@@ -1035,48 +1060,38 @@ class APIClient {
             if (!this.tokenManager) {
                 throw new Error('Auth is not configured for this client');
             }
-            let ctx;
-            let onLogin;
-            if (options && 'cookies' in options) {
-                ctx = options;
-            }
-            else if (options) {
-                const opt = options;
-                ctx = opt.ctx;
-                onLogin = opt.onLogin;
-            }
-            const context = getContextStore(ctx);
-            yield this.tokenManager.login(context, credentials, onLogin);
+            const context = getContextStore();
+            yield this.tokenManager.login(context, credentials, options);
         });
     }
     /**
      * Logout
      */
-    logout(ctx) {
+    logout() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.tokenManager) {
                 throw new Error('Auth is not configured for this client');
             }
-            const context = getContextStore(ctx);
+            const context = getContextStore();
             yield this.tokenManager.logout(context);
         });
     }
     /**
      * Check if authenticated
      */
-    isAuthenticated(ctx) {
+    isAuthenticated() {
         if (!this.tokenManager)
             return false;
-        const context = getContextStore(ctx);
+        const context = getContextStore();
         return this.tokenManager.isAuthenticated(context);
     }
     /**
      * Get current session
      */
-    getSession(ctx) {
+    getSession() {
         if (!this.tokenManager)
             return null;
-        const context = getContextStore(ctx);
+        const context = getContextStore();
         return this.tokenManager.getSession(context);
     }
 }
@@ -1150,8 +1165,10 @@ exports.createMiddleware = createMiddleware;
 exports.defineMiddleware = defineMiddleware;
 exports.formatTime = formatTime;
 exports.getConfig = getConfig;
+exports.getContextStore = getContextStore;
 exports.getTokenManager = getTokenManager;
 exports.parseTime = parseTime;
+exports.runWithContext = runWithContext;
 exports.setConfig = setConfig;
 exports.setTokenManager = setTokenManager;
 exports.tokenKit = tokenKit;