@lifeready/core 1.1.18 → 1.1.20

package/fesm2015/lifeready-core.js

@@ -13,9 +13,9 @@ import { RetryLink } from '@apollo/client/link/retry';
 import { CookieService } from 'ngx-cookie-service';
 import { print } from 'graphql/language/printer';
 import Auth, { CognitoUser } from '@aws-amplify/auth';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { Hub } from '@aws-amplify/core';
 import { ReplaySubject } from 'rxjs';
-import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { DEFAULT_INTERRUPTSOURCES, Idle } from '@ng-idle/core';
 import { Keepalive, NgIdleKeepaliveModule } from '@ng-idle/keepalive';
 import { Slip39Helper, Slip39 } from 'slip39';
@@ -177,6 +177,82 @@ class LrBadStateException extends LrException {
     }
 }
 
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// promote everything to a promise.
+function promiseAllMayAsync(values) {
+    if (!Array.isArray(values)) {
+        throw new Error('not array');
+    }
+    if (values.some((value) => value === null || value === void 0 ? void 0 : value.then)) {
+        const ret = Promise.all(values);
+        return ret;
+    }
+    else {
+        return values;
+    }
+}
+function remap(obj, values) {
+    const ret = {};
+    for (const [i, key] of Object.keys(obj).entries()) {
+        ret[key] = values[i];
+    }
+    return ret;
+}
+function mapValuesMayAsync(obj, 
+// callback can either return a Promise, or a value.
+// The Promise<any> type is redundant but it shows that it can return a promise
+callback) {
+    const values = promiseAllMayAsync(Object.entries(obj).map(([key, value]) => callback(value, key, obj)));
+    if (values.then) {
+        return values.then((resolvedValues) => remap(obj, resolvedValues));
+    }
+    else {
+        return remap(obj, values);
+    }
+}
+function mapValuesAsync(obj, 
+// callback can either return a Promise, or a value.
+// The Promise<any> type is redundant but it shows that it can return a promise
+// By default, it returns the value without any process, so you can use
+// this to simply wait for all promises in an object to resolve.
+callback) {
+    const values = Promise.all(Object.entries(obj).map(([key, value]) => callback ? callback(value, key, obj) : value));
+    return values.then((resolvedValues) => remap(obj, resolvedValues));
+}
+/**
+ * Returns the defaultValue when value is undefined
+ * @param value The value to check
+ * @param defaultValue The value to return if value is undefined.
+ */
+function undefinedDefault(value, defaultValue) {
+    return value === undefined ? defaultValue : value;
+}
+function getAccessJwtToken(auth) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            return (yield auth.currentSession()).getAccessToken().getJwtToken();
+        }
+        catch (error) {
+            // The error thrown by Cognito is of type string.
+            if (error == 'No current user') {
+                return '';
+            }
+            throw error;
+        }
+    });
+}
+function httpOptions(auth, config) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const token = yield getAccessJwtToken(auth);
+        const debugUsername = (_a = config.debug) === null || _a === void 0 ? void 0 : _a.username;
+        return {
+            withCredentials: true,
+            headers: Object.assign(Object.assign({}, (token && { authorization: `Bearer ${token}` })), (debugUsername && { 'x-kc-dev-user': debugUsername })),
+        };
+    });
+}
+
 // Ref: https://stackoverflow.com/questions/59735280/angular-8-moment-error-cannot-call-a-namespace-moment
 const moment = moment_;
 const ServerTimeQuery = gql `
@@ -197,23 +273,10 @@ class TimeService {
         this.offsetMs = null; // Millisecond offset of local clock.
         this.verified = false; // Verified with independent time source
     }
-    getAccessToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return (yield this.auth.currentAuthenticatedUser())
-                    .getSignInUserSession()
-                    .getAccessToken()
-                    .getJwtToken();
-            }
-            catch (error) {
-                return ''; // Not authenticated
-            }
-        });
-    }
     // Get time from independent source to confirm.
     verifyCognito() {
         return __awaiter(this, void 0, void 0, function* () {
-            const accessToken = yield this.getAccessToken();
+            const accessToken = yield getAccessJwtToken(this.auth);
             if (!accessToken) {
                 return;
             }
@@ -291,7 +354,7 @@ class TimeService {
             }
             if (this.VERIFY_ENABLED) {
                 // logged in but not yet verified time matches.
-                if (!this.verified && (yield this.getAccessToken())) {
+                if (!this.verified && (yield getAccessJwtToken(this.auth))) {
                     needsRefresh = true;
                 }
             }
@@ -761,7 +824,10 @@ KeyFactoryService.ctorParameters = () => [
     { type: WebCryptoService }
 ];
 
-const LR_CONFIG = new InjectionToken('LR.AUTH');
+// The injection token string is set to be the same as the const stand name since you
+// can possibly have different tokens with the same type (i.e. KcConfig). So it would not
+// be appropriate to use "KcConfig" as the token string.
+const KC_CONFIG = new InjectionToken('KC_CONFIG');
 const RETRY_ERROR_CODES = [LrApiErrorCode.CONCURRENT_ACCESS];
 const configureApollo = (config, auth) => {
     const defaultOptions = {
@@ -778,16 +844,8 @@ const configureApollo = (config, auth) => {
         },
     };
     const authLink = setContext((_, { headers }) => __awaiter(void 0, void 0, void 0, function* () {
-        let accessJwt = null;
-        try {
-            accessJwt = (yield auth.currentSession()).getAccessToken();
-        }
-        catch (_a) {
-            console.log('User not signed in');
-        }
-        return {
-            headers: Object.assign(Object.assign({}, headers), { authorization: accessJwt ? `Bearer ${accessJwt.jwtToken}` : '' }),
-        };
+        const options = yield httpOptions(auth, config);
+        return Object.assign(Object.assign({}, options), { headers: Object.assign(Object.assign({}, headers), options.headers) });
     }));
     // We are only retrying on certain errors, like the CONCURRENT_ACCESS gql
     // error which indicates DB race condition. So can be safely retried.
@@ -1113,14 +1171,14 @@ class KeyService {
         });
     }
 }
-KeyService.ɵprov = ɵɵdefineInjectable({ factory: function KeyService_Factory() { return new KeyService(ɵɵinject(LR_CONFIG), ɵɵinject(PersistService)); }, token: KeyService, providedIn: "root" });
+KeyService.ɵprov = ɵɵdefineInjectable({ factory: function KeyService_Factory() { return new KeyService(ɵɵinject(KC_CONFIG), ɵɵinject(PersistService)); }, token: KeyService, providedIn: "root" });
 KeyService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 KeyService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: PersistService }
 ];
 
@@ -1762,59 +1820,6 @@ function RunOutsideAngular({ ngZoneName, exceptLastPromise = true, excludeMethod
     };
 }
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// Promise.all always returns a promise, even if all the values are not async.
-// During processing of deep hierarchies of nested objects we don't always need to
-// promote everything to a promise.
-function promiseAllMayAsync(values) {
-    if (!Array.isArray(values)) {
-        throw new Error('not array');
-    }
-    if (values.some((value) => value === null || value === void 0 ? void 0 : value.then)) {
-        const ret = Promise.all(values);
-        return ret;
-    }
-    else {
-        return values;
-    }
-}
-function remap(obj, values) {
-    const ret = {};
-    for (const [i, key] of Object.keys(obj).entries()) {
-        ret[key] = values[i];
-    }
-    return ret;
-}
-function mapValuesMayAsync(obj, 
-// callback can either return a Promise, or a value.
-// The Promise<any> type is redundant but it shows that it can return a promise
-callback) {
-    const values = promiseAllMayAsync(Object.entries(obj).map(([key, value]) => callback(value, key, obj)));
-    if (values.then) {
-        return values.then((resolvedValues) => remap(obj, resolvedValues));
-    }
-    else {
-        return remap(obj, values);
-    }
-}
-function mapValuesAsync(obj, 
-// callback can either return a Promise, or a value.
-// The Promise<any> type is redundant but it shows that it can return a promise
-// By default, it returns the value without any process, so you can use
-// this to simply wait for all promises in an object to resolve.
-callback) {
-    const values = Promise.all(Object.entries(obj).map(([key, value]) => callback ? callback(value, key, obj) : value));
-    return values.then((resolvedValues) => remap(obj, resolvedValues));
-}
-/**
- * Returns the defaultValue when value is undefined
- * @param value The value to check
- * @param defaultValue The value to return if value is undefined.
- */
-function undefinedDefault(value, defaultValue) {
-    return value === undefined ? defaultValue : value;
-}
-
 const DefaultProcessorOptions = {
     hasKeys: true,
 };
@@ -3071,18 +3076,10 @@ class IdleService {
     }
     keepalivePost() {
         return __awaiter(this, void 0, void 0, function* () {
-            // currentAuthenticatedUser() refreshes the access token if required.
-            const cognitoUser = yield this.auth.currentAuthenticatedUser();
             const keepaliveResult = yield this.http
-                .post(`${this.config.authUrl}auth/keepalive/`, null, {
-                withCredentials: true,
-                headers: {
-                    Authorization: `Bearer ${cognitoUser
-                        .getSignInUserSession()
-                        .getAccessToken()
-                        .getJwtToken()}`,
-                },
-            })
+                .post(`${this.config.authUrl}auth/keepalive/`, null, 
+            // /auth/keepalive/ will be extending the sessions cookie.
+            yield httpOptions(this.auth, this.config))
                 .toPromise();
             return {
                 keepaliveResult,
@@ -3137,14 +3134,14 @@ class IdleService {
         localStorage.removeItem(this.IDLING_KEY);
     }
 }
-IdleService.ɵprov = ɵɵdefineInjectable({ factory: function IdleService_Factory() { return new IdleService(ɵɵinject(LR_CONFIG), ɵɵinject(HttpClient), ɵɵinject(Idle), ɵɵinject(Keepalive), ɵɵinject(KeyService), ɵɵinject(AuthClass)); }, token: IdleService, providedIn: "root" });
+IdleService.ɵprov = ɵɵdefineInjectable({ factory: function IdleService_Factory() { return new IdleService(ɵɵinject(KC_CONFIG), ɵɵinject(HttpClient), ɵɵinject(Idle), ɵɵinject(Keepalive), ɵɵinject(KeyService), ɵɵinject(AuthClass)); }, token: IdleService, providedIn: "root" });
 IdleService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 IdleService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: HttpClient },
     { type: Idle },
     { type: Keepalive },
@@ -4324,14 +4321,14 @@ class ProfileService {
         });
     }
 }
-ProfileService.ɵprov = ɵɵdefineInjectable({ factory: function ProfileService_Factory() { return new ProfileService(ɵɵinject(LR_CONFIG), ɵɵinject(HttpClient), ɵɵinject(LrApolloService), ɵɵinject(KeyService), ɵɵinject(KeyMetaService), ɵɵinject(KeyGraphService), ɵɵinject(EncryptionService)); }, token: ProfileService, providedIn: "root" });
+ProfileService.ɵprov = ɵɵdefineInjectable({ factory: function ProfileService_Factory() { return new ProfileService(ɵɵinject(KC_CONFIG), ɵɵinject(HttpClient), ɵɵinject(LrApolloService), ɵɵinject(KeyService), ɵɵinject(KeyMetaService), ɵɵinject(KeyGraphService), ɵɵinject(EncryptionService)); }, token: ProfileService, providedIn: "root" });
 ProfileService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 ProfileService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: HttpClient },
     { type: LrApolloService },
     { type: KeyService },
@@ -4372,7 +4369,7 @@ const moment$1 = moment_;
 class PasswordCheck {
 }
 class PasswordService {
-    constructor(config, http, apollo, auth, profileService, keyFactory, encryptionService, keyGraph, webCryptoService, idleService) {
+    constructor(config, http, apollo, auth, profileService, keyFactory, encryptionService, keyGraph, webCryptoService) {
         this.config = config;
         this.http = http;
         this.apollo = apollo;
@@ -4382,7 +4379,6 @@ class PasswordService {
         this.encryptionService = encryptionService;
         this.keyGraph = keyGraph;
         this.webCryptoService = webCryptoService;
-        this.idleService = idleService;
         this.CLIENT_NONCE_LENGTH = 32;
     }
     checkPassword(plainPassword) {
@@ -4508,17 +4504,14 @@ class PasswordService {
             // a network timeout for example. But we don't know if it's the response that timed out and
             // the idp password change was actually carried out. So we have to be extra conservative and
             // only act on a clear success. Otherwise we go into recover mode.
-            yield this.changePasswordComplete(cognitoUser.getSignInUserSession().getAccessToken().getJwtToken(), true, token);
+            yield this.changePasswordComplete({ useNewPassword: true, token });
         });
     }
-    changePasswordComplete(accessToken, useNewPassword, token = null) {
+    changePasswordComplete(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { useNewPassword, token } = options;
             return this.http
-                .post(`${this.config.authUrl}users/password-change-complete/`, Object.assign({ use_new_password: useNewPassword }, (token && { token })), {
-                headers: {
-                    Authorization: `Bearer ${accessToken}`,
-                },
-            })
+                .post(`${this.config.authUrl}users/password-change-complete/`, Object.assign({ use_new_password: useNewPassword }, (token && { token })), yield httpOptions(this.auth, this.config))
                 .toPromise();
         });
     }
@@ -4638,14 +4631,14 @@ class PasswordService {
         };
     }
 }
-PasswordService.ɵprov = ɵɵdefineInjectable({ factory: function PasswordService_Factory() { return new PasswordService(ɵɵinject(LR_CONFIG), ɵɵinject(HttpClient), ɵɵinject(LrApolloService), ɵɵinject(AuthClass), ɵɵinject(ProfileService), ɵɵinject(KeyFactoryService), ɵɵinject(EncryptionService), ɵɵinject(KeyGraphService), ɵɵinject(WebCryptoService), ɵɵinject(IdleService)); }, token: PasswordService, providedIn: "root" });
+PasswordService.ɵprov = ɵɵdefineInjectable({ factory: function PasswordService_Factory() { return new PasswordService(ɵɵinject(KC_CONFIG), ɵɵinject(HttpClient), ɵɵinject(LrApolloService), ɵɵinject(AuthClass), ɵɵinject(ProfileService), ɵɵinject(KeyFactoryService), ɵɵinject(EncryptionService), ɵɵinject(KeyGraphService), ɵɵinject(WebCryptoService)); }, token: PasswordService, providedIn: "root" });
 PasswordService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 PasswordService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: HttpClient },
     { type: LrApolloService },
     { type: AuthClass },
@@ -4653,8 +4646,7 @@ PasswordService.ctorParameters = () => [
     { type: KeyFactoryService },
     { type: EncryptionService },
     { type: KeyGraphService },
-    { type: WebCryptoService },
-    { type: IdleService }
+    { type: WebCryptoService }
 ];
 
 const TP_PASSWORD_RESET_CLIENT_NONCE_LENGTH = 32;
@@ -5482,7 +5474,7 @@ const initialiseAuth = (authService) => {
     return () => authService.initialise();
 };
 class LifeReadyAuthService {
-    constructor(config, auth, keyFactory, keyService, profileService, keyGraphService, passwordService, idleService, lrGraphQL, tpPasswordResetProcessorService, persistService, encryptionService, assemblyController) {
+    constructor(config, auth, keyFactory, keyService, profileService, keyGraphService, passwordService, idleService, lrGraphQL, tpPasswordResetProcessorService, persistService, encryptionService, assemblyController, http) {
         this.config = config;
         this.auth = auth;
         this.keyFactory = keyFactory;
@@ -5496,17 +5488,82 @@ class LifeReadyAuthService {
         this.persistService = persistService;
         this.encryptionService = encryptionService;
         this.assemblyController = assemblyController;
+        this.http = http;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.hubSubject = new ReplaySubject(1);
         // Could use rxjs observables here. But trying to have kc-client use as little angular
         // features as possible. Rxjs is not used anywhere else in kc-client.
         this.logoutListeners = new Set();
+        if (!isDevMode()) {
+            if (this.config.debug != null) {
+                throw new LrBadLogicException('In production mode, "config.debug" must be set to null');
+            }
+        }
     }
     initialise() {
         return __awaiter(this, void 0, void 0, function* () {
             Hub.listen('auth', (data) => this.hubSubject.next(data.payload));
         });
     }
+    debugLogin(username, password) {
+        // This will fail if debug is null. But when debug is null, this function
+        // should not be called.
+        this.config.debug.username = username;
+        return this.debugLoadUser(password);
+    }
+    // ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    /**
+     * Login using the server side session method.
+     */
+    debugLoginUsingSession(username) {
+        return this.http
+            .get(this.config.apiUrl +
+            'debug_only/users/login/?username=' +
+            encodeURIComponent(username), {
+            // Non-obvious alert: if you want the cookies to be set, you must use the
+            // "withCredentials" header. I would have thought the withCredentials header
+            // is only used to send the cookies with the requests. But, if you don't include
+            // the "withCredentials" header, the cookies in the response DOES NOT get set!
+            //
+            // ref: https://github.com/github/fetch/issues/386#issuecomment-243229388
+            withCredentials: true,
+        })
+            .toPromise();
+    }
+    debugLoadUser(password) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { currentUser, contactCard, userPlans } = yield this.profileService.getCurrentUser();
+            // Debug mode can not deal with session encryption key yet.
+            // NO SESSION ENCRYPTION KEY.
+            const passKey = (yield this.keyFactory.derivePassKey(Object.assign({ password }, currentUser.currentUserKey.passKey.passKeyParams))).jwk;
+            const masterKey = yield this.keyGraphService.unwrapWithPassKey(currentUser.currentUserKey.passKey.id, passKey, currentUser.currentUserKey.masterKey.id);
+            yield this.idleService.persistMasterKey(masterKey);
+            yield this.keyGraphService.populateKeys(currentUser.currentUserKey);
+            return {
+                id: currentUser.id,
+                sub: 'DEBUG_MODE',
+                username: currentUser.username,
+                currentUserKey: currentUser.currentUserKey,
+                email: 'DEBUG_MODE',
+                emailVerified: false,
+                phone: 'DEBUG_MODE',
+                phoneVerified: false,
+                contactCard: Object.assign({}, (yield this.profileService.decryptContactCard(contactCard))),
+                userDelete: currentUser.userDelete,
+                userPlans,
+                hasTPVaultAccess: this.mapTPVaultAccess(currentUser.features),
+                features: currentUser.features,
+                sessionEncryptionKey: currentUser.sessionEncryptionKey,
+            };
+        });
+    }
+    getAccessJwtToken() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return getAccessJwtToken(this.auth);
+        });
+    }
     importPassword(plainPassword) {
         return this.keyFactory.importPassword(plainPassword);
     }
@@ -5672,11 +5729,9 @@ class LifeReadyAuthService {
     handlePasswordRecovery(user) {
         return __awaiter(this, void 0, void 0, function* () {
             if (user.recoveryStatus !== RecoveryStatus.NONE) {
-                const jwtToken = user
-                    .getSignInUserSession()
-                    .getAccessToken()
-                    .getJwtToken();
-                yield this.passwordService.changePasswordComplete(jwtToken, user.recoveryStatus === RecoveryStatus.NEW_PASSWORD);
+                yield this.passwordService.changePasswordComplete({
+                    useNewPassword: user.recoveryStatus === RecoveryStatus.NEW_PASSWORD,
+                });
             }
         });
     }
@@ -5734,7 +5789,6 @@ class LifeReadyAuthService {
                 sub: this.getUserAttribute('sub', userAttributes),
                 username: currentUser.username,
                 currentUserKey: currentUser.currentUserKey,
-                getAccessJwtToken: () => cognitoUser.getSignInUserSession().getAccessToken().getJwtToken(),
                 email: this.getUserAttribute('email', userAttributes),
                 emailVerified: this.getUserAttribute('email_verified', userAttributes) === 'true',
                 phone: this.getUserAttribute('phone_number', userAttributes),
@@ -5753,6 +5807,7 @@ class LifeReadyAuthService {
         return this.hubSubject;
     }
     logout() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // Notify all listeners to clean up.
             yield Promise.all([...this.logoutListeners].map((callback) => callback()));
@@ -5760,6 +5815,9 @@ class LifeReadyAuthService {
             this.keyService.purgeKeys();
             this.keyGraphService.purgeKeys();
             yield Promise.all([this.auth.signOut(), this.profileService.signOut()]);
+            if ((_a = this.config.debug) === null || _a === void 0 ? void 0 : _a.username) {
+                this.config.debug.username = null;
+            }
         });
     }
     getUserAttribute(attributeName, userAttributes) {
@@ -5914,14 +5972,14 @@ class LifeReadyAuthService {
         });
     }
 }
-LifeReadyAuthService.ɵprov = ɵɵdefineInjectable({ factory: function LifeReadyAuthService_Factory() { return new LifeReadyAuthService(ɵɵinject(LR_CONFIG), ɵɵinject(AuthClass), ɵɵinject(KeyFactoryService), ɵɵinject(KeyService), ɵɵinject(ProfileService), ɵɵinject(KeyGraphService), ɵɵinject(PasswordService), ɵɵinject(IdleService), ɵɵinject(LrGraphQLService), ɵɵinject(TpPasswordResetProcessorService), ɵɵinject(PersistService), ɵɵinject(EncryptionService), ɵɵinject(TpPasswordResetAssemblyController)); }, token: LifeReadyAuthService, providedIn: "root" });
+LifeReadyAuthService.ɵprov = ɵɵdefineInjectable({ factory: function LifeReadyAuthService_Factory() { return new LifeReadyAuthService(ɵɵinject(KC_CONFIG), ɵɵinject(AuthClass), ɵɵinject(KeyFactoryService), ɵɵinject(KeyService), ɵɵinject(ProfileService), ɵɵinject(KeyGraphService), ɵɵinject(PasswordService), ɵɵinject(IdleService), ɵɵinject(LrGraphQLService), ɵɵinject(TpPasswordResetProcessorService), ɵɵinject(PersistService), ɵɵinject(EncryptionService), ɵɵinject(TpPasswordResetAssemblyController), ɵɵinject(HttpClient)); }, token: LifeReadyAuthService, providedIn: "root" });
 LifeReadyAuthService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 LifeReadyAuthService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: AuthClass },
     { type: KeyFactoryService },
     { type: KeyService },
@@ -5933,7 +5991,8 @@ LifeReadyAuthService.ctorParameters = () => [
     { type: TpPasswordResetProcessorService },
     { type: PersistService },
     { type: EncryptionService },
-    { type: TpPasswordResetAssemblyController }
+    { type: TpPasswordResetAssemblyController },
+    { type: HttpClient }
 ];
 
 var FileType;
@@ -6699,10 +6758,10 @@ ContactCard2Service = __decorate([
 ], ContactCard2Service);
 
 class FileUploadService {
-    constructor(config, http, lrAuth) {
+    constructor(config, http, auth) {
         this.config = config;
         this.http = http;
-        this.lrAuth = lrAuth;
+        this.auth = auth;
     }
     downloadEncryptedFile(fileStateNodeId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -6713,12 +6772,7 @@ class FileUploadService {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.config.apiUrl}files/download/?file_state_node_id=${fileStateNodeId}`;
             const content = yield this.http
