@ethlete/query 0.1.0-next.18 → 0.1.0-next.19

package/fesm2020/ethlete-query.mjs

@@ -621,7 +621,8 @@ class BearerAuthProvider {
             token: null,
             refreshToken: null,
         });
-        const cookieToken = _config.refreshConfig?.cookieName ? getCookie(_config.refreshConfig.cookieName) ?? null : null;
+        const cookieEnabled = _config.refreshConfig?.cookieEnabled ?? true;
+        const cookieToken = _config.refreshConfig?.cookieName && cookieEnabled ? getCookie(_config.refreshConfig.cookieName) ?? null : null;
         this._tokens$.next({
             token: _config.token || null,
             refreshToken: _config.refreshConfig?.token || cookieToken || null,
@@ -650,6 +651,23 @@ class BearerAuthProvider {
             deleteCookie(this._config.refreshConfig.cookieName, '/');
         }
     }
+    enableCookie() {
+        if (!this._config.refreshConfig?.cookieName) {
+            throw new Error('No cookie name was provided');
+        }
+        if (!this.tokens.refreshToken) {
+            throw new Error('No refresh token was provided');
+        }
+        this._config.refreshConfig.cookieEnabled = true;
+        setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
+    }
+    disableCookie() {
+        if (!this._config.refreshConfig?.cookieName) {
+            throw new Error('No cookie name was provided');
+        }
+        this._config.refreshConfig.cookieEnabled = false;
+        deleteCookie(this._config.refreshConfig.cookieName, '/');
+    }
     _prepareForRefresh() {
         if (!this.tokens.token || !this._config.refreshConfig) {
             return;
@@ -676,11 +694,15 @@ class BearerAuthProvider {
         }
     }
     _refreshQuery() {
-        if (!this.tokens.refreshToken || !this._config.refreshConfig) {
+        const currentRefreshToken = this.tokens.refreshToken;
+        if (!currentRefreshToken || !this._config.refreshConfig) {
             return;
         }
-        const args = this._config.refreshConfig.requestArgsAdapter?.(this.tokens) ?? {
-            body: { refreshToken: this.tokens.refreshToken },
+        const args = this._config.refreshConfig.requestArgsAdapter?.({
+            token: this.tokens.token,
+            refreshToken: currentRefreshToken,
+        }) ?? {
+            body: { refreshToken: currentRefreshToken },
         };
         const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });
         this._currentRefreshQuery$.next(query);
@@ -697,7 +719,8 @@ class BearerAuthProvider {
                         refreshToken: state.response['refreshToken'],
                     });
                 }
-                if (this._config.refreshConfig?.cookieName && this.tokens.refreshToken) {
+                const cookieEnabled = this._config.refreshConfig?.cookieEnabled ?? true;
+                if (this._config.refreshConfig?.cookieName && this.tokens.refreshToken && cookieEnabled) {
                     setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
                 }
                 this._prepareForRefresh();
@@ -991,7 +1014,7 @@ class InfinityQueryDirective {
             itemsPerPage: null,
         };
         this._infinityQueryInstance = null;
-        this._destroy$ = inject(DestroyService).destroy$;
+        this._destroy$ = inject(DestroyService, { self: true }).destroy$;
         this._cdr = inject(ChangeDetectorRef);
         this._viewContainerRef = inject(ViewContainerRef);
         this._mainTemplateRef = inject((TemplateRef));