npm - @ethlete/query - Versions diffs - 0.1.0-next.17 → 0.1.0-next.18 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/esm2020/lib/auth/auth-provider.types.mjs +1 -1
package/esm2020/lib/auth/bearer-auth-provider.mjs +39 -21
package/fesm2015/ethlete-query.mjs +41 -23
package/fesm2015/ethlete-query.mjs.map +1 -1
package/fesm2020/ethlete-query.mjs +39 -21
package/fesm2020/ethlete-query.mjs.map +1 -1
package/lib/auth/auth-provider.types.d.ts +4 -4
package/lib/auth/bearer-auth-provider.d.ts +4 -3
package/package.json +1 -1

package/esm2020/lib/auth/auth-provider.types.mjs CHANGED Viewed

@@ -1,2 +1,2 @@
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1wcm92aWRlci50eXBlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvcXVlcnkvc3JjL2xpYi9hdXRoL2F1dGgtcHJvdmlkZXIudHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFF1ZXJ5UmVzcG9uc2VUeXBlIH0gZnJvbSAnLi4vcXVlcnknO1xuaW1wb3J0IHsgQW55UXVlcnlDcmVhdG9yLCBRdWVyeUNyZWF0b3JBcmdzLCBRdWVyeUNyZWF0b3JSZXR1cm5UeXBlIH0gZnJvbSAnLi4vcXVlcnktY2xpZW50JztcblxuZXhwb3J0IGludGVyZmFjZSBBdXRoUHJvdmlkZXIge1xuICAvKipcbiAgICogVGhlIHVwIHRvIGRhdGUgYXV0aCBoZWFkZXIuXG4gICAqIFRoaXMgd2lsbCBhdXRvbWF0aWNhbGx5IGdldCBpbmplY3RlZCBpbnRvIGV2ZXJ5IHF1ZXJ5IHRoYXQgaGFzIHRoZSBgc2VjdXJlYCBwcm9wZXJ0eSBzZXQgdG8gYHRydWVgLlxuICAgKi9cbiAgaGVhZGVyOiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuXG4gIC8qKlxuICAgKiBDbGVhbnVwIGZ1bmN0aW9uIHRoYXQgZ2V0cyBjYWxsZWQgb25jZSB0aGUgYXV0aCBwcm92aWRlciBnZXRzIGRlc3Ryb3llZC5cbiAgICogQGludGVybmFsXG4gICAqL1xuICBjbGVhblVwKCk6IHZvaWQ7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQXV0aFByb3ZpZGVyQmFzaWNDb25maWcge1xuICAvKipcbiAgICogQmFzaWMgYXV0aCB1c2VybmFtZVxuICAgKi9cbiAgdXNlcm5hbWU6IHN0cmluZztcblxuICAvKipcbiAgICogQmFzaWMgYXV0aCBwYXNzd29yZFxuICAgKi9cbiAgcGFzc3dvcmQ6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBBdXRoUHJvdmlkZXJDdXN0b21IZWFkZXJDb25maWcge1xuICAvKipcbiAgICogVGhlIGN1c3RvbSBoZWFkZXIgbmFtZVxuICAgKiBAZXhhbXBsZSBgWC1BcGktS2V5YFxuICAgKi9cbiAgbmFtZTogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBUaGUgY3VzdG9tIGhlYWRlciB2YWx1ZVxuICAgKiBAZXhhbXBsZSBgbXlBcGlLZXlgXG4gICAqL1xuICB2YWx1ZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEF1dGhQcm92aWRlckJlYXJlckNvbmZpZzxUIGV4dGVuZHMgQW55UXVlcnlDcmVhdG9yPiB7XG4gIC8qKlxuICAgKiBUaGUgaW5pdGlhbCBqd3RcbiAgICovXG4gIHRva2VuPzogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBSZWZyZXNoIHRva2VuIGNvbmZpZ3VyYXRpb25cbiAgICovXG4gIHJlZnJlc2hDb25maWc/OiBCZWFyZXJSZWZyZXNoQ29uZmlnPFQ+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEJlYXJlclJlZnJlc2hDb25maWc8VCBleHRlbmRzIEFueVF1ZXJ5Q3JlYXRvcj4ge1xuICAvKipcbiAgICogVGhlIHF1ZXJ5IHVzZWQgdG8gdHJhZGUgdGhlIHJlZnJlc2ggdG9rZW4gZm9yIGEgbmV3IHRva2VuIHJlc3BvbnNlLlxuICAgKi9cbiAgcXVlcnlDcmVhdG9yOiBUO1xuXG4gIC8qKlxuICAgKiBUaGUgaW5pdGlhbCByZWZyZXNoIHRva2VuXG4gICAqL1xuICB0b2tlbj86IHN0cmluZztcblxuICAvKipcbiAgICogVGhlIGNvb2tpZSBuYW1lIHdoZXJlIHRoZSByZWZyZXNoIHRva2VuIGlzIHN0b3JlZFxuICAgKi9cbiAgY29va2llTmFtZT86IHN0cmluZztcblxuICAvKipcbiAgICogVGhlIHRpbWUgaW4gbWlsbGlzZWNvbmRzIGJlZm9yZSB0aGUgdG9rZW4gZXhwaXJlcyB3aGVuIHRoZSByZWZyZXNoIHNob3VsZCBiZSB0cmlnZ2VyZWQuXG4gICAqIEBkZWZhdWx0IDMwMDAwMCAoNSBtaW51dGVzKVxuICAgKi9cbiAgcmVmcmVzaEJ1ZmZlcj86IG51bWJlcjtcblxuICAvKipcbiAgICogVGhlIGV4cGlyZXMgaW4gcHJvcGVydHkgbmFtZSBpbnNpZGUgdGhlIGp3dCBib2R5XG4gICAqIEBkZWZhdWx0ICdleHAnXG4gICAqL1xuICBleHBpcmVzSW5Qcm9wZXJ0eU5hbWU/OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIERldGVybWluZXMgd2hlbiB0aGUgdG9rZW4gc2hvdWxkIGJlIHJlZnJlc2hlZC5cbiAgICogQGRlZmF1bHQgQXV0aEJlYXJlclJlZnJlc2hTdHJhdGVneS5CZWZvcmVFeHBpcmF0aW9uXG4gICAqL1xuICBzdHJhdGVneT86IEF1dGhCZWFyZXJSZWZyZXNoU3RyYXRlZ3k7XG5cbiAgLyoqXG4gICAqIEFkYXB0ZXIgZnVuY3Rpb24gdXNlZCB0byBidWlsZCB0aGUgcmVxdWVzdCBib2R5IGZvciB0aGUgcmVmcmVzaCByZXF1ZXN0LlxuICAgKiBAZGVmYXVsdCB7IGJvZHk6IHsgcmVmcmVzaFRva2VuOiBcInJlZnJlc2hUb2tlblwiIH0gfVxuICAgKi9cbiAgcmVxdWVzdEFyZ3NBZGFwdGVyPzogKHJlZnJlc2hUb2tlbjogc3RyaW5nLCB0b2tlbjogc3RyaW5nIHwgbnVsbCkgPT4gUXVlcnlDcmVhdG9yQXJnczxUPjtcblxuICAvKipcbiAgICogQWRhcHRlciBmdW5jdGlvbiB1c2VkIHRvIGV4dHJhY3QgdGhlIHRva2VuIGFuZCByZWZyZXNoVG9rZW4gZnJvbSB0aGUgcmVzcG9uc2UuXG4gICAqIEBkZWZhdWx0IHsgdG9rZW46IFwidG9rZW5cIiwgcmVmcmVzaFRva2VuOiBcInJlZnJlc2hUb2tlblwiIH1cbiAgICovXG4gIHJlc3BvbnNlQWRhcHRlcj86IChyZXNwb25zZTogUXVlcnlSZXNwb25zZVR5cGU8UXVlcnlDcmVhdG9yUmV0dXJuVHlwZTxUPj4pID0+IFRva2VuUmVzcG9uc2U7XG59XG5cbmV4cG9ydCBjb25zdCBlbnVtIEF1dGhCZWFyZXJSZWZyZXNoU3RyYXRlZ3kge1xuICAvKipcbiAgICogQXV0b21hdGljYWxseSByZWZyZXNoIHRoZSB0b2tlbiA1IG1pbnV0ZXMgYmVmb3JlIGV4cGlyYXRpb24uXG4gICAqL1xuICBCZWZvcmVFeHBpcmF0aW9uID0gJ2JlZm9yZUV4cGlyYXRpb24nLFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIFRva2VuUmVzcG9uc2Uge1xuICAvKipcbiAgICogVGhlIGFjY2VzcyB0b2tlbiB1c2VkIGluc2lkZSB0aGUgYXV0aG9yaXphdGlvbiBodHRwIGhlYWRlci5cbiAgICovXG4gIHRva2VuOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFRoZSByZWZyZXNoIHRva2VuIHVzZWQgZm9yIHJlcXVlc3RpbmcgYSBuZXcgdG9rZW4gcmVzcG9uc2Ugb25jZSB0aGUgY3VycmVudCB0b2tlcyBpcyBleHBpcmVkLlxuICAgKiBUaGlzIHByb3BlcnR5IGlzIHJlcXVpcmVkIGlmIHRoZSBiZWFyZXIgcmVmcmVzaCBjb25maWcgaXMgc2V0LlxuICAgKi9cbiAgcmVmcmVzaFRva2VuPzogc3RyaW5nO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1wcm92aWRlci50eXBlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvcXVlcnkvc3JjL2xpYi9hdXRoL2F1dGgtcHJvdmlkZXIudHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFF1ZXJ5UmVzcG9uc2VUeXBlIH0gZnJvbSAnLi4vcXVlcnknO1xuaW1wb3J0IHsgQW55UXVlcnlDcmVhdG9yLCBRdWVyeUNyZWF0b3JBcmdzLCBRdWVyeUNyZWF0b3JSZXR1cm5UeXBlIH0gZnJvbSAnLi4vcXVlcnktY2xpZW50JztcblxuZXhwb3J0IGludGVyZmFjZSBBdXRoUHJvdmlkZXIge1xuICAvKipcbiAgICogVGhlIHVwIHRvIGRhdGUgYXV0aCBoZWFkZXIuXG4gICAqIFRoaXMgd2lsbCBhdXRvbWF0aWNhbGx5IGdldCBpbmplY3RlZCBpbnRvIGV2ZXJ5IHF1ZXJ5IHRoYXQgaGFzIHRoZSBgc2VjdXJlYCBwcm9wZXJ0eSBzZXQgdG8gYHRydWVgLlxuICAgKi9cbiAgaGVhZGVyOiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuXG4gIC8qKlxuICAgKiBDbGVhbnVwIGZ1bmN0aW9uIHRoYXQgZ2V0cyBjYWxsZWQgb25jZSB0aGUgYXV0aCBwcm92aWRlciBnZXRzIGRlc3Ryb3llZC5cbiAgICogQGludGVybmFsXG4gICAqL1xuICBjbGVhblVwKCk6IHZvaWQ7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQXV0aFByb3ZpZGVyQmFzaWNDb25maWcge1xuICAvKipcbiAgICogQmFzaWMgYXV0aCB1c2VybmFtZVxuICAgKi9cbiAgdXNlcm5hbWU6IHN0cmluZztcblxuICAvKipcbiAgICogQmFzaWMgYXV0aCBwYXNzd29yZFxuICAgKi9cbiAgcGFzc3dvcmQ6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBBdXRoUHJvdmlkZXJDdXN0b21IZWFkZXJDb25maWcge1xuICAvKipcbiAgICogVGhlIGN1c3RvbSBoZWFkZXIgbmFtZVxuICAgKiBAZXhhbXBsZSBgWC1BcGktS2V5YFxuICAgKi9cbiAgbmFtZTogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBUaGUgY3VzdG9tIGhlYWRlciB2YWx1ZVxuICAgKiBAZXhhbXBsZSBgbXlBcGlLZXlgXG4gICAqL1xuICB2YWx1ZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEF1dGhQcm92aWRlckJlYXJlckNvbmZpZzxUIGV4dGVuZHMgQW55UXVlcnlDcmVhdG9yPiB7XG4gIC8qKlxuICAgKiBUaGUgaW5pdGlhbCBqd3RcbiAgICovXG4gIHRva2VuPzogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBSZWZyZXNoIHRva2VuIGNvbmZpZ3VyYXRpb25cbiAgICovXG4gIHJlZnJlc2hDb25maWc/OiBCZWFyZXJSZWZyZXNoQ29uZmlnPFQ+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEJlYXJlclJlZnJlc2hDb25maWc8VCBleHRlbmRzIEFueVF1ZXJ5Q3JlYXRvcj4ge1xuICAvKipcbiAgICogVGhlIHF1ZXJ5IHVzZWQgdG8gdHJhZGUgdGhlIHJlZnJlc2ggdG9rZW4gZm9yIGEgbmV3IHRva2VuIHJlc3BvbnNlLlxuICAgKi9cbiAgcXVlcnlDcmVhdG9yOiBUO1xuXG4gIC8qKlxuICAgKiBUaGUgaW5pdGlhbCByZWZyZXNoIHRva2VuXG4gICAqL1xuICB0b2tlbj86IHN0cmluZztcblxuICAvKipcbiAgICogVGhlIGNvb2tpZSBuYW1lIHdoZXJlIHRoZSByZWZyZXNoIHRva2VuIGlzIHN0b3JlZFxuICAgKi9cbiAgY29va2llTmFtZT86IHN0cmluZztcblxuICAvKipcbiAgICogVGhlIHRpbWUgaW4gbWlsbGlzZWNvbmRzIGJlZm9yZSB0aGUgdG9rZW4gZXhwaXJlcyB3aGVuIHRoZSByZWZyZXNoIHNob3VsZCBiZSB0cmlnZ2VyZWQuXG4gICAqIEBkZWZhdWx0IDMwMDAwMCAoNSBtaW51dGVzKVxuICAgKi9cbiAgcmVmcmVzaEJ1ZmZlcj86IG51bWJlcjtcblxuICAvKipcbiAgICogVGhlIGV4cGlyZXMgaW4gcHJvcGVydHkgbmFtZSBpbnNpZGUgdGhlIGp3dCBib2R5XG4gICAqIEBkZWZhdWx0ICdleHAnXG4gICAqL1xuICBleHBpcmVzSW5Qcm9wZXJ0eU5hbWU/OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIERldGVybWluZXMgd2hlbiB0aGUgdG9rZW4gc2hvdWxkIGJlIHJlZnJlc2hlZC5cbiAgICogQGRlZmF1bHQgQXV0aEJlYXJlclJlZnJlc2hTdHJhdGVneS5CZWZvcmVFeHBpcmF0aW9uXG4gICAqL1xuICBzdHJhdGVneT86IEF1dGhCZWFyZXJSZWZyZXNoU3RyYXRlZ3k7XG5cbiAgLyoqXG4gICAqIEFkYXB0ZXIgZnVuY3Rpb24gdXNlZCB0byBidWlsZCB0aGUgcmVxdWVzdCBib2R5IGZvciB0aGUgcmVmcmVzaCByZXF1ZXN0LlxuICAgKiBAZGVmYXVsdCB7IGJvZHk6IHsgcmVmcmVzaFRva2VuOiBcInJlZnJlc2hUb2tlblwiIH0gfVxuICAgKi9cbiAgcmVxdWVzdEFyZ3NBZGFwdGVyPzogKHRva2VuczogVG9rZW5SZXNwb25zZSkgPT4gUXVlcnlDcmVhdG9yQXJnczxUPjtcblxuICAvKipcbiAgICogQWRhcHRlciBmdW5jdGlvbiB1c2VkIHRvIGV4dHJhY3QgdGhlIHRva2VuIGFuZCByZWZyZXNoVG9rZW4gZnJvbSB0aGUgcmVzcG9uc2UuXG4gICAqIEBkZWZhdWx0IHsgdG9rZW46IFwidG9rZW5cIiwgcmVmcmVzaFRva2VuOiBcInJlZnJlc2hUb2tlblwiIH1cbiAgICovXG4gIHJlc3BvbnNlQWRhcHRlcj86IChyZXNwb25zZTogTm9uTnVsbGFibGU8UXVlcnlSZXNwb25zZVR5cGU8UXVlcnlDcmVhdG9yUmV0dXJuVHlwZTxUPj4+KSA9PiBUb2tlblJlc3BvbnNlO1xufVxuXG5leHBvcnQgY29uc3QgZW51bSBBdXRoQmVhcmVyUmVmcmVzaFN0cmF0ZWd5IHtcbiAgLyoqXG4gICAqIEF1dG9tYXRpY2FsbHkgcmVmcmVzaCB0aGUgdG9rZW4gNSBtaW51dGVzIGJlZm9yZSBleHBpcmF0aW9uLlxuICAgKi9cbiAgQmVmb3JlRXhwaXJhdGlvbiA9ICdiZWZvcmVFeHBpcmF0aW9uJyxcbn1cblxuZXhwb3J0IGludGVyZmFjZSBUb2tlblJlc3BvbnNlIHtcbiAgLyoqXG4gICAqIFRoZSBhY2Nlc3MgdG9rZW4gdXNlZCBpbnNpZGUgdGhlIGF1dGhvcml6YXRpb24gaHR0cCBoZWFkZXIuXG4gICAqL1xuICB0b2tlbjogc3RyaW5nIHwgbnVsbDtcblxuICAvKipcbiAgICogVGhlIHJlZnJlc2ggdG9rZW4gdXNlZCBmb3IgcmVxdWVzdGluZyBhIG5ldyB0b2tlbiByZXNwb25zZSBvbmNlIHRoZSBjdXJyZW50IHRva2VzIGlzIGV4cGlyZWQuXG4gICAqIFRoaXMgcHJvcGVydHkgaXMgcmVxdWlyZWQgaWYgdGhlIGJlYXJlciByZWZyZXNoIGNvbmZpZyBpcyBzZXQuXG4gICAqL1xuICByZWZyZXNoVG9rZW46IHN0cmluZyB8IG51bGw7XG59XG4iXX0=

