feat(middleware): allow functional url and custom request method in a…

…uth middleware
glebcha · Nov 29, 2023 · 4a06d67 · 4a06d67
1 parent 0910faf
commit 4a06d67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/middleware/auth/authMiddleware.ts b/src/middleware/auth/authMiddleware.ts
@@ -6,20 +6,22 @@ import { AuthMiddlewareParams } from './types';
 export function initAuthMiddleware(initParams: AuthMiddlewareParams) {
   const {
     url,
+    method = 'get',
     errorCodes = [401],
     getTokens,
     setTokens,
     getHeaders,
     handleAuthError,
   } = initParams;
+  const sanitizedUrl = typeof url === 'function' ? url() : url;
 
   return async (...params: Parameters<MiddlewareHandler>) => {
     const [options, meta] = params;
     const currentSessionTokens = getTokens();
     const headers =
       typeof getHeaders === 'function' ?
         getHeaders(meta) :
-        { Authorization: `Bearer ${currentSessionTokens.accessToken}` };
+        { Authorization: `Bearer ${currentSessionTokens.refreshToken}` };
     const shouldProcessAuth = errorCodes.some(errorCode => errorCode === meta.status);
 
     if (shouldProcessAuth) {
@@ -32,7 +34,7 @@ export function initAuthMiddleware(initParams: AuthMiddlewareParams) {
           // eslint-disable-next-line no-console
           () => console.warn('Failed to refresh authorization token');
 
-      return fetch(url, { method: 'post', body, headers })
+      return fetch(sanitizedUrl, { method, body, headers })
         .then(async (response) => {
           const tokens = await response.json().catch(() => null) as ReturnType<AuthMiddlewareParams['getTokens']> | null;
           const { accessToken } = getTokens(tokens);

diff --git a/src/middleware/auth/types.d.ts b/src/middleware/auth/types.d.ts
@@ -1,5 +1,6 @@
 export interface AuthMiddlewareParams {
-  url: string;
+  url: string | (() => string);
+  method?: RequestInit['method'];
   errorCodes?: Response['status'][];
   getTokens: (tokens?: unknown) => { accessToken: string; refreshToken: string };
   setTokens: (tokens?: unknown) => void;