-                .get(url, {
-                responseType: 'text',
-                headers: {
-                    Authorization: `Bearer ${(yield this.lrAuth.getUser()).getAccessJwtToken()}`,
-                },
-            })
+                .get(url, Object.assign(Object.assign({}, (yield httpOptions(this.auth, this.config))), { responseType: 'text' }))
                 .toPromise();
             return content;
         });
@@ -6741,26 +6795,22 @@ class FileUploadService {
             const formData = new FormData();
             formData.append('content', new Blob([encryptedContent]), fileName);
             const { content_resource } = yield this.http
-                .post(`${this.config.apiUrl}files/upload/`, formData, {
-                headers: {
-                    Authorization: `Bearer ${(yield this.lrAuth.getUser()).getAccessJwtToken()}`,
-                },
-            })
+                .post(`${this.config.apiUrl}files/upload/`, formData, yield httpOptions(this.auth, this.config))
                 .toPromise();
             return content_resource;
         });
     }
 }
-FileUploadService.ɵprov = ɵɵdefineInjectable({ factory: function FileUploadService_Factory() { return new FileUploadService(ɵɵinject(LR_CONFIG), ɵɵinject(HttpClient), ɵɵinject(LifeReadyAuthService)); }, token: FileUploadService, providedIn: "root" });
+FileUploadService.ɵprov = ɵɵdefineInjectable({ factory: function FileUploadService_Factory() { return new FileUploadService(ɵɵinject(KC_CONFIG), ɵɵinject(HttpClient), ɵɵinject(AuthClass)); }, token: FileUploadService, providedIn: "root" });
 FileUploadService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 FileUploadService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: HttpClient },