package/esm2020/lib/auth/bearer-auth-provider.mjs CHANGED Viewed

@@ -4,7 +4,13 @@ import { isQueryStateFailure, isQueryStateSuccess, switchQueryState, takeUntilRe
 import { decryptBearer } from './auth-provider.utils';
 export class BearerAuthProvider {
     get header() {
-        return { Authorization: `Bearer ${this._token}` };
+        return { Authorization: `Bearer ${this._tokens$.getValue().token}` };
+    }
+    get tokens$() {
+        return this._tokens$.asObservable();
+    }
+    get tokens() {
+        return this._tokens$.getValue();
     }
     get currentRefreshQuery$() {
         return this._currentRefreshQuery$.asObservable();
@@ -16,18 +22,30 @@ export class BearerAuthProvider {
         this._config = _config;
         this._destroy$ = new Subject();
         this._currentRefreshQuery$ = new BehaviorSubject(null);
-        this._token = null;
-        this._refreshToken = null;
+        this._tokens$ = new BehaviorSubject({
+            token: null,
+            refreshToken: null,
+        });
         const cookieToken = _config.refreshConfig?.cookieName ? getCookie(_config.refreshConfig.cookieName) ?? null : null;
-        this._token = _config.token || null;
-        this._refreshToken = _config.refreshConfig?.token || cookieToken || null;
-        if (!this._token && !this._refreshToken) {
+        this._tokens$.next({
+            token: _config.token || null,
+            refreshToken: _config.refreshConfig?.token || cookieToken || null,
+        });
+        if (!this.tokens.token && !this.tokens.refreshToken) {
             if (!_config.refreshConfig?.cookieName) {
                 console.error('A BearerAuthProvider was created without token or refresh token. You should provide at least a cookieName where the refresh token might be stored.');
             }
             return;
         }
-        this._prepareForRefresh();
+        if (this.tokens.token) {
+            this._prepareForRefresh();
+            if (this.tokens.refreshToken && this._config.refreshConfig?.cookieName) {
+                setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
+            }
+        }
+        else if (this.tokens.refreshToken) {
+            this._refreshQuery();
+        }
     }
     cleanUp() {
         this._destroy$.next(true);
@@ -38,10 +56,10 @@ export class BearerAuthProvider {
         }
     }
     _prepareForRefresh() {
-        if (!this._token || !this._config.refreshConfig) {
+        if (!this.tokens.token || !this._config.refreshConfig) {
             return;
         }
-        const bearer = decryptBearer(this._token);
+        const bearer = decryptBearer(this.tokens.token);
         if (!bearer) {
             return;
         }
@@ -63,11 +81,11 @@ export class BearerAuthProvider {
         }
     }
     _refreshQuery() {
-        if (!this._refreshToken || !this._config.refreshConfig?.queryCreator) {
+        if (!this.tokens.refreshToken || !this._config.refreshConfig) {
             return;
         }
-        const args = this._config.refreshConfig.requestArgsAdapter?.(this._refreshToken, this._token) ?? {
-            body: { refreshToken: this._refreshToken },
+        const args = this._config.refreshConfig.requestArgsAdapter?.(this.tokens) ?? {
+            body: { refreshToken: this.tokens.refreshToken },
         };
         const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });
         this._currentRefreshQuery$.next(query);
@@ -76,21 +94,21 @@ export class BearerAuthProvider {
             if (isQueryStateSuccess(state)) {
                 if (this._config.refreshConfig?.responseAdapter) {
                     const tokens = this._config.refreshConfig.responseAdapter(state.response);
-                    this._token = tokens.token;
-                    this._refreshToken = tokens.refreshToken || null;
+                    this._tokens$.next(tokens);
                 }
                 else {
-                    this._token = state.response['token'];
-                    this._refreshToken = state.response['refreshToken'];
+                    this._tokens$.next({
+                        token: state.response['token'],
+                        refreshToken: state.response['refreshToken'],
+                    });
                 }
-                if (this._config.refreshConfig?.cookieName && this._refreshToken) {
-                    setCookie(this._config.refreshConfig.cookieName, this._refreshToken);
+                if (this._config.refreshConfig?.cookieName && this.tokens.refreshToken) {
+                    setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
                 }
                 this._prepareForRefresh();
             }
             else if (isQueryStateFailure(state)) {
-                this._token = null;
-                this._refreshToken = null;
+                this._tokens$.next({ token: null, refreshToken: null });
                 if (this._config.refreshConfig?.cookieName) {
                     deleteCookie(this._config.refreshConfig.cookieName, '/');
                 }
@@ -99,4 +117,4 @@ export class BearerAuthProvider {
             .subscribe();
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bearer-auth-provider.js","sourceRoot":"","sources":["../../../../../../libs/query/src/lib/auth/bearer-auth-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { deleteCookie, getCookie, setCookie } from '@ethlete/core';\nimport { BehaviorSubject, Subject, takeUntil, tap, timer } from 'rxjs';\nimport { isQueryStateFailure, isQueryStateSuccess, switchQueryState, takeUntilResponse } from '../query';\nimport { AnyQueryCreator, QueryCreatorReturnType } from '../query-client';\nimport { AuthBearerRefreshStrategy, AuthProvider, AuthProviderBearerConfig } from './auth-provider.types';\nimport { decryptBearer } from './auth-provider.utils';\n\nexport class BearerAuthProvider<T extends AnyQueryCreator> implements AuthProvider {\n  private readonly _destroy$ = new Subject<boolean>();\n  private readonly _currentRefreshQuery$ = new BehaviorSubject<QueryCreatorReturnType<T> | null>(null);\n\n  private _token: string | null = null;\n  private _refreshToken: string | null = null;\n\n  get header() {\n    return { Authorization: `Bearer ${this._token}` };\n  }\n\n  get currentRefreshQuery$() {\n    return this._currentRefreshQuery$.asObservable();\n  }\n\n  get currentRefreshQuery() {\n    return this._currentRefreshQuery$.getValue();\n  }\n\n  constructor(private _config: AuthProviderBearerConfig<T>) {\n    const cookieToken = _config.refreshConfig?.cookieName ? getCookie(_config.refreshConfig.cookieName) ?? null : null;\n\n    this._token = _config.token || null;\n    this._refreshToken = _config.refreshConfig?.token || cookieToken || null;\n\n    if (!this._token && !this._refreshToken) {\n      if (!_config.refreshConfig?.cookieName) {\n        console.error(\n          'A BearerAuthProvider was created without token or refresh token. You should provide at least a cookieName where the refresh token might be stored.',\n        );\n      }\n\n      return;\n    }\n\n    this._prepareForRefresh();\n  }\n\n  cleanUp(): void {\n    this._destroy$.next(true);\n    this._destroy$.unsubscribe();\n    this._currentRefreshQuery$.next(null);\n\n    if (this._config.refreshConfig?.cookieName) {\n      deleteCookie(this._config.refreshConfig.cookieName, '/');\n    }\n  }\n\n  private _prepareForRefresh() {\n    if (!this._token || !this._config.refreshConfig) {\n      return;\n    }\n\n    const bearer = decryptBearer(this._token);\n\n    if (!bearer) {\n      return;\n    }\n\n    const expiresInPropertyName = this._config.refreshConfig.expiresInPropertyName || 'exp';\n    const expiresIn = bearer[expiresInPropertyName] as number | undefined;\n    const fiveMinutes = 5 * 60 * 1000;\n    const refreshBuffer = this._config.refreshConfig.refreshBuffer ?? fiveMinutes;\n\n    if (expiresIn === undefined) {\n      throw new Error(`Bearer token does not contain an '${expiresInPropertyName}' property`);\n    }\n\n    const remainingTime = new Date(expiresIn * 1000).getTime() - refreshBuffer - new Date().getTime();\n\n    const strategy = this._config.refreshConfig.strategy ?? AuthBearerRefreshStrategy.BeforeExpiration;\n\n    switch (strategy) {\n      case AuthBearerRefreshStrategy.BeforeExpiration:\n        timer(remainingTime)\n          .pipe(takeUntil(this._destroy$))\n          .subscribe(() => this._refreshQuery());\n        break;\n    }\n  }\n\n  private _refreshQuery() {\n    if (!this._refreshToken || !this._config.refreshConfig?.queryCreator) {\n      return;\n    }\n\n    const args = this._config.refreshConfig.requestArgsAdapter?.(this._refreshToken, this._token) ?? {\n      body: { refreshToken: this._refreshToken },\n    };\n\n    const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });\n\n    this._currentRefreshQuery$.next(query as QueryCreatorReturnType<T>);\n\n    this._currentRefreshQuery$\n      .pipe(\n        switchQueryState(),\n        tap((state) => {\n          if (isQueryStateSuccess(state)) {\n            if (this._config.refreshConfig?.responseAdapter) {\n              const tokens = this._config.refreshConfig.responseAdapter(state.response);\n              this._token = tokens.token;\n              this._refreshToken = tokens.refreshToken || null;\n            } else {\n              this._token = state.response['token'];\n              this._refreshToken = state.response['refreshToken'];\n            }\n\n            if (this._config.refreshConfig?.cookieName && this._refreshToken) {\n              setCookie(this._config.refreshConfig.cookieName, this._refreshToken);\n            }\n\n            this._prepareForRefresh();\n          } else if (isQueryStateFailure(state)) {\n            this._token = null;\n            this._refreshToken = null;\n\n            if (this._config.refreshConfig?.cookieName) {\n              deleteCookie(this._config.refreshConfig.cookieName, '/');\n            }\n          }\n        }),\n        takeUntilResponse(),\n        takeUntil(this._destroy$),\n      )\n      .subscribe();\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bearer-auth-provider.js","sourceRoot":"","sources":["../../../../../../libs/query/src/lib/auth/bearer-auth-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { deleteCookie, getCookie, setCookie } from '@ethlete/core';\nimport { BehaviorSubject, Subject, takeUntil, tap, timer } from 'rxjs';\nimport { isQueryStateFailure, isQueryStateSuccess, switchQueryState, takeUntilResponse } from '../query';\nimport { AnyQueryCreator, QueryCreatorReturnType } from '../query-client';\nimport {\n  AuthBearerRefreshStrategy,\n  AuthProvider,\n  AuthProviderBearerConfig,\n  TokenResponse,\n} from './auth-provider.types';\nimport { decryptBearer } from './auth-provider.utils';\n\nexport class BearerAuthProvider<T extends AnyQueryCreator> implements AuthProvider {\n  private readonly _destroy$ = new Subject<boolean>();\n  private readonly _currentRefreshQuery$ = new BehaviorSubject<QueryCreatorReturnType<T> | null>(null);\n\n  private readonly _tokens$ = new BehaviorSubject<TokenResponse>({\n    token: null,\n    refreshToken: null,\n  });\n\n  get header() {\n    return { Authorization: `Bearer ${this._tokens$.getValue().token}` };\n  }\n\n  get tokens$() {\n    return this._tokens$.asObservable();\n  }\n\n  get tokens() {\n    return this._tokens$.getValue();\n  }\n\n  get currentRefreshQuery$() {\n    return this._currentRefreshQuery$.asObservable();\n  }\n\n  get currentRefreshQuery() {\n    return this._currentRefreshQuery$.getValue();\n  }\n\n  constructor(private _config: AuthProviderBearerConfig<T>) {\n    const cookieToken = _config.refreshConfig?.cookieName ? getCookie(_config.refreshConfig.cookieName) ?? null : null;\n\n    this._tokens$.next({\n      token: _config.token || null,\n      refreshToken: _config.refreshConfig?.token || cookieToken || null,\n    });\n\n    if (!this.tokens.token && !this.tokens.refreshToken) {\n      if (!_config.refreshConfig?.cookieName) {\n        console.error(\n          'A BearerAuthProvider was created without token or refresh token. You should provide at least a cookieName where the refresh token might be stored.',\n        );\n      }\n\n      return;\n    }\n\n    if (this.tokens.token) {\n      this._prepareForRefresh();\n\n      if (this.tokens.refreshToken && this._config.refreshConfig?.cookieName) {\n        setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);\n      }\n    } else if (this.tokens.refreshToken) {\n      this._refreshQuery();\n    }\n  }\n\n  cleanUp(): void {\n    this._destroy$.next(true);\n    this._destroy$.unsubscribe();\n    this._currentRefreshQuery$.next(null);\n\n    if (this._config.refreshConfig?.cookieName) {\n      deleteCookie(this._config.refreshConfig.cookieName, '/');\n    }\n  }\n\n  private _prepareForRefresh() {\n    if (!this.tokens.token || !this._config.refreshConfig) {\n      return;\n    }\n\n    const bearer = decryptBearer(this.tokens.token);\n\n    if (!bearer) {\n      return;\n    }\n\n    const expiresInPropertyName = this._config.refreshConfig.expiresInPropertyName || 'exp';\n    const expiresIn = bearer[expiresInPropertyName] as number | undefined;\n    const fiveMinutes = 5 * 60 * 1000;\n    const refreshBuffer = this._config.refreshConfig.refreshBuffer ?? fiveMinutes;\n\n    if (expiresIn === undefined) {\n      throw new Error(`Bearer token does not contain an '${expiresInPropertyName}' property`);\n    }\n\n    const remainingTime = new Date(expiresIn * 1000).getTime() - refreshBuffer - new Date().getTime();\n\n    const strategy = this._config.refreshConfig.strategy ?? AuthBearerRefreshStrategy.BeforeExpiration;\n\n    switch (strategy) {\n      case AuthBearerRefreshStrategy.BeforeExpiration:\n        timer(remainingTime)\n          .pipe(takeUntil(this._destroy$))\n          .subscribe(() => this._refreshQuery());\n        break;\n    }\n  }\n\n  private _refreshQuery() {\n    if (!this.tokens.refreshToken || !this._config.refreshConfig) {\n      return;\n    }\n\n    const args = this._config.refreshConfig.requestArgsAdapter?.(this.tokens) ?? {\n      body: { refreshToken: this.tokens.refreshToken },\n    };\n\n    const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });\n\n    this._currentRefreshQuery$.next(query as QueryCreatorReturnType<T>);\n\n    this._currentRefreshQuery$\n      .pipe(\n        switchQueryState(),\n        tap((state) => {\n          if (isQueryStateSuccess(state)) {\n            if (this._config.refreshConfig?.responseAdapter) {\n              const tokens = this._config.refreshConfig.responseAdapter(state.response);\n\n              this._tokens$.next(tokens);\n            } else {\n              this._tokens$.next({\n                token: state.response['token'],\n                refreshToken: state.response['refreshToken'],\n              });\n            }\n\n            if (this._config.refreshConfig?.cookieName && this.tokens.refreshToken) {\n              setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);\n            }\n\n            this._prepareForRefresh();\n          } else if (isQueryStateFailure(state)) {\n            this._tokens$.next({ token: null, refreshToken: null });\n\n            if (this._config.refreshConfig?.cookieName) {\n              deleteCookie(this._config.refreshConfig.cookieName, '/');\n            }\n          }\n        }),\n        takeUntilResponse(),\n        takeUntil(this._destroy$),\n      )\n      .subscribe();\n  }\n}\n"]}

package/fesm2015/ethlete-query.mjs CHANGED Viewed

@@ -1,4 +1,4 @@
-import { getCookie, deleteCookie, setCookie, DestroyService } from '@ethlete/core';
+import { getCookie, setCookie, deleteCookie, DestroyService } from '@ethlete/core';
 import { filter, takeWhile, switchMap, of, BehaviorSubject, Subject, interval, takeUntil, tap, timer, fromEvent, startWith, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
 import { __awaiter } from 'tslib';
 import * as i0 from '@angular/core';
@@ -603,7 +603,13 @@ const decryptBearer = (token) => {
 class BearerAuthProvider {
     get header() {
-        return { Authorization: `Bearer ${this._token}` };
+        return { Authorization: `Bearer ${this._tokens$.getValue().token}` };
+    }
+    get tokens$() {
+        return this._tokens$.asObservable();
+    }
+    get tokens() {
+        return this._tokens$.getValue();
     }
     get currentRefreshQuery$() {
         return this._currentRefreshQuery$.asObservable();
@@ -612,22 +618,34 @@ class BearerAuthProvider {
         return this._currentRefreshQuery$.getValue();
     }
     constructor(_config) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         this._config = _config;
         this._destroy$ = new Subject();
         this._currentRefreshQuery$ = new BehaviorSubject(null);
-        this._token = null;
-        this._refreshToken = null;
+        this._tokens$ = new BehaviorSubject({
+            token: null,
+            refreshToken: null,
+        });
         const cookieToken = ((_a = _config.refreshConfig) === null || _a === void 0 ? void 0 : _a.cookieName) ? (_b = getCookie(_config.refreshConfig.cookieName)) !== null && _b !== void 0 ? _b : null : null;
-        this._token = _config.token || null;
-        this._refreshToken = ((_c = _config.refreshConfig) === null || _c === void 0 ? void 0 : _c.token) || cookieToken || null;
-        if (!this._token && !this._refreshToken) {
+        this._tokens$.next({
+            token: _config.token || null,
+            refreshToken: ((_c = _config.refreshConfig) === null || _c === void 0 ? void 0 : _c.token) || cookieToken || null,
+        });
+        if (!this.tokens.token && !this.tokens.refreshToken) {
             if (!((_d = _config.refreshConfig) === null || _d === void 0 ? void 0 : _d.cookieName)) {
                 console.error('A BearerAuthProvider was created without token or refresh token. You should provide at least a cookieName where the refresh token might be stored.');
             }
             return;
         }
-        this._prepareForRefresh();
+        if (this.tokens.token) {
+            this._prepareForRefresh();
+            if (this.tokens.refreshToken && ((_e = this._config.refreshConfig) === null || _e === void 0 ? void 0 : _e.cookieName)) {
+                setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
+            }
+        }
+        else if (this.tokens.refreshToken) {
+            this._refreshQuery();
+        }
     }
     cleanUp() {
         var _a;
@@ -640,10 +658,10 @@ class BearerAuthProvider {
     }
     _prepareForRefresh() {
         var _a, _b;
-        if (!this._token || !this._config.refreshConfig) {
+        if (!this.tokens.token || !this._config.refreshConfig) {
             return;
         }
-        const bearer = decryptBearer(this._token);
+        const bearer = decryptBearer(this.tokens.token);
         if (!bearer) {
             return;
         }
@@ -665,12 +683,12 @@ class BearerAuthProvider {
         }
     }
     _refreshQuery() {
-        var _a, _b, _c, _d;
-        if (!this._refreshToken || !((_a = this._config.refreshConfig) === null || _a === void 0 ? void 0 : _a.queryCreator)) {
+        var _a, _b, _c;
+        if (!this.tokens.refreshToken || !this._config.refreshConfig) {
             return;
         }
-        const args = (_d = (_c = (_b = this._config.refreshConfig).requestArgsAdapter) === null || _c === void 0 ? void 0 : _c.call(_b, this._refreshToken, this._token)) !== null && _d !== void 0 ? _d : {
-            body: { refreshToken: this._refreshToken },
+        const args = (_c = (_b = (_a = this._config.refreshConfig).requestArgsAdapter) === null || _b === void 0 ? void 0 : _b.call(_a, this.tokens)) !== null && _c !== void 0 ? _c : {
+            body: { refreshToken: this.tokens.refreshToken },
         };
         const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });
         this._currentRefreshQuery$.next(query);
@@ -680,21 +698,21 @@ class BearerAuthProvider {
             if (isQueryStateSuccess(state)) {
                 if ((_a = this._config.refreshConfig) === null || _a === void 0 ? void 0 : _a.responseAdapter) {
                     const tokens = this._config.refreshConfig.responseAdapter(state.response);
-                    this._token = tokens.token;
-                    this._refreshToken = tokens.refreshToken || null;
+                    this._tokens$.next(tokens);
                 }
                 else {
-                    this._token = state.response['token'];
-                    this._refreshToken = state.response['refreshToken'];
+                    this._tokens$.next({
+                        token: state.response['token'],
+                        refreshToken: state.response['refreshToken'],
+                    });
                 }
-                if (((_b = this._config.refreshConfig) === null || _b === void 0 ? void 0 : _b.cookieName) && this._refreshToken) {
-                    setCookie(this._config.refreshConfig.cookieName, this._refreshToken);
+                if (((_b = this._config.refreshConfig) === null || _b === void 0 ? void 0 : _b.cookieName) && this.tokens.refreshToken) {
+                    setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
                 }
                 this._prepareForRefresh();
             }
             else if (isQueryStateFailure(state)) {
-                this._token = null;
-                this._refreshToken = null;
+                this._tokens$.next({ token: null, refreshToken: null });
                 if ((_c = this._config.refreshConfig) === null || _c === void 0 ? void 0 : _c.cookieName) {
                     deleteCookie(this._config.refreshConfig.cookieName, '/');
                 }