-    { type: LifeReadyAuthService }
+    { type: AuthClass }
 ];
 
 const LockFragment = gqlTyped `
@@ -9303,14 +9353,14 @@ class LbopService {
         });
     }
 }
-LbopService.ɵprov = ɵɵdefineInjectable({ factory: function LbopService_Factory() { return new LbopService(ɵɵinject(LR_CONFIG), ɵɵinject(HttpClient), ɵɵinject(LrApolloService), ɵɵinject(AuthClass), ɵɵinject(LifeReadyAuthService), ɵɵinject(KeyFactoryService), ɵɵinject(KeyService), ɵɵinject(EncryptionService), ɵɵinject(KeyGraphService), ɵɵinject(PasswordService)); }, token: LbopService, providedIn: "root" });
+LbopService.ɵprov = ɵɵdefineInjectable({ factory: function LbopService_Factory() { return new LbopService(ɵɵinject(KC_CONFIG), ɵɵinject(HttpClient), ɵɵinject(LrApolloService), ɵɵinject(AuthClass), ɵɵinject(LifeReadyAuthService), ɵɵinject(KeyFactoryService), ɵɵinject(KeyService), ɵɵinject(EncryptionService), ɵɵinject(KeyGraphService), ɵɵinject(PasswordService)); }, token: LbopService, providedIn: "root" });
 LbopService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 LbopService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: HttpClient },
     { type: LrApolloService },
     { type: AuthClass },
@@ -9328,7 +9378,7 @@ class LifeReadyModule {
             ngModule: LifeReadyModule,
             providers: [
                 {
-                    provide: LR_CONFIG,
+                    provide: KC_CONFIG,
                     useValue: config,
                 },
                 {
@@ -9338,7 +9388,7 @@ class LifeReadyModule {
                 {
                     provide: APP_INITIALIZER,
                     useFactory: configureAmplifyAuth,
-                    deps: [LR_CONFIG, AuthClass],
+                    deps: [KC_CONFIG, AuthClass],
                     multi: true,
                 },
                 {
@@ -9350,7 +9400,7 @@ class LifeReadyModule {
                 {
                     provide: APOLLO_OPTIONS,
                     useFactory: configureApollo,
-                    deps: [LR_CONFIG, AuthClass],
+                    deps: [KC_CONFIG, AuthClass],
                 },
             ],
         };
@@ -10959,14 +11009,14 @@ class RegisterService {
         });
     }
 }
-RegisterService.ɵprov = ɵɵdefineInjectable({ factory: function RegisterService_Factory() { return new RegisterService(ɵɵinject(LR_CONFIG), ɵɵinject(AuthClass), ɵɵinject(HttpClient), ɵɵinject(KeyFactoryService), ɵɵinject(EncryptionService), ɵɵinject(PasswordService)); }, token: RegisterService, providedIn: "root" });
+RegisterService.ɵprov = ɵɵdefineInjectable({ factory: function RegisterService_Factory() { return new RegisterService(ɵɵinject(KC_CONFIG), ɵɵinject(AuthClass), ɵɵinject(HttpClient), ɵɵinject(KeyFactoryService), ɵɵinject(EncryptionService), ɵɵinject(PasswordService)); }, token: RegisterService, providedIn: "root" });
 RegisterService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
             },] }
 ];
 RegisterService.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: AuthClass },
     { type: HttpClient },
     { type: KeyFactoryService },
@@ -12246,7 +12296,7 @@ let TpPasswordResetUserService = class TpPasswordResetUserService extends LrServ
         });
     }
 };
-TpPasswordResetUserService.ɵprov = ɵɵdefineInjectable({ factory: function TpPasswordResetUserService_Factory() { return new TpPasswordResetUserService(ɵɵinject(NgZone), ɵɵinject(INJECTOR), ɵɵinject(LR_CONFIG), ɵɵinject(KeyFactoryService), ɵɵinject(EncryptionService), ɵɵinject(PasswordService), ɵɵinject(HttpClient), ɵɵinject(AuthClass)); }, token: TpPasswordResetUserService, providedIn: "root" });
+TpPasswordResetUserService.ɵprov = ɵɵdefineInjectable({ factory: function TpPasswordResetUserService_Factory() { return new TpPasswordResetUserService(ɵɵinject(NgZone), ɵɵinject(INJECTOR), ɵɵinject(KC_CONFIG), ɵɵinject(KeyFactoryService), ɵɵinject(EncryptionService), ɵɵinject(PasswordService), ɵɵinject(HttpClient), ɵɵinject(AuthClass)); }, token: TpPasswordResetUserService, providedIn: "root" });
 TpPasswordResetUserService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root',
@@ -12255,7 +12305,7 @@ TpPasswordResetUserService.decorators = [
 TpPasswordResetUserService.ctorParameters = () => [
     { type: NgZone },
     { type: Injector },
-    { type: undefined, decorators: [{ type: Inject, args: [LR_CONFIG,] }] },
+    { type: undefined, decorators: [{ type: Inject, args: [KC_CONFIG,] }] },
     { type: KeyFactoryService },
     { type: EncryptionService },
     { type: PasswordService },
@@ -12732,5 +12782,5 @@ TwoFactorService.ctorParameters = () => [
  * Generated bundle index. Do not edit.
  */
 
-export { AccessLevel, AccessRoleChoice, AccessRoleMethodChoice, ApiContactCard, ApiCurrentUser, ArchiveDirectoryMutation, CancelUserDeleteMutation, Category, CategoryFields, CategoryFilter, CategoryMetaService, CategoryService, ClaimApproverState, ClaimState, CognitoChallengeUser, CommonProcessorsService, CompleteOtkMutation, Config, ContactCard2Service, ContactCardAddress, ContactCardName, CreateCategoryMutation, CreateContactCardMutation$1 as CreateContactCardMutation, CreateFileMutation, CreateFileQuery, CreateLbopQuery, CreateRecordContainerMutation, CreateRecordMutation, CreateVaultMutation, CurrentCategory, CurrentUser, CurrentUserKey, CurrentUserQuery, CurrentUserSharedKeyQuery, DEFAULT_BREADCRUMB_DEPTH, DEFAULT_DESCENDANTS_DEPTH, DefaultCategory, DefaultProcessorOptions, DefaultVaultFilter, DeleteCategoryMutation, DeleteFileMutation, DeleteLbopQuery, DeleteRecordMutation, DirectoryQuery, DirectoryType, FeatureAction, Features, FetchKeyGraphField, FileOperationField, FileQuery, FileType, FileUploadService, GetCategoriesQuery, GetCategoryKeyIdQuery, GetCategoryQuery, GetMySharedCategoriesQuery, GetRecordQuery, GetRootDirectoryIdsQuery, GetTrustedPartyCategoriesQuery, GetVaultsQuery, IdleService, InitiateOtkMutation, Item2Service, KeyExchange2Service, KeyExchangeFields, KeyExchangeMode, KeyExchangeOtkState, KeyExchangeQuery, KeyExchangeService, KeyExchangeState, KeyExchangeTokenQuery, KeyExchangesQuery, KeyGraphField, KeyGraphFragment, LR_CONFIG, LbopQuery, LbopService, LbopsQuery, LifeReadyAuthService, LifeReadyModule, LinkTypeField, LoadedCategoryTree, LockService, LockState, LoginHistoryQuery, LoginResult, LrApiErrorCode, LrApolloService, LrAuthException, LrBadArgumentException, LrBadLogicException, LrBadRequestException, LrBadStateException, LrCodeMismatchException, LrConcurrentAccessException, LrEncryptionException, LrError, LrErrorCode, LrException, LrExpiredCodeException, LrExpiredException, LrGraphQLService, LrLockedException, LrMergedMutation, LrMutation, LrMutationBase, LrNotFoundException, LrRecord, LrService, LrSuspiciousException, LrUnsupportedException, MainContactCard, MainContactCardFields, MainContactCardPlainFields, MainContactCardProperty, MessageService, MoveDirectoryQuery, MoveFileQuery, NewAttachment, NewCategory, NewOrUpdatedAttachment, NewRecord, NotificationService, OtkState, OwnerPlainDataJson, PassIdpApiResult, PasswordChangeStatus, PasswordCheck, PasswordService, PermissionChoice, PersistService, Plan, PlanService, PlanState, ProfileDetailsService, ProfileService, QueryProcessorService, RecordAttachment, RecordAttachmentFilter, RecordAttachmentService, RecordContentFilter, RecordField, RecordFieldType, RecordFilter, RecordService, RecordType, RecordTypeField, RecordTypeFieldOption, RecordTypeService, RecordTypeSummary, RecoveryStatus, RegisterResult, RegisterService, RequestUserDeleteMutation, RespondOtkMutation, RevertFileQuery, ScenarioLastClaimState, ScenarioService, ScenarioState, ServerConfigService, ServerTimeQuery, SharedAccess, SharedContactCard2Service, StripeBillingPortalSession, StripeCheckoutSession, Subscription, TimeService, TpAssemblyState, TpClaimApproverState, TpClaimState, TpPasswordResetRequestService, TpPasswordResetService, TpPasswordResetUserService, TrustedParty2Service, TrustedPartyDetails, TwoFactorService, UnarchiveDirectoryMutation, UpdateCategoryMutation, UpdateContactCardMutation$1 as UpdateContactCardMutation, UpdateFileQuery, UpdateLbopQuery, UpdateRecordContainerMutation, UpdateRecordMutation, UpdatedCategory, UpdatedRecord, UserDeleteState, UserPlan, UserService, UserSharedKeyFields, Vault, VaultCategory, VaultFields, VaultRecord, VaultRecordType, WebCryptoService, awsFetch, configureAmplifyAuth, configureApollo, fragmentSpreadAstSelection, gqlTyped, handleApolloError, handleCognitoCallback, initialiseAuth, mapEdges, mapUserPlans, parentCategoriesField, processConnection, throwClaimIdMismatch, throwClaimNotApproved, ɵ0, KeyGraphService as ɵa, EncryptionService as ɵb, KeyService as ɵc, KeyFactoryService as ɵd, KeyMetaService as ɵe, LrGraphQLService as ɵf, TpPasswordResetProcessorService as ɵg, RunOutsideAngular as ɵh, TpPasswordResetAssemblyController as ɵi, TpAssemblyController as ɵj, LrService as ɵk, SharedContactCardService as ɵl, TrustedPartyService as ɵm, ScenarioAssemblyController as ɵn, TpPasswordResetPrivateService as ɵo };
+export { AccessLevel, AccessRoleChoice, AccessRoleMethodChoice, ApiContactCard, ApiCurrentUser, ArchiveDirectoryMutation, CancelUserDeleteMutation, Category, CategoryFields, CategoryFilter, CategoryMetaService, CategoryService, ClaimApproverState, ClaimState, CognitoChallengeUser, CommonProcessorsService, CompleteOtkMutation, Config, ContactCard2Service, ContactCardAddress, ContactCardName, CreateCategoryMutation, CreateContactCardMutation$1 as CreateContactCardMutation, CreateFileMutation, CreateFileQuery, CreateLbopQuery, CreateRecordContainerMutation, CreateRecordMutation, CreateVaultMutation, CurrentCategory, CurrentUser, CurrentUserKey, CurrentUserQuery, CurrentUserSharedKeyQuery, DEFAULT_BREADCRUMB_DEPTH, DEFAULT_DESCENDANTS_DEPTH, DefaultCategory, DefaultProcessorOptions, DefaultVaultFilter, DeleteCategoryMutation, DeleteFileMutation, DeleteLbopQuery, DeleteRecordMutation, DirectoryQuery, DirectoryType, FeatureAction, Features, FetchKeyGraphField, FileOperationField, FileQuery, FileType, FileUploadService, GetCategoriesQuery, GetCategoryKeyIdQuery, GetCategoryQuery, GetMySharedCategoriesQuery, GetRecordQuery, GetRootDirectoryIdsQuery, GetTrustedPartyCategoriesQuery, GetVaultsQuery, IdleService, InitiateOtkMutation, Item2Service, KC_CONFIG, KeyExchange2Service, KeyExchangeFields, KeyExchangeMode, KeyExchangeOtkState, KeyExchangeQuery, KeyExchangeService, KeyExchangeState, KeyExchangeTokenQuery, KeyExchangesQuery, KeyGraphField, KeyGraphFragment, LbopQuery, LbopService, LbopsQuery, LifeReadyAuthService, LifeReadyModule, LinkTypeField, LoadedCategoryTree, LockService, LockState, LoginHistoryQuery, LoginResult, LrApiErrorCode, LrApolloService, LrAuthException, LrBadArgumentException, LrBadLogicException, LrBadRequestException, LrBadStateException, LrCodeMismatchException, LrConcurrentAccessException, LrEncryptionException, LrError, LrErrorCode, LrException, LrExpiredCodeException, LrExpiredException, LrGraphQLService, LrLockedException, LrMergedMutation, LrMutation, LrMutationBase, LrNotFoundException, LrRecord, LrService, LrSuspiciousException, LrUnsupportedException, MainContactCard, MainContactCardFields, MainContactCardPlainFields, MainContactCardProperty, MessageService, MoveDirectoryQuery, MoveFileQuery, NewAttachment, NewCategory, NewOrUpdatedAttachment, NewRecord, NotificationService, OtkState, OwnerPlainDataJson, PassIdpApiResult, PasswordChangeStatus, PasswordCheck, PasswordService, PermissionChoice, PersistService, Plan, PlanService, PlanState, ProfileDetailsService, ProfileService, QueryProcessorService, RecordAttachment, RecordAttachmentFilter, RecordAttachmentService, RecordContentFilter, RecordField, RecordFieldType, RecordFilter, RecordService, RecordType, RecordTypeField, RecordTypeFieldOption, RecordTypeService, RecordTypeSummary, RecoveryStatus, RegisterResult, RegisterService, RequestUserDeleteMutation, RespondOtkMutation, RevertFileQuery, ScenarioLastClaimState, ScenarioService, ScenarioState, ServerConfigService, ServerTimeQuery, SharedAccess, SharedContactCard2Service, StripeBillingPortalSession, StripeCheckoutSession, Subscription, TimeService, TpAssemblyState, TpClaimApproverState, TpClaimState, TpPasswordResetRequestService, TpPasswordResetService, TpPasswordResetUserService, TrustedParty2Service, TrustedPartyDetails, TwoFactorService, UnarchiveDirectoryMutation, UpdateCategoryMutation, UpdateContactCardMutation$1 as UpdateContactCardMutation, UpdateFileQuery, UpdateLbopQuery, UpdateRecordContainerMutation, UpdateRecordMutation, UpdatedCategory, UpdatedRecord, UserDeleteState, UserPlan, UserService, UserSharedKeyFields, Vault, VaultCategory, VaultFields, VaultRecord, VaultRecordType, WebCryptoService, awsFetch, configureAmplifyAuth, configureApollo, fragmentSpreadAstSelection, gqlTyped, handleApolloError, handleCognitoCallback, initialiseAuth, mapEdges, mapUserPlans, parentCategoriesField, processConnection, throwClaimIdMismatch, throwClaimNotApproved, ɵ0, KeyGraphService as ɵa, EncryptionService as ɵb, KeyService as ɵc, KeyFactoryService as ɵd, KeyMetaService as ɵe, LrGraphQLService as ɵf, TpPasswordResetProcessorService as ɵg, RunOutsideAngular as ɵh, TpPasswordResetAssemblyController as ɵi, TpAssemblyController as ɵj, LrService as ɵk, SharedContactCardService as ɵl, TrustedPartyService as ɵm, ScenarioAssemblyController as ɵn, TpPasswordResetPrivateService as ɵo };
 //# sourceMappingURL=lifeready-core.js.map