@bitwarden/cli 2022.6.2 → 2022.8.0

package/build/bw.js

@@ -20,7 +20,7 @@ module.exports = require("url");
 /***/ 147:
 /***/ ((module) => {
 
-module.exports = JSON.parse('{"name":"@bitwarden/cli","description":"A secure and free password manager for all of your devices.","version":"2022.6.2","keywords":["bitwarden","password","vault","password manager","cli"],"author":"Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)","homepage":"https://bitwarden.com","repository":{"type":"git","url":"https://github.com/bitwarden/cli"},"license":"GPL-3.0-only","scripts":{"clean":"rimraf dist/**/*","build":"webpack","build:debug":"npm run build && node --inspect ./build/bw.js","build:watch":"webpack --watch","build:prod":"cross-env NODE_ENV=production webpack","build:prod:watch":"cross-env NODE_ENV=production webpack --watch","package":"npm run package:win && npm run package:mac && npm run package:lin","package:win":"pkg . --targets win-x64 --output ./dist/windows/bw.exe --build","package:mac":"pkg . --targets macos-x64 --output ./dist/macos/bw","package:lin":"pkg . --targets linux-x64 --output ./dist/linux/bw","debug":"node --inspect ./build/bw.js","dist":"npm run build:prod && npm run clean && npm run package","dist:win":"npm run build:prod && npm run clean && npm run package:win","dist:mac":"npm run build:prod && npm run clean && npm run package:mac","dist:lin":"npm run build:prod && npm run clean && npm run package:lin","publish:npm":"npm run build:prod && npm publish --access public","test":"jest","test:watch":"jest --watch","test:watch:all":"jest --watchAll"},"bin":{"bw":"build/bw.js"},"pkg":{"assets":"./build/**/*"},"dependencies":{"@koa/multer":"^3.0.0","@koa/router":"^10.1.1","big-integer":"1.6.48","browser-hrtime":"^1.1.8","chalk":"^4.1.1","commander":"7.2.0","form-data":"4.0.0","https-proxy-agent":"5.0.0","inquirer":"8.0.0","jsdom":"^16.5.3","jszip":"^3.7.1","koa":"^2.13.4","koa-bodyparser":"^4.3.0","koa-json":"^2.0.2","lowdb":"1.0.0","lunr":"^2.3.9","multer":"^1.4.4","node-fetch":"^2.6.1","node-forge":"1.3.1","open":"^8.0.8","papaparse":"^5.3.0","proper-lockfile":"^4.1.2","rxjs":"6.6.7","tldjs":"^2.3.1","zxcvbn":"^4.4.2"}}');
+module.exports = JSON.parse('{"name":"@bitwarden/cli","description":"A secure and free password manager for all of your devices.","version":"2022.8.0","keywords":["bitwarden","password","vault","password manager","cli"],"author":"Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)","homepage":"https://bitwarden.com","repository":{"type":"git","url":"https://github.com/bitwarden/cli"},"license":"GPL-3.0-only","scripts":{"clean":"rimraf dist/**/*","build":"webpack","build:debug":"npm run build && node --inspect ./build/bw.js","build:watch":"webpack --watch","build:prod":"cross-env NODE_ENV=production webpack","build:prod:watch":"cross-env NODE_ENV=production webpack --watch","package":"npm run package:win && npm run package:mac && npm run package:lin","package:win":"pkg . --targets win-x64 --output ./dist/windows/bw.exe --build","package:mac":"pkg . --targets macos-x64 --output ./dist/macos/bw","package:lin":"pkg . --targets linux-x64 --output ./dist/linux/bw","debug":"node --inspect ./build/bw.js","dist":"npm run build:prod && npm run clean && npm run package","dist:win":"npm run build:prod && npm run clean && npm run package:win","dist:mac":"npm run build:prod && npm run clean && npm run package:mac","dist:lin":"npm run build:prod && npm run clean && npm run package:lin","publish:npm":"npm run build:prod && npm publish --access public","test":"jest","test:watch":"jest --watch","test:watch:all":"jest --watchAll"},"bin":{"bw":"build/bw.js"},"pkg":{"assets":"./build/**/*"},"dependencies":{"@koa/multer":"^3.0.0","@koa/router":"^10.1.1","big-integer":"^1.6.51","browser-hrtime":"^1.1.8","chalk":"^4.1.1","commander":"7.2.0","form-data":"4.0.0","https-proxy-agent":"5.0.0","inquirer":"8.0.0","jsdom":"^16.7.0","jszip":"^3.10.0","koa":"^2.13.4","koa-bodyparser":"^4.3.0","koa-json":"^2.0.2","lowdb":"1.0.0","lunr":"^2.3.9","multer":"^1.4.5-lts.1","node-fetch":"^2.6.7","node-forge":"1.3.1","open":"^8.4.0","papaparse":"^5.3.2","proper-lockfile":"^4.1.2","rxjs":"^7.5.5","tldjs":"^2.3.1","zxcvbn":"^4.4.2"}}');
 
 /***/ })
 
@@ -178,10 +178,15 @@ class EncryptionPair {
 }
 class DataEncryptionPair {
 }
+// This is a temporary structure to handle migrated `DataEncryptionPair` to
+//  avoid needing a data migration at this stage. It should be replaced with
+//  proper data migrations when `DataEncryptionPair` is deprecated.
+class TemporaryDataEncryption {
+}
 class AccountData {
     constructor() {
         this.ciphers = new DataEncryptionPair();
-        this.folders = new DataEncryptionPair();
+        this.folders = new TemporaryDataEncryption();
         this.sends = new DataEncryptionPair();
         this.collections = new DataEncryptionPair();
         this.policies = new DataEncryptionPair();
@@ -231,7 +236,8 @@ var StateVersion;
     StateVersion[StateVersion["Two"] = 2] = "Two";
     StateVersion[StateVersion["Three"] = 3] = "Three";
     StateVersion[StateVersion["Four"] = 4] = "Four";
-    StateVersion[StateVersion["Latest"] = 4] = "Latest";
+    StateVersion[StateVersion["Five"] = 5] = "Five";
+    StateVersion[StateVersion["Latest"] = 5] = "Latest";
 })(StateVersion || (StateVersion = {}));
 
 ;// CONCATENATED MODULE: ../../libs/common/src/enums/themeType.ts
@@ -1567,6 +1573,32 @@ class AuthService {
     }
 }
 
+;// CONCATENATED MODULE: ../../libs/common/src/services/broadcaster.service.ts
+class BroadcasterService {
+    constructor() {
+        this.subscribers = new Map();
+    }
+    send(message, id) {
+        if (id != null) {
+            if (this.subscribers.has(id)) {
+                this.subscribers.get(id)(message);
+            }
+            return;
+        }
+        this.subscribers.forEach((value) => {
+            value(message);
+        });
+    }
+    subscribe(id, messageCallback) {
+        this.subscribers.set(id, messageCallback);
+    }
+    unsubscribe(id) {
+        if (this.subscribers.has(id)) {
+            this.subscribers.delete(id);
+        }
+    }
+}
+
 ;// CONCATENATED MODULE: ../../libs/common/src/enums/cipherType.ts
 var CipherType;
 (function (CipherType) {
@@ -2098,6 +2130,21 @@ class SymmetricCryptoKey {
             this.macKeyB64 = Utils.fromBufferToB64(this.macKey);
         }
     }
+    static initFromJson(jsonResult) {
+        if (jsonResult == null) {
+            return jsonResult;
+        }
+        if (jsonResult.keyB64 != null) {
+            jsonResult.key = Utils.fromB64ToArray(jsonResult.keyB64).buffer;
+        }
+        if (jsonResult.encKeyB64 != null) {
+            jsonResult.encKey = Utils.fromB64ToArray(jsonResult.encKeyB64).buffer;
+        }
+        if (jsonResult.macKeyB64 != null) {
+            jsonResult.macKey = Utils.fromB64ToArray(jsonResult.macKeyB64).buffer;
+        }
+        return jsonResult;
+    }
 }
 
 ;// CONCATENATED MODULE: ../../libs/common/src/models/domain/attachment.ts
@@ -13006,6 +13053,68 @@ class EncArrayBuffer {
 class EncryptedObject {
 }
 
+;// CONCATENATED MODULE: ../../libs/common/src/models/domain/encryptedOrganizationKey.ts
+var encryptedOrganizationKey_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+
+
+class BaseEncryptedOrganizationKey {
+    static fromData(data) {
+        switch (data.type) {
+            case "organization":
+                return new EncryptedOrganizationKey(data.key);
+            case "provider":
+                return new ProviderEncryptedOrganizationKey(data.key, data.providerId);
+            default:
+                return null;
+        }
+    }
+}
+class EncryptedOrganizationKey {
+    constructor(key) {
+        this.key = key;
+    }
+    decrypt(cryptoService) {
+        return encryptedOrganizationKey_awaiter(this, void 0, void 0, function* () {
+            const decValue = yield cryptoService.rsaDecrypt(this.key);
+            return new SymmetricCryptoKey(decValue);
+        });
+    }
+    toData() {
+        return {
+            type: "organization",
+            key: this.key,
+        };
+    }
+}
+class ProviderEncryptedOrganizationKey {
+    constructor(key, providerId) {
+        this.key = key;
+        this.providerId = providerId;
+    }
+    decrypt(cryptoService) {
+        return encryptedOrganizationKey_awaiter(this, void 0, void 0, function* () {
+            const providerKey = yield cryptoService.getProviderKey(this.providerId);
+            const decValue = yield cryptoService.decryptToBytes(new EncString(this.key), providerKey);
+            return new SymmetricCryptoKey(decValue);
+        });
+    }
+    toData() {
+        return {
+            type: "provider",
+            key: this.key,
+            providerId: this.providerId,
+        };
+    }
+}
+
 ;// CONCATENATED MODULE: ../../libs/common/src/services/crypto.service.ts
 var crypto_service_decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -13037,9 +13146,11 @@ var crypto_service_awaiter = (undefined && undefined.__awaiter) || function (thi
 
 
 
+
 class CryptoService {
-    constructor(cryptoFunctionService, platformUtilService, logService, stateService) {
+    constructor(cryptoFunctionService, encryptService, platformUtilService, logService, stateService) {
         this.cryptoFunctionService = cryptoFunctionService;
+        this.encryptService = encryptService;
         this.platformUtilService = platformUtilService;
         this.logService = logService;
         this.stateService = stateService;
@@ -13073,20 +13184,24 @@ class CryptoService {
             yield this.stateService.setEncryptedPrivateKey(encPrivateKey);
         });
     }
-    setOrgKeys(orgs, providerOrgs) {
+    setOrgKeys(orgs = [], providerOrgs = []) {
         return crypto_service_awaiter(this, void 0, void 0, function* () {
-            const orgKeys = {};
+            const encOrgKeyData = {};
             orgs.forEach((org) => {
-                orgKeys[org.id] = org.key;
+                encOrgKeyData[org.id] = {
+                    type: "organization",
+                    key: org.key,
+                };
+            });
+            providerOrgs.forEach((org) => {
+                encOrgKeyData[org.id] = {
+                    type: "provider",
+                    providerId: org.providerId,
+                    key: org.key,
+                };
             });
-            for (const providerOrg of providerOrgs) {
-                // Convert provider encrypted keys to user encrypted.
-                const providerKey = yield this.getProviderKey(providerOrg.providerId);
-                const decValue = yield this.decryptToBytes(new EncString(providerOrg.key), providerKey);
-                orgKeys[providerOrg.id] = (yield this.rsaEncrypt(decValue)).encryptedString;
-            }
             yield this.stateService.setDecryptedOrganizationKeys(null);
-            return yield this.stateService.setEncryptedOrganizationKeys(orgKeys);
+            return yield this.stateService.setEncryptedOrganizationKeys(encOrgKeyData);
         });
     }
     setProviderKeys(providers) {
@@ -13200,29 +13315,29 @@ class CryptoService {
     }
     getOrgKeys() {
         return crypto_service_awaiter(this, void 0, void 0, function* () {
-            const orgKeys = new Map();
+            const result = new Map();
             const decryptedOrganizationKeys = yield this.stateService.getDecryptedOrganizationKeys();
             if (decryptedOrganizationKeys != null && decryptedOrganizationKeys.size > 0) {
                 return decryptedOrganizationKeys;
             }
-            const encOrgKeys = yield this.stateService.getEncryptedOrganizationKeys();
-            if (encOrgKeys == null) {
+            const encOrgKeyData = yield this.stateService.getEncryptedOrganizationKeys();
+            if (encOrgKeyData == null) {
                 return null;
             }
             let setKey = false;
-            for (const orgId in encOrgKeys) {
-                // eslint-disable-next-line
-                if (!encOrgKeys.hasOwnProperty(orgId)) {
+            for (const orgId of Object.keys(encOrgKeyData)) {
+                if (result.has(orgId)) {
                     continue;
                 }
-                const decValue = yield this.rsaDecrypt(encOrgKeys[orgId]);
-                orgKeys.set(orgId, new SymmetricCryptoKey(decValue));
+                const encOrgKey = BaseEncryptedOrganizationKey.fromData(encOrgKeyData[orgId]);
+                const decOrgKey = yield encOrgKey.decrypt(this);
+                result.set(orgId, decOrgKey);
                 setKey = true;
             }
             if (setKey) {
-                yield this.stateService.setDecryptedOrganizationKeys(orgKeys);
+                yield this.stateService.setDecryptedOrganizationKeys(result);
             }
-            return orgKeys;
+            return result;
         });
     }
     getOrgKey(orgId) {
@@ -13472,23 +13587,15 @@ class CryptoService {
             return this.buildEncKey(key, encKey.key);
         });
     }
+    /**
+     * @deprecated June 22 2022: This method has been moved to encryptService.
+     * All callers should use this service to grab the relevant key and use encryptService for encryption instead.
+     * This method will be removed once all existing code has been refactored to use encryptService.
+     */
     encrypt(plainValue, key) {
         return crypto_service_awaiter(this, void 0, void 0, function* () {
-            if (plainValue == null) {
-                return Promise.resolve(null);
-            }
-            let plainBuf;
-            if (typeof plainValue === "string") {
-                plainBuf = Utils.fromUtf8ToArray(plainValue).buffer;
-            }
-            else {
-                plainBuf = plainValue;
-            }
-            const encObj = yield this.aesEncrypt(plainBuf, key);
-            const iv = Utils.fromBufferToB64(encObj.iv);
-            const data = Utils.fromBufferToB64(encObj.data);
-            const mac = encObj.mac != null ? Utils.fromBufferToB64(encObj.mac) : null;
-            return new EncString(encObj.key.encType, data, iv, mac);
+            key = yield this.getKeyForEncryption(key);
+            return yield this.encryptService.encrypt(plainValue, key);
         });
     }
     encryptToBytes(plainValue, key) {
@@ -13584,7 +13691,9 @@ class CryptoService {
     }
     decryptToUtf8(encString, key) {
         return crypto_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.aesDecryptToUtf8(encString.encryptionType, encString.data, encString.iv, encString.mac, key);
+            key = yield this.getKeyForEncryption(key);
+            key = yield this.resolveLegacyKey(encString.encryptionType, key);
+            return yield this.encryptService.decryptToUtf8(encString, key);
         });
     }
     decryptFromBytes(encBuf, key) {
@@ -13705,6 +13814,10 @@ class CryptoService {
                 : yield this.stateService.getCryptoMasterKeyBiometric({ userId: userId });
         });
     }
+    /**
+     * @deprecated June 22 2022: This method has been moved to encryptService.
+     * All callers should use encryptService instead. This method will be removed once all existing code has been refactored to use encryptService.
+     */
     aesEncrypt(data, key) {
         return crypto_service_awaiter(this, void 0, void 0, function* () {
             const obj = new EncryptedObject();
@@ -13720,30 +13833,6 @@ class CryptoService {
             return obj;
         });
     }
-    aesDecryptToUtf8(encType, data, iv, mac, key) {
-        return crypto_service_awaiter(this, void 0, void 0, function* () {
-            const keyForEnc = yield this.getKeyForEncryption(key);
-            const theKey = yield this.resolveLegacyKey(encType, keyForEnc);
-            if (theKey.macKey != null && mac == null) {
-                this.logService.error("mac required.");
-                return null;
-            }
-            if (theKey.encType !== encType) {
-                this.logService.error("encType unavailable.");
-                return null;
-            }
-            const fastParams = this.cryptoFunctionService.aesDecryptFastParameters(data, iv, mac, theKey);
-            if (fastParams.macKey != null && fastParams.mac != null) {
-                const computedMac = yield this.cryptoFunctionService.hmacFast(fastParams.macData, fastParams.macKey, "sha256");
-                const macsEqual = yield this.cryptoFunctionService.compareFast(fastParams.mac, computedMac);
-                if (!macsEqual) {
-                    this.logService.error("mac failed.");
-                    return null;
-                }
-            }
-            return this.cryptoFunctionService.aesDecryptFast(fastParams);
-        });
-    }
     aesDecryptToBytes(encType, data, iv, mac, key) {
         return crypto_service_awaiter(this, void 0, void 0, function* () {
             const keyForEnc = yield this.getKeyForEncryption(key);
@@ -13905,6 +13994,91 @@ crypto_service_decorate([
     crypto_service_metadata("design:returntype", Promise)
 ], CryptoService.prototype, "getProviderKeys", null);
 
+;// CONCATENATED MODULE: ../../libs/common/src/services/encrypt.service.ts
+var encrypt_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+
+
+
+class EncryptService {
+    constructor(cryptoFunctionService, logService, logMacFailures) {
+        this.cryptoFunctionService = cryptoFunctionService;
+        this.logService = logService;
+        this.logMacFailures = logMacFailures;
+    }
+    encrypt(plainValue, key) {
+        return encrypt_service_awaiter(this, void 0, void 0, function* () {
+            if (key == null) {
+                throw new Error("no encryption key provided.");
+            }
+            if (plainValue == null) {
+                return Promise.resolve(null);
+            }
+            let plainBuf;
+            if (typeof plainValue === "string") {
+                plainBuf = Utils.fromUtf8ToArray(plainValue).buffer;
+            }
+            else {
+                plainBuf = plainValue;
+            }
+            const encObj = yield this.aesEncrypt(plainBuf, key);
+            const iv = Utils.fromBufferToB64(encObj.iv);
+            const data = Utils.fromBufferToB64(encObj.data);
+            const mac = encObj.mac != null ? Utils.fromBufferToB64(encObj.mac) : null;
+            return new EncString(encObj.key.encType, data, iv, mac);
+        });
+    }
+    decryptToUtf8(encString, key) {
+        return encrypt_service_awaiter(this, void 0, void 0, function* () {
+            if ((key === null || key === void 0 ? void 0 : key.macKey) != null && (encString === null || encString === void 0 ? void 0 : encString.mac) == null) {
+                this.logService.error("mac required.");
+                return null;
+            }
+            if (key.encType !== encString.encryptionType) {
+                this.logService.error("encType unavailable.");
+                return null;
+            }
+            const fastParams = this.cryptoFunctionService.aesDecryptFastParameters(encString.data, encString.iv, encString.mac, key);
+            if (fastParams.macKey != null && fastParams.mac != null) {
+                const computedMac = yield this.cryptoFunctionService.hmacFast(fastParams.macData, fastParams.macKey, "sha256");
+                const macsEqual = yield this.cryptoFunctionService.compareFast(fastParams.mac, computedMac);
+                if (!macsEqual) {
+                    this.logMacFailed("mac failed.");
+                    return null;
+                }
+            }
+            return this.cryptoFunctionService.aesDecryptFast(fastParams);
+        });
+    }
+    aesEncrypt(data, key) {
+        return encrypt_service_awaiter(this, void 0, void 0, function* () {
+            const obj = new EncryptedObject();
+            obj.key = key;
+            obj.iv = yield this.cryptoFunctionService.randomBytes(16);
+            obj.data = yield this.cryptoFunctionService.aesEncrypt(data, obj.iv, obj.key.encKey);
+            if (obj.key.macKey != null) {
+                const macData = new Uint8Array(obj.iv.byteLength + obj.data.byteLength);
+                macData.set(new Uint8Array(obj.iv), 0);
+                macData.set(new Uint8Array(obj.data), obj.iv.byteLength);
+                obj.mac = yield this.cryptoFunctionService.hmac(macData.buffer, obj.key.macKey, "sha256");
+            }
+            return obj;
+        });
+    }
+    logMacFailed(msg) {
+        if (this.logMacFailures) {
+            this.logService.error(msg);
+        }
+    }
+}
+
 ;// CONCATENATED MODULE: external "rxjs"
 const external_rxjs_namespaceObject = require("rxjs");
 ;// CONCATENATED MODULE: ../../libs/common/src/services/environment.service.ts
@@ -13924,6 +14098,7 @@ class EnvironmentService {
         this.stateService = stateService;
         this.urlsSubject = new external_rxjs_namespaceObject.Subject();
         this.urls = this.urlsSubject;
+        this.scimUrl = null;
         this.stateService.activeAccount.subscribe(() => environment_service_awaiter(this, void 0, void 0, function* () {
             yield this.setUrlsFromStorage();
         }));
@@ -13993,6 +14168,14 @@ class EnvironmentService {
     getKeyConnectorUrl() {
         return this.keyConnectorUrl;
     }
+    getScimUrl() {
+        if (this.scimUrl != null) {
+            return this.scimUrl + "/v2";
+        }
+        return this.getWebVaultUrl() === "https://vault.bitwarden.com"
+            ? "https://scim.bitwarden.com/v2"
+            : this.getWebVaultUrl() + "/scim/v2";
+    }
     setUrlsFromStorage() {
         return environment_service_awaiter(this, void 0, void 0, function* () {
             const urls = yield this.stateService.getEnvironmentUrls();
@@ -14005,9 +14188,11 @@ class EnvironmentService {
             this.notificationsUrl = urls.notifications;
             this.eventsUrl = envUrls.events = urls.events;
             this.keyConnectorUrl = urls.keyConnector;
+            // scimUrl is not saved to storage
         });
     }
     setUrls(urls) {
+        var _a;
         return environment_service_awaiter(this, void 0, void 0, function* () {
             urls.base = this.formatUrl(urls.base);
             urls.webVault = this.formatUrl(urls.webVault);
@@ -14017,6 +14202,8 @@ class EnvironmentService {
             urls.notifications = this.formatUrl(urls.notifications);
             urls.events = this.formatUrl(urls.events);
             urls.keyConnector = this.formatUrl(urls.keyConnector);
+            // scimUrl cannot be cleared
+            urls.scim = (_a = this.formatUrl(urls.scim)) !== null && _a !== void 0 ? _a : this.scimUrl;
             yield this.stateService.setEnvironmentUrls({
                 base: urls.base,
                 api: urls.api,
@@ -14026,6 +14213,7 @@ class EnvironmentService {
                 notifications: urls.notifications,
                 events: urls.events,
                 keyConnector: urls.keyConnector,
+                // scimUrl is not saved to storage
             });
             this.baseUrl = urls.base;
             this.webVaultUrl = urls.webVault;
@@ -14035,6 +14223,7 @@ class EnvironmentService {
             this.notificationsUrl = urls.notifications;
             this.eventsUrl = urls.events;
             this.keyConnectorUrl = urls.keyConnector;
+            this.scimUrl = urls.scim;
             this.urlsSubject.next(urls);
             return urls;
         });
@@ -14049,6 +14238,7 @@ class EnvironmentService {
             notifications: this.notificationsUrl,
             events: this.eventsUrl,
             keyConnector: this.keyConnectorUrl,
+            scim: this.scimUrl,
         };
     }
     formatUrl(url) {
@@ -14656,6 +14846,8 @@ var EventType;
     EventType[EventType["OrganizationUser_AdminResetPassword"] = 1508] = "OrganizationUser_AdminResetPassword";
     EventType[EventType["OrganizationUser_ResetSsoLink"] = 1509] = "OrganizationUser_ResetSsoLink";
     EventType[EventType["OrganizationUser_FirstSsoLogin"] = 1510] = "OrganizationUser_FirstSsoLogin";
+    EventType[EventType["OrganizationUser_Deactivated"] = 1511] = "OrganizationUser_Deactivated";
+    EventType[EventType["OrganizationUser_Activated"] = 1512] = "OrganizationUser_Activated";
     EventType[EventType["Organization_Updated"] = 1600] = "Organization_Updated";
     EventType[EventType["Organization_PurgedVault"] = 1601] = "Organization_PurgedVault";
     // Organization_ClientExportedVault = 1602,
@@ -14791,6 +14983,7 @@ var export_service_awaiter = (undefined && undefined.__awaiter) || function (thi
 
 
 
+
 class ExportService {
     constructor(folderService, cipherService, apiService, cryptoService, cryptoFunctionService) {
         this.folderService = folderService;
@@ -14867,7 +15060,7 @@ class ExportService {
             let decFolders = [];
             let decCiphers = [];
             const promises = [];
-            promises.push(this.folderService.getAllDecrypted().then((folders) => {
+            promises.push((0,external_rxjs_namespaceObject.firstValueFrom)(this.folderService.folderViews$).then((folders) => {
                 decFolders = folders;
             }));
             promises.push(this.cipherService.getAllDecrypted().then((ciphers) => {
@@ -14931,7 +15124,7 @@ class ExportService {
             let folders = [];
             let ciphers = [];
             const promises = [];
-            promises.push(this.folderService.getAll().then((f) => {
+            promises.push((0,external_rxjs_namespaceObject.firstValueFrom)(this.folderService.folders$).then((f) => {
                 folders = f;
             }));
             promises.push(this.cipherService.getAll().then((c) => {
@@ -15481,8 +15674,19 @@ class FolderRequest {
     }
 }
 
-;// CONCATENATED MODULE: ../../libs/common/src/services/folder.service.ts
-var folder_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+;// CONCATENATED MODULE: ../../libs/common/src/models/response/folderResponse.ts
+
+class FolderResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.id = this.getResponseProperty("Id");
+        this.name = this.getResponseProperty("Name");
+        this.revisionDate = this.getResponseProperty("RevisionDate");
+    }
+}
+
+;// CONCATENATED MODULE: ../../libs/common/src/services/folder/folder-api.service.ts
+var folder_api_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -15494,23 +15698,99 @@ var folder_service_awaiter = (undefined && undefined.__awaiter) || function (thi
 
 
 
+class FolderApiService {
+    constructor(folderService, apiService) {
+        this.folderService = folderService;
+        this.apiService = apiService;
+    }
+    save(folder) {
+        return folder_api_service_awaiter(this, void 0, void 0, function* () {
+            const request = new FolderRequest(folder);
+            let response;
+            if (folder.id == null) {
+                response = yield this.postFolder(request);
+                folder.id = response.id;
+            }
+            else {
+                response = yield this.putFolder(folder.id, request);
+            }
+            const data = new FolderData(response);
+            yield this.folderService.upsert(data);
+        });
+    }
+    delete(id) {
+        return folder_api_service_awaiter(this, void 0, void 0, function* () {
+            yield this.deleteFolder(id);
+            yield this.folderService.delete(id);
+        });
+    }
+    get(id) {
+        return folder_api_service_awaiter(this, void 0, void 0, function* () {
+            const r = yield this.apiService.send("GET", "/folders/" + id, null, true, true);
+            return new FolderResponse(r);
+        });
+    }
+    postFolder(request) {
+        return folder_api_service_awaiter(this, void 0, void 0, function* () {
+            const r = yield this.apiService.send("POST", "/folders", request, true, true);
+            return new FolderResponse(r);
+        });
+    }
+    putFolder(id, request) {
+        return folder_api_service_awaiter(this, void 0, void 0, function* () {
+            const r = yield this.apiService.send("PUT", "/folders/" + id, request, true, true);
+            return new FolderResponse(r);
+        });
+    }
+    deleteFolder(id) {
+        return this.apiService.send("DELETE", "/folders/" + id, null, true, false);
+    }
+}
+
+;// CONCATENATED MODULE: ../../libs/common/src/services/folder/folder.service.ts
+var folder_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+
+
 
 
 
-const folder_service_NestingDelimiter = "/";
 class FolderService {
-    constructor(cryptoService, apiService, i18nService, cipherService, stateService) {
+    constructor(cryptoService, i18nService, cipherService, stateService) {
         this.cryptoService = cryptoService;
-        this.apiService = apiService;
         this.i18nService = i18nService;
         this.cipherService = cipherService;
         this.stateService = stateService;
+        this._folders = new external_rxjs_namespaceObject.BehaviorSubject([]);
+        this._folderViews = new external_rxjs_namespaceObject.BehaviorSubject([]);
+        this.folders$ = this._folders.asObservable();
+        this.folderViews$ = this._folderViews.asObservable();
+        this.stateService.activeAccountUnlocked.subscribe((unlocked) => folder_service_awaiter(this, void 0, void 0, function* () {
+            if (Utils.global.bitwardenContainerService == null) {
+                return;
+            }
+            if (!unlocked) {
+                this._folders.next([]);
+                this._folderViews.next([]);
+                return;
+            }
+            const data = yield this.stateService.getEncryptedFolders();
+            yield this.updateObservables(data);
+        }));
     }
-    clearCache(userId) {
+    clearCache() {
         return folder_service_awaiter(this, void 0, void 0, function* () {
-            yield this.stateService.setDecryptedFolders(null, { userId: userId });
+            this._folderViews.next([]);
         });
     }
+    // TODO: This should be moved to EncryptService or something
     encrypt(model, key) {
         return folder_service_awaiter(this, void 0, void 0, function* () {
             const folder = new Folder();
@@ -15521,85 +15801,18 @@ class FolderService {
     }
     get(id) {
         return folder_service_awaiter(this, void 0, void 0, function* () {
-            const folders = yield this.stateService.getEncryptedFolders();
-            // eslint-disable-next-line
-            if (folders == null || !folders.hasOwnProperty(id)) {
-                return null;
-            }
-            return new Folder(folders[id]);
-        });
-    }
-    getAll() {
-        return folder_service_awaiter(this, void 0, void 0, function* () {
-            const folders = yield this.stateService.getEncryptedFolders();
-            const response = [];
-            for (const id in folders) {
-                // eslint-disable-next-line
-                if (folders.hasOwnProperty(id)) {
-                    response.push(new Folder(folders[id]));
-                }
-            }
-            return response;
+            const folders = this._folders.getValue();
+            return folders.find((folder) => folder.id === id);
         });
     }
-    getAllDecrypted() {
-        return folder_service_awaiter(this, void 0, void 0, function* () {
-            const decryptedFolders = yield this.stateService.getDecryptedFolders();
-            if (decryptedFolders != null) {
-                return decryptedFolders;
-            }
-            const hasKey = yield this.cryptoService.hasKey();
-            if (!hasKey) {
-                throw new Error("No key.");
-            }
-            const decFolders = [];
-            const promises = [];
-            const folders = yield this.getAll();
-            folders.forEach((folder) => {
-                promises.push(folder.decrypt().then((f) => decFolders.push(f)));
-            });
-            yield Promise.all(promises);
-            decFolders.sort(Utils.getSortFunction(this.i18nService, "name"));
-            const noneFolder = new FolderView();
-            noneFolder.name = this.i18nService.t("noneFolder");
-            decFolders.push(noneFolder);
-            yield this.stateService.setDecryptedFolders(decFolders);
-            return decFolders;
-        });
-    }
-    getAllNested(folders) {
-        return folder_service_awaiter(this, void 0, void 0, function* () {
-            folders = folders !== null && folders !== void 0 ? folders : (yield this.getAllDecrypted());
-            const nodes = [];
-            folders.forEach((f) => {
-                const folderCopy = new FolderView();
-                folderCopy.id = f.id;
-                folderCopy.revisionDate = f.revisionDate;
-                const parts = f.name != null ? f.name.replace(/^\/+|\/+$/g, "").split(folder_service_NestingDelimiter) : [];
-                ServiceUtils.nestedTraverse(nodes, 0, parts, folderCopy, null, folder_service_NestingDelimiter);
-            });
-            return nodes;
-        });
-    }
-    getNested(id) {
+    /**
+     * @deprecated Only use in CLI!
+     */
+    getAllDecryptedFromState() {
         return folder_service_awaiter(this, void 0, void 0, function* () {
-            const folders = yield this.getAllNested();
-            return ServiceUtils.getTreeNodeObject(folders, id);
-        });
-    }
-    saveWithServer(folder) {
-        return folder_service_awaiter(this, void 0, void 0, function* () {
-            const request = new FolderRequest(folder);
-            let response;
-            if (folder.id == null) {
-                response = yield this.apiService.postFolder(request);
-                folder.id = response.id;
-            }
-            else {
-                response = yield this.apiService.putFolder(folder.id, request);
-            }
-            const data = new FolderData(response);
-            yield this.upsert(data);
+            const data = yield this.stateService.getEncryptedFolders();
+            const folders = Object.values(data || {}).map((f) => new Folder(f));
+            return this.decryptFolders(folders);
         });
     }
     upsert(folder) {
@@ -15617,19 +15830,22 @@ class FolderService {
                     folders[f.id] = f;
                 });
             }
-            yield this.stateService.setDecryptedFolders(null);
+            yield this.updateObservables(folders);
             yield this.stateService.setEncryptedFolders(folders);
         });
     }
     replace(folders) {
         return folder_service_awaiter(this, void 0, void 0, function* () {
-            yield this.stateService.setDecryptedFolders(null);
+            yield this.updateObservables(folders);
             yield this.stateService.setEncryptedFolders(folders);
         });
     }
     clear(userId) {
         return folder_service_awaiter(this, void 0, void 0, function* () {
-            yield this.stateService.setDecryptedFolders(null, { userId: userId });
+            if (userId == null || userId == (yield this.stateService.getUserId())) {
+                this._folders.next([]);
+                this._folderViews.next([]);
+            }
             yield this.stateService.setEncryptedFolders(null, { userId: userId });
         });
     }
@@ -15650,7 +15866,7 @@ class FolderService {
                     delete folders[i];
                 });
             }
-            yield this.stateService.setDecryptedFolders(null);
+            yield this.updateObservables(folders);
             yield this.stateService.setEncryptedFolders(folders);
             // Items in a deleted folder are re-assigned to "No Folder"
             const ciphers = yield this.stateService.getEncryptedCiphers();
@@ -15668,10 +15884,24 @@ class FolderService {
             }
         });
     }
-    deleteWithServer(id) {
+    updateObservables(foldersMap) {
         return folder_service_awaiter(this, void 0, void 0, function* () {
-            yield this.apiService.deleteFolder(id);
-            yield this.delete(id);
+            const folders = Object.values(foldersMap || {}).map((f) => new Folder(f));
+            this._folders.next(folders);
+            if (yield this.cryptoService.hasKey()) {
+                this._folderViews.next(yield this.decryptFolders(folders));
+            }
+        });
+    }
+    decryptFolders(folders) {
+        return folder_service_awaiter(this, void 0, void 0, function* () {
+            const decryptFolderPromises = folders.map((f) => f.decrypt());
+            const decryptedFolders = yield Promise.all(decryptFolderPromises);
+            decryptedFolders.sort(Utils.getSortFunction(this.i18nService, "name"));
+            const noneFolder = new FolderView();
+            noneFolder.name = this.i18nService.t("noneFolder");
+            decryptedFolders.push(noneFolder);
+            return decryptedFolders;
         });
     }
 }
@@ -21731,6 +21961,45 @@ class KeyConnectorService {
     }
 }
 
+;// CONCATENATED MODULE: ../../libs/common/src/services/memoryStorage.service.ts
+var memoryStorage_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+class MemoryStorageService {
+    constructor() {
+        this.store = new Map();
+    }
+    get(key) {
+        if (this.store.has(key)) {
+            const obj = this.store.get(key);
+            return Promise.resolve(obj);
+        }
+        return Promise.resolve(null);
+    }
+    has(key) {
+        return memoryStorage_service_awaiter(this, void 0, void 0, function* () {
+            return this.get(key) != null;
+        });
+    }
+    save(key, obj) {
+        if (obj == null) {
+            return this.remove(key);
+        }
+        this.store.set(key, obj);
+        return Promise.resolve();
+    }
+    remove(key) {
+        this.store.delete(key);
+        return Promise.resolve();
+    }
+}
+
 ;// CONCATENATED MODULE: ../../libs/common/src/services/noopMessaging.service.ts
 class NoopMessagingService {
     send(subscriber, arg = {}) {
@@ -21744,6 +22013,7 @@ var OrganizationUserStatusType;
     OrganizationUserStatusType[OrganizationUserStatusType["Invited"] = 0] = "Invited";
     OrganizationUserStatusType[OrganizationUserStatusType["Accepted"] = 1] = "Accepted";
     OrganizationUserStatusType[OrganizationUserStatusType["Confirmed"] = 2] = "Confirmed";
+    OrganizationUserStatusType[OrganizationUserStatusType["Deactivated"] = -1] = "Deactivated";
 })(OrganizationUserStatusType || (OrganizationUserStatusType = {}));
 
 ;// CONCATENATED MODULE: ../../libs/common/src/enums/permissions.ts
@@ -21775,6 +22045,7 @@ var Permissions;
     Permissions[Permissions["DeleteAssignedCollections"] = 15] = "DeleteAssignedCollections";
     Permissions[Permissions["ManageSso"] = 16] = "ManageSso";
     Permissions[Permissions["ManageBilling"] = 17] = "ManageBilling";
+    Permissions[Permissions["ManageScim"] = 18] = "ManageScim";
 })(Permissions || (Permissions = {}));
 
 ;// CONCATENATED MODULE: ../../libs/common/src/models/domain/organization.ts
@@ -21800,6 +22071,7 @@ class Organization {
         this.useApi = obj.useApi;
         this.useSso = obj.useSso;
         this.useKeyConnector = obj.useKeyConnector;
+        this.useScim = obj.useScim;
         this.useResetPassword = obj.useResetPassword;
         this.selfHost = obj.selfHost;
         this.usersGetPremium = obj.usersGetPremium;
@@ -21886,6 +22158,9 @@ class Organization {
     get canManageSso() {
         return this.isAdmin || this.permissions.manageSso;
     }
+    get canManageScim() {
+        return this.isAdmin || this.permissions.manageScim;
+    }
     get canManagePolicies() {
         return this.isAdmin || this.permissions.managePolicies;
     }
@@ -21915,6 +22190,7 @@ class Organization {
             (permissions.includes(Permissions.ManageUsers) && this.canManageUsers) ||
             (permissions.includes(Permissions.ManageUsersPassword) && this.canManageUsersPassword) ||
             (permissions.includes(Permissions.ManageSso) && this.canManageSso) ||
+            (permissions.includes(Permissions.ManageScim) && this.canManageScim) ||
             (permissions.includes(Permissions.ManageBilling) && this.canManageBilling);
         return specifiedPermissions && (this.enabled || this.isOwner);
     }
@@ -22381,6 +22657,7 @@ class PasswordGenerationService {
                 currentHistory.pop();
             }
             const newHistory = yield this.encryptHistory(currentHistory);
+            yield this.stateService.setDecryptedPasswordGenerationHistory(currentHistory);
             return yield this.stateService.setEncryptedPasswordGenerationHistory(newHistory);
         });
     }
@@ -22814,6 +23091,7 @@ var ProviderUserStatusType;
     ProviderUserStatusType[ProviderUserStatusType["Invited"] = 0] = "Invited";
     ProviderUserStatusType[ProviderUserStatusType["Accepted"] = 1] = "Accepted";
     ProviderUserStatusType[ProviderUserStatusType["Confirmed"] = 2] = "Confirmed";
+    ProviderUserStatusType[ProviderUserStatusType["Deactivated"] = -1] = "Deactivated";
 })(ProviderUserStatusType || (ProviderUserStatusType = {}));
 
 ;// CONCATENATED MODULE: ../../libs/common/src/enums/providerUserType.ts
@@ -22928,10 +23206,17 @@ class SearchService {
         this.indexedEntityId = null;
         this.indexing = false;
         this.index = null;
-        this.searchableMinLength = 2;
-        if (["zh-CN", "zh-TW"].indexOf(i18nService.locale) !== -1) {
-            this.searchableMinLength = 1;
-        }
+        this.immediateSearchLocales = ["zh-CN", "zh-TW", "ja", "ko", "vi"];
+        this.defaultSearchableMinLength = 2;
+        this.searchableMinLength = this.defaultSearchableMinLength;
+        this.i18nService.locale$.subscribe((locale) => {
+            if (this.immediateSearchLocales.indexOf(locale) !== -1) {
+                this.searchableMinLength = 1;
+            }
+            else {
+                this.searchableMinLength = this.defaultSearchableMinLength;
+            }
+        });
         //register lunr pipeline function
         external_lunr_namespaceObject.Pipeline.registerFunction(this.normalizeAccentsPipelineFunction, "normalizeAccents");
     }
@@ -23073,7 +23358,9 @@ class SearchService {
             if (c.subTitle != null && c.subTitle.toLowerCase().indexOf(query) > -1) {
                 return true;
             }
-            if (c.login && c.login.uri != null && c.login.uri.toLowerCase().indexOf(query) > -1) {
+            if (c.login &&
+                c.login.hasUris &&
+                c.login.uris.some((loginUri) => loginUri.uri.toLowerCase().indexOf(query) > -1)) {
                 return true;
             }
             return false;
@@ -23912,6 +24199,23 @@ var StorageLocation;
     StorageLocation["Memory"] = "memory";
 })(StorageLocation || (StorageLocation = {}));
 
+;// CONCATENATED MODULE: ../../libs/common/src/models/data/eventData.ts
+class EventData {
+}
+
+;// CONCATENATED MODULE: ../../libs/common/src/models/data/providerData.ts
+class ProviderData {
+    constructor(response) {
+        this.id = response.id;
+        this.name = response.name;
+        this.status = response.status;
+        this.type = response.type;
+        this.enabled = response.enabled;
+        this.userId = response.userId;
+        this.useEvents = response.useEvents;
+    }
+}
+
 ;// CONCATENATED MODULE: ../../libs/common/src/models/domain/state.ts
 class State {
     constructor(globals) {
@@ -23923,6 +24227,15 @@ class State {
 }
 
 ;// CONCATENATED MODULE: ../../libs/common/src/services/state.service.ts
+var state_service_decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var state_service_metadata = (undefined && undefined.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var state_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -23937,9 +24250,25 @@ var state_service_awaiter = (undefined && undefined.__awaiter) || function (this
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 const keys = {
+    state: "state",
     global: "global",
     authenticatedAccounts: "authenticatedAccounts",
     activeUserId: "activeUserId",
@@ -23952,18 +24281,33 @@ const partialKeys = {
     masterKey: "_masterkey",
 };
 class StateService {
-    constructor(storageService, secureStorageService, logService, stateMigrationService, stateFactory, useAccountCache = true) {
+    constructor(storageService, secureStorageService, memoryStorageService, logService, stateMigrationService, stateFactory, useAccountCache = true) {
         this.storageService = storageService;
         this.secureStorageService = secureStorageService;
+        this.memoryStorageService = memoryStorageService;
         this.logService = logService;
         this.stateMigrationService = stateMigrationService;
         this.stateFactory = stateFactory;
         this.useAccountCache = useAccountCache;
         this.accounts = new external_rxjs_namespaceObject.BehaviorSubject({});
         this.activeAccount = new external_rxjs_namespaceObject.BehaviorSubject(null);
-        this.state = new State(this.createGlobals());
+        this.activeAccountUnlocked = new external_rxjs_namespaceObject.BehaviorSubject(false);
         this.hasBeenInited = false;
+        this.isRecoveredSession = false;
         this.accountDiskCache = new Map();
+        // If the account gets changed, verify the new account is unlocked
+        this.activeAccount.subscribe((userId) => state_service_awaiter(this, void 0, void 0, function* () {
+            if (userId == null && this.activeAccountUnlocked.getValue() == false) {
+                return;
+            }
+            else if (userId == null) {
+                this.activeAccountUnlocked.next(false);
+            }
+            // FIXME: This should be refactored into AuthService or a similar service,
+            //  as checking for the existance of the crypto key is a low level
+            //  implementation detail.
+            this.activeAccountUnlocked.next((yield this.getCryptoMasterKey()) != null);
+        }));
     }
     init() {
         return state_service_awaiter(this, void 0, void 0, function* () {
@@ -23973,26 +24317,40 @@ class StateService {
             if (yield this.stateMigrationService.needsMigration()) {
                 yield this.stateMigrationService.migrate();
             }
+            yield this.state().then((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                if (state == null) {
+                    yield this.setState(new State(this.createGlobals()));
+                }
+                else {
+                    this.isRecoveredSession = true;
+                }
+            }));
             yield this.initAccountState();
             this.hasBeenInited = true;
         });
     }
     initAccountState() {
-        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            this.state.authenticatedAccounts =
-                (_a = (yield this.storageService.get(keys.authenticatedAccounts))) !== null && _a !== void 0 ? _a : [];
-            for (const i in this.state.authenticatedAccounts) {
-                if (i != null) {
-                    yield this.syncAccountFromDisk(this.state.authenticatedAccounts[i]);
-                }
-            }
-            const storedActiveUser = yield this.storageService.get(keys.activeUserId);
-            if (storedActiveUser != null) {
-                this.state.activeUserId = storedActiveUser;
+            if (this.isRecoveredSession) {
+                return;
             }
-            yield this.pushAccounts();
-            this.activeAccount.next(this.state.activeUserId);
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                var _a;
+                state.authenticatedAccounts =
+                    (_a = (yield this.storageService.get(keys.authenticatedAccounts))) !== null && _a !== void 0 ? _a : [];
+                for (const i in state.authenticatedAccounts) {
+                    if (i != null) {
+                        yield this.syncAccountFromDisk(state.authenticatedAccounts[i]);
+                    }
+                }
+                const storedActiveUser = yield this.storageService.get(keys.activeUserId);
+                if (storedActiveUser != null) {
+                    state.activeUserId = storedActiveUser;
+                }
+                yield this.pushAccounts();
+                this.activeAccount.next(state.activeUserId);
+                return state;
+            }));
         });
     }
     syncAccountFromDisk(userId) {
@@ -24000,17 +24358,23 @@ class StateService {
             if (userId == null) {
                 return;
             }
-            this.state.accounts[userId] = this.createAccount();
-            const diskAccount = yield this.getAccountFromDisk({ userId: userId });
-            this.state.accounts[userId].profile = diskAccount.profile;
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                state.accounts[userId] = this.createAccount();
+                const diskAccount = yield this.getAccountFromDisk({ userId: userId });
+                state.accounts[userId].profile = diskAccount.profile;
+                return state;
+            }));
         });
     }
     addAccount(account) {
         return state_service_awaiter(this, void 0, void 0, function* () {
             account = yield this.setAccountEnvironmentUrls(account);
-            this.state.authenticatedAccounts.push(account.profile.userId);
-            yield this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts);
-            this.state.accounts[account.profile.userId] = account;
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                state.authenticatedAccounts.push(account.profile.userId);
+                yield this.storageService.save(keys.authenticatedAccounts, state.authenticatedAccounts);
+                state.accounts[account.profile.userId] = account;
+                return state;
+            }));
             yield this.scaffoldNewAccountStorage(account);
             yield this.setLastActive(new Date().getTime(), { userId: account.profile.userId });
             yield this.setActiveUser(account.profile.userId);
@@ -24020,17 +24384,21 @@ class StateService {
     setActiveUser(userId) {
         return state_service_awaiter(this, void 0, void 0, function* () {
             this.clearDecryptedDataForActiveUser();
-            this.state.activeUserId = userId;
-            yield this.storageService.save(keys.activeUserId, userId);
-            this.activeAccount.next(this.state.activeUserId);
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                state.activeUserId = userId;
+                yield this.storageService.save(keys.activeUserId, userId);
+                this.activeAccount.next(state.activeUserId);
+                return state;
+            }));
             yield this.pushAccounts();
         });
     }
     clean(options) {
+        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            options = this.reconcileOptions(options, this.defaultInMemoryOptions);
+            options = this.reconcileOptions(options, yield this.defaultInMemoryOptions());
             yield this.deAuthenticateAccount(options.userId);
-            if (options.userId === this.state.activeUserId) {
+            if (options.userId === ((_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId)) {
                 yield this.dynamicallySetActiveUser();
             }
             yield this.removeAccountFromDisk(options === null || options === void 0 ? void 0 : options.userId);
@@ -24056,14 +24424,14 @@ class StateService {
     getAddEditCipherInfo(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.addEditCipherInfo;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.addEditCipherInfo;
         });
     }
     setAddEditCipherInfo(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.data.addEditCipherInfo = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getAlwaysShowDock(options) {
@@ -24164,14 +24532,14 @@ class StateService {
     getBiometricLocked(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return ((_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.biometricLocked) !== null && _c !== void 0 ? _c : false);
+            return ((_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.biometricLocked) !== null && _c !== void 0 ? _c : false);
         });
     }
     setBiometricLocked(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.settings.biometricLocked = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getBiometricText(options) {
@@ -24294,14 +24662,21 @@ class StateService {
     getCryptoMasterKey(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.cryptoMasterKey;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.cryptoMasterKey;
         });
     }
     setCryptoMasterKey(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.keys.cryptoMasterKey = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
+            if (options.userId == this.activeAccount.getValue()) {
+                const nextValue = value != null;
+                // Avoid emitting if we are already unlocked
+                if (this.activeAccountUnlocked.getValue() != nextValue) {
+                    this.activeAccountUnlocked.next(nextValue);
+                }
+            }
         });
     }
     getCryptoMasterKeyAuto(options) {
@@ -24370,157 +24745,152 @@ class StateService {
     getDecodedToken(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.tokens) === null || _b === void 0 ? void 0 : _b.decodedToken;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.tokens) === null || _b === void 0 ? void 0 : _b.decodedToken;
         });
     }
     setDecodedToken(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.tokens.decodedToken = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedCiphers(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.ciphers) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.ciphers) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedCiphers(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.data.ciphers.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedCollections(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.collections) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.collections) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedCollections(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.data.collections.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedCryptoSymmetricKey(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.cryptoSymmetricKey) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.cryptoSymmetricKey) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedCryptoSymmetricKey(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.keys.cryptoSymmetricKey.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
-        });
-    }
-    getDecryptedFolders(options) {
-        var _a, _b, _c;
-        return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.folders) === null || _c === void 0 ? void 0 : _c.decrypted;
-        });
-    }
-    setDecryptedFolders(value, options) {
-        return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
-            account.data.folders.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedOrganizationKeys(options) {
-        var _a, _b, _c;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.organizationKeys) === null || _c === void 0 ? void 0 : _c.decrypted;
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
+            return (_b = (_a = account === null || account === void 0 ? void 0 : account.keys) === null || _a === void 0 ? void 0 : _a.organizationKeys) === null || _b === void 0 ? void 0 : _b.decrypted;
         });
     }
     setDecryptedOrganizationKeys(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.keys.organizationKeys.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedPasswordGenerationHistory(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.passwordGenerationHistory) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.passwordGenerationHistory) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedPasswordGenerationHistory(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.data.passwordGenerationHistory.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedPinProtected(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.pinProtected) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.pinProtected) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedPinProtected(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.settings.pinProtected.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedPolicies(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.policies) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.policies) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedPolicies(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.data.policies.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedPrivateKey(options) {
-        var _a, _b, _c;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.privateKey) === null || _c === void 0 ? void 0 : _c.decrypted;
+            const privateKey = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.privateKey;
+            let result = privateKey === null || privateKey === void 0 ? void 0 : privateKey.decrypted;
+            if (result == null && (privateKey === null || privateKey === void 0 ? void 0 : privateKey.decryptedSerialized) != null) {
+                result = Utils.fromByteStringToArray(privateKey.decryptedSerialized);
+            }
+            return result;
         });
     }
     setDecryptedPrivateKey(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.keys.privateKey.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            account.keys.privateKey.decryptedSerialized =
+                value == null ? null : Utils.fromBufferToByteString(value);
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedProviderKeys(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.providerKeys) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.providerKeys) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedProviderKeys(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.keys.providerKeys.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDecryptedSends(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.sends) === null || _c === void 0 ? void 0 : _c.decrypted;
+            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.sends) === null || _c === void 0 ? void 0 : _c.decrypted;
         });
     }
     setDecryptedSends(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.data.sends.decrypted = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getDefaultUriMatch(options) {
@@ -24669,14 +25039,14 @@ class StateService {
     getEmail(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.email;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.email;
         });
     }
     setEmail(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.profile.email = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getEmailVerified(options) {
@@ -24945,9 +25315,10 @@ class StateService {
         });
     }
     getEncryptedPrivateKey(options) {
-        var _a, _b, _c;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions())))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.privateKey) === null || _c === void 0 ? void 0 : _c.encrypted;
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            return (_b = (_a = account === null || account === void 0 ? void 0 : account.keys) === null || _a === void 0 ? void 0 : _a.privateKey) === null || _b === void 0 ? void 0 : _b.encrypted;
         });
     }
     setEncryptedPrivateKey(value, options) {
@@ -25010,13 +25381,13 @@ class StateService {
         });
     }
     getEnvironmentUrls(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            if (this.state.activeUserId == null) {
+            if (((_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId) == null) {
                 return yield this.getGlobalEnvironmentUrls(options);
             }
             options = this.reconcileOptions(options, yield this.defaultOnDiskOptions());
-            return (_c = (_b = (_a = (yield this.getAccount(options))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.environmentUrls) !== null && _c !== void 0 ? _c : new EnvironmentUrls();
+            return (_d = (_c = (_b = (yield this.getAccount(options))) === null || _b === void 0 ? void 0 : _b.settings) === null || _c === void 0 ? void 0 : _c.environmentUrls) !== null && _d !== void 0 ? _d : new EnvironmentUrls();
         });
     }
     setEnvironmentUrls(value, options) {
@@ -25057,27 +25428,27 @@ class StateService {
     getEverBeenUnlocked(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return ((_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.everBeenUnlocked) !== null && _c !== void 0 ? _c : false);
+            return ((_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.everBeenUnlocked) !== null && _c !== void 0 ? _c : false);
         });
     }
     setEverBeenUnlocked(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.profile.everBeenUnlocked = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getForcePasswordReset(options) {
         var _a, _b, _c;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return ((_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.forcePasswordReset) !== null && _c !== void 0 ? _c : false);
+            return ((_c = (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.forcePasswordReset) !== null && _c !== void 0 ? _c : false);
         });
     }
     setForcePasswordReset(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.profile.forcePasswordReset = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getInstalledVersion(options) {
@@ -25214,14 +25585,14 @@ class StateService {
     getMainWindowSize(options) {
         var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_a = (yield this.getGlobals(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.mainWindowSize;
+            return (_a = (yield this.getGlobals(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.mainWindowSize;
         });
     }
     setMainWindowSize(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const globals = yield this.getGlobals(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const globals = yield this.getGlobals(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             globals.mainWindowSize = value;
-            yield this.saveGlobals(globals, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveGlobals(globals, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getMinimizeOnCopyToClipboard(options) {
@@ -25292,14 +25663,14 @@ class StateService {
     getOrganizationInvitation(options) {
         var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_a = (yield this.getGlobals(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.organizationInvitation;
+            return (_a = (yield this.getGlobals(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.organizationInvitation;
         });
     }
     setOrganizationInvitation(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const globals = yield this.getGlobals(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const globals = yield this.getGlobals(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             globals.organizationInvitation = value;
-            yield this.saveGlobals(globals, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveGlobals(globals, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getOrganizations(options) {
@@ -25318,40 +25689,40 @@ class StateService {
     getPasswordGenerationOptions(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.passwordGenerationOptions;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.passwordGenerationOptions;
         });
     }
     setPasswordGenerationOptions(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions()));
             account.settings.passwordGenerationOptions = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions()));
         });
     }
     getUsernameGenerationOptions(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.usernameGenerationOptions;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.usernameGenerationOptions;
         });
     }
     setUsernameGenerationOptions(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions()));
             account.settings.usernameGenerationOptions = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions()));
         });
     }
     getGeneratorOptions(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.generatorOptions;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions())))) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.generatorOptions;
         });
     }
     setGeneratorOptions(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions()));
             account.settings.generatorOptions = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskLocalOptions()));
         });
     }
     getProtectedPin(options) {
@@ -25381,16 +25752,22 @@ class StateService {
         });
     }
     getPublicKey(options) {
-        var _a, _b;
+        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.publicKey;
+            const keys = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.keys;
+            let result = keys === null || keys === void 0 ? void 0 : keys.publicKey;
+            if (result == null && (keys === null || keys === void 0 ? void 0 : keys.publicKeySerialized) != null) {
+                result = Utils.fromByteStringToArray(keys.publicKeySerialized);
+            }
+            return result;
         });
     }
     setPublicKey(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.keys.publicKey = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            account.keys.publicKeySerialized = value == null ? null : Utils.fromBufferToByteString(value);
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getRefreshToken(options) {
@@ -25424,14 +25801,14 @@ class StateService {
     getSecurityStamp(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))) === null || _a === void 0 ? void 0 : _a.tokens) === null || _b === void 0 ? void 0 : _b.securityStamp;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions())))) === null || _a === void 0 ? void 0 : _a.tokens) === null || _b === void 0 ? void 0 : _b.securityStamp;
         });
     }
     setSecurityStamp(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
             account.tokens.securityStamp = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultInMemoryOptions()));
         });
     }
     getSettings(options) {
@@ -25592,7 +25969,7 @@ class StateService {
         return state_service_awaiter(this, void 0, void 0, function* () {
             let globals;
             if (this.useMemory(options.storageLocation)) {
-                globals = this.getGlobalsFromMemory();
+                globals = yield this.getGlobalsFromMemory();
             }
             if (this.useDisk && globals == null) {
                 globals = yield this.getGlobalsFromDisk(options);
@@ -25608,7 +25985,9 @@ class StateService {
         });
     }
     getGlobalsFromMemory() {
-        return this.state.globals;
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            return (yield this.state()).globals;
+        });
     }
     getGlobalsFromDisk(options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
@@ -25616,7 +25995,12 @@ class StateService {
         });
     }
     saveGlobalsToMemory(globals) {
-        this.state.globals = globals;
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                state.globals = globals;
+                return state;
+            }));
+        });
     }
     saveGlobalsToDisk(globals, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
@@ -25633,7 +26017,7 @@ class StateService {
             try {
                 let account;
                 if (this.useMemory(options.storageLocation)) {
-                    account = this.getAccountFromMemory(options);
+                    account = yield this.getAccountFromMemory(options);
                 }
                 if (this.useDisk(options.storageLocation) && account == null) {
                     account = yield this.getAccountFromDisk(options);
@@ -25646,21 +26030,29 @@ class StateService {
         });
     }
     getAccountFromMemory(options) {
-        if (this.state.accounts == null) {
-            return null;
-        }
-        return this.state.accounts[this.getUserIdFromMemory(options)];
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.state().then((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                if (state.accounts == null) {
+                    return null;
+                }
+                return state.accounts[yield this.getUserIdFromMemory(options)];
+            }));
+        });
     }
     getUserIdFromMemory(options) {
-        var _a, _b;
-        return (options === null || options === void 0 ? void 0 : options.userId) != null
-            ? (_b = (_a = this.state.accounts[options.userId]) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.userId
-            : this.state.activeUserId;
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.state().then((state) => {
+                var _a, _b;
+                return (options === null || options === void 0 ? void 0 : options.userId) != null
+                    ? (_b = (_a = state.accounts[options.userId]) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.userId
+                    : state.activeUserId;
+            });
+        });
     }
     getAccountFromDisk(options) {
-        var _a;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            if ((options === null || options === void 0 ? void 0 : options.userId) == null && this.state.activeUserId == null) {
+            if ((options === null || options === void 0 ? void 0 : options.userId) == null && ((_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId) == null) {
                 return null;
             }
             if (this.useAccountCache) {
@@ -25670,7 +26062,7 @@ class StateService {
                 }
             }
             const account = (options === null || options === void 0 ? void 0 : options.useSecureStorage)
-                ? (_a = (yield this.secureStorageService.get(options.userId, options))) !== null && _a !== void 0 ? _a : (yield this.storageService.get(options.userId, this.reconcileOptions(options, { htmlStorageLocation: HtmlStorageLocation.Local })))
+                ? (_b = (yield this.secureStorageService.get(options.userId, options))) !== null && _b !== void 0 ? _b : (yield this.storageService.get(options.userId, this.reconcileOptions(options, { htmlStorageLocation: HtmlStorageLocation.Local })))
                 : yield this.storageService.get(options.userId, options);
             if (this.useAccountCache) {
                 this.accountDiskCache.set(options.userId, account);
@@ -25708,7 +26100,12 @@ class StateService {
     saveAccountToMemory(account) {
         return state_service_awaiter(this, void 0, void 0, function* () {
             if (this.getAccountFromMemory({ userId: account.profile.userId }) !== null) {
-                this.state.accounts[account.profile.userId] = account;
+                yield this.updateState((state) => {
+                    return new Promise((resolve) => {
+                        state.accounts[account.profile.userId] = account;
+                        resolve(state);
+                    });
+                });
             }
             yield this.pushAccounts();
         });
@@ -25770,14 +26167,15 @@ class StateService {
     }
     //
     pushAccounts() {
-        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
             yield this.pruneInMemoryAccounts();
-            if (((_a = this.state) === null || _a === void 0 ? void 0 : _a.accounts) == null || Object.keys(this.state.accounts).length < 1) {
-                this.accounts.next(null);
-                return;
-            }
-            this.accounts.next(this.state.accounts);
+            yield this.state().then((state) => {
+                if (state.accounts == null || Object.keys(state.accounts).length < 1) {
+                    this.accounts.next(null);
+                    return;
+                }
+                this.accounts.next(state.accounts);
+            });
         });
     }
     reconcileOptions(requestedOptions, defaultOptions) {
@@ -25795,49 +26193,54 @@ class StateService {
         requestedOptions.keySuffix = (_e = requestedOptions === null || requestedOptions === void 0 ? void 0 : requestedOptions.keySuffix) !== null && _e !== void 0 ? _e : defaultOptions.keySuffix;
         return requestedOptions;
     }
-    get defaultInMemoryOptions() {
-        return { storageLocation: StorageLocation.Memory, userId: this.state.activeUserId };
+    defaultInMemoryOptions() {
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            return {
+                storageLocation: StorageLocation.Memory,
+                userId: (yield this.state()).activeUserId,
+            };
+        });
     }
     defaultOnDiskOptions() {
-        var _a;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
             return {
                 storageLocation: StorageLocation.Disk,
                 htmlStorageLocation: HtmlStorageLocation.Session,
-                userId: (_a = this.state.activeUserId) !== null && _a !== void 0 ? _a : (yield this.getActiveUserIdFromStorage()),
+                userId: (_b = (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId) !== null && _b !== void 0 ? _b : (yield this.getActiveUserIdFromStorage()),
                 useSecureStorage: false,
             };
         });
     }
     defaultOnDiskLocalOptions() {
-        var _a;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
             return {
                 storageLocation: StorageLocation.Disk,
                 htmlStorageLocation: HtmlStorageLocation.Local,
-                userId: (_a = this.state.activeUserId) !== null && _a !== void 0 ? _a : (yield this.getActiveUserIdFromStorage()),
+                userId: (_b = (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId) !== null && _b !== void 0 ? _b : (yield this.getActiveUserIdFromStorage()),
                 useSecureStorage: false,
             };
         });
     }
     defaultOnDiskMemoryOptions() {
-        var _a;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
             return {
                 storageLocation: StorageLocation.Disk,
                 htmlStorageLocation: HtmlStorageLocation.Memory,
-                userId: (_a = this.state.activeUserId) !== null && _a !== void 0 ? _a : (yield this.getUserId()),
+                userId: (_b = (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId) !== null && _b !== void 0 ? _b : (yield this.getUserId()),
                 useSecureStorage: false,
             };
         });
     }
     defaultSecureStorageOptions() {
-        var _a;
+        var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
             return {
                 storageLocation: StorageLocation.Disk,
                 useSecureStorage: true,
-                userId: (_a = this.state.activeUserId) !== null && _a !== void 0 ? _a : (yield this.getActiveUserIdFromStorage()),
+                userId: (_b = (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId) !== null && _b !== void 0 ? _b : (yield this.getActiveUserIdFromStorage()),
             };
         });
     }
@@ -25846,37 +26249,50 @@ class StateService {
             return yield this.storageService.get(keys.activeUserId);
         });
     }
-    removeAccountFromLocalStorage(userId = this.state.activeUserId) {
+    removeAccountFromLocalStorage(userId = null) {
+        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
+            userId = userId !== null && userId !== void 0 ? userId : (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId;
             const storedAccount = yield this.getAccount(this.reconcileOptions({ userId: userId }, yield this.defaultOnDiskLocalOptions()));
             yield this.saveAccount(this.resetAccount(storedAccount), this.reconcileOptions({ userId: userId }, yield this.defaultOnDiskLocalOptions()));
         });
     }
-    removeAccountFromSessionStorage(userId = this.state.activeUserId) {
+    removeAccountFromSessionStorage(userId = null) {
+        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
+            userId = userId !== null && userId !== void 0 ? userId : (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId;
             const storedAccount = yield this.getAccount(this.reconcileOptions({ userId: userId }, yield this.defaultOnDiskOptions()));
             yield this.saveAccount(this.resetAccount(storedAccount), this.reconcileOptions({ userId: userId }, yield this.defaultOnDiskOptions()));
         });
     }
-    removeAccountFromSecureStorage(userId = this.state.activeUserId) {
+    removeAccountFromSecureStorage(userId = null) {
+        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
+            userId = userId !== null && userId !== void 0 ? userId : (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.activeUserId;
             yield this.setCryptoMasterKeyAuto(null, { userId: userId });
             yield this.setCryptoMasterKeyBiometric(null, { userId: userId });
             yield this.setCryptoMasterKeyB64(null, { userId: userId });
         });
     }
-    removeAccountFromMemory(userId = this.state.activeUserId) {
-        delete this.state.accounts[userId];
-        if (this.useAccountCache) {
-            this.accountDiskCache.delete(userId);
-        }
+    removeAccountFromMemory(userId = null) {
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                userId = userId !== null && userId !== void 0 ? userId : state.activeUserId;
+                delete state.accounts[userId];
+                if (this.useAccountCache) {
+                    this.accountDiskCache.delete(userId);
+                }
+                return state;
+            }));
+        });
     }
     pruneInMemoryAccounts() {
+        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
             // We preserve settings for logged out accounts, but we don't want to consider them when thinking about active account state
-            for (const userId in this.state.accounts) {
+            for (const userId in (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.accounts) {
                 if (!(yield this.getIsAuthenticated({ userId: userId }))) {
-                    this.removeAccountFromMemory(userId);
+                    yield this.removeAccountFromMemory(userId);
                 }
             }
         });
@@ -25900,12 +26316,16 @@ class StateService {
         });
     }
     clearDecryptedDataForActiveUser() {
-        var _a, _b;
-        const userId = this.state.activeUserId;
-        if (userId == null || ((_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.accounts[userId]) === null || _b === void 0 ? void 0 : _b.data) == null) {
-            return;
-        }
-        this.state.accounts[userId].data = new AccountData();
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const userId = state === null || state === void 0 ? void 0 : state.activeUserId;
+                if (userId != null && ((_a = state === null || state === void 0 ? void 0 : state.accounts[userId]) === null || _a === void 0 ? void 0 : _a.data) != null) {
+                    state.accounts[userId].data = new AccountData();
+                }
+                return state;
+            }));
+        });
     }
     createAccount(init = null) {
         return this.stateFactory.createAccount(init);
@@ -25917,8 +26337,11 @@ class StateService {
         return state_service_awaiter(this, void 0, void 0, function* () {
             yield this.setAccessToken(null, { userId: userId });
             yield this.setLastActive(null, { userId: userId });
-            this.state.authenticatedAccounts = this.state.authenticatedAccounts.filter((activeUserId) => activeUserId !== userId);
-            yield this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts);
+            yield this.updateState((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                state.authenticatedAccounts = state.authenticatedAccounts.filter((id) => id !== userId);
+                yield this.storageService.save(keys.authenticatedAccounts, state.authenticatedAccounts);
+                return state;
+            }));
         });
     }
     removeAccountFromDisk(userId) {
@@ -25929,12 +26352,14 @@ class StateService {
         });
     }
     dynamicallySetActiveUser() {
+        var _a;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            if (this.state.accounts == null || Object.keys(this.state.accounts).length < 1) {
+            const accounts = (_a = (yield this.state())) === null || _a === void 0 ? void 0 : _a.accounts;
+            if (accounts == null || Object.keys(accounts).length < 1) {
                 yield this.setActiveUser(null);
                 return;
             }
-            for (const userId in this.state.accounts) {
+            for (const userId in accounts) {
                 if (userId == null) {
                     continue;
                 }
@@ -25951,7 +26376,7 @@ class StateService {
             const timeoutAction = yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId });
             const timeout = yield this.getVaultTimeout({ userId: options === null || options === void 0 ? void 0 : options.userId });
             const defaultOptions = timeoutAction === "logOut" && timeout != null
-                ? this.defaultInMemoryOptions
+                ? yield this.defaultInMemoryOptions()
                 : yield this.defaultOnDiskOptions();
             return this.reconcileOptions(options, defaultOptions);
         });
@@ -25963,6 +26388,251 @@ class StateService {
                 : yield this.secureStorageService.save(`${options.userId}${key}`, value, options);
         });
     }
+    state() {
+        return this.memoryStorageService.get(keys.state);
+    }
+    setState(state) {
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            yield this.memoryStorageService.save(keys.state, state);
+        });
+    }
+    updateState(stateUpdater) {
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            yield this.state().then((state) => state_service_awaiter(this, void 0, void 0, function* () {
+                const updatedState = yield stateUpdater(state);
+                if (updatedState == null) {
+                    throw new Error("Attempted to update state to null value");
+                }
+                yield this.setState(updatedState);
+            }));
+        });
+    }
+}
+state_service_decorate([
+    withPrototype(SymmetricCryptoKey, SymmetricCryptoKey.initFromJson),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getCryptoMasterKey", null);
+state_service_decorate([
+    withPrototypeForArrayMembers(CipherView),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedCiphers", null);
+state_service_decorate([
+    withPrototypeForArrayMembers(CollectionView),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedCollections", null);
+state_service_decorate([
+    withPrototype(SymmetricCryptoKey, SymmetricCryptoKey.initFromJson),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedCryptoSymmetricKey", null);
+state_service_decorate([
+    withPrototypeForMap(SymmetricCryptoKey, SymmetricCryptoKey.initFromJson),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedOrganizationKeys", null);
+state_service_decorate([
+    withPrototypeForArrayMembers(GeneratedPasswordHistory),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedPasswordGenerationHistory", null);
+state_service_decorate([
+    withPrototype(EncString),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedPinProtected", null);
+state_service_decorate([
+    withPrototypeForArrayMembers(Policy),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedPolicies", null);
+state_service_decorate([
+    withPrototypeForMap(SymmetricCryptoKey, SymmetricCryptoKey.initFromJson),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedProviderKeys", null);
+state_service_decorate([
+    withPrototypeForArrayMembers(SendView),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getDecryptedSends", null);
+state_service_decorate([
+    withPrototypeForObjectValues(CipherData),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEncryptedCiphers", null);
+state_service_decorate([
+    withPrototypeForObjectValues(CollectionData),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEncryptedCollections", null);
+state_service_decorate([
+    withPrototypeForObjectValues(FolderData),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEncryptedFolders", null);
+state_service_decorate([
+    withPrototypeForArrayMembers(GeneratedPasswordHistory),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEncryptedPasswordGenerationHistory", null);
+state_service_decorate([
+    withPrototypeForObjectValues(PolicyData),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEncryptedPolicies", null);
+state_service_decorate([
+    withPrototypeForObjectValues(SendData),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEncryptedSends", null);
+state_service_decorate([
+    withPrototype(EnvironmentUrls),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEnvironmentUrls", null);
+state_service_decorate([
+    withPrototypeForArrayMembers(EventData),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getEventCollection", null);
+state_service_decorate([
+    withPrototype(SymmetricCryptoKey, SymmetricCryptoKey.initFromJson),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getLegacyEtmKey", null);
+state_service_decorate([
+    withPrototypeForObjectValues(ProviderData),
+    state_service_metadata("design:type", Function),
+    state_service_metadata("design:paramtypes", [Object]),
+    state_service_metadata("design:returntype", Promise)
+], StateService.prototype, "getProviders", null);
+function withPrototype(constructor, converter = (i) => i) {
+    return (target, propertyKey, descriptor) => {
+        const originalMethod = descriptor.value;
+        return {
+            value: function (...args) {
+                const originalResult = originalMethod.apply(this, args);
+                if (!(originalResult instanceof Promise)) {
+                    throw new Error(`Error applying prototype to stored value -- result is not a promise for method ${String(propertyKey)}`);
+                }
+                return originalResult.then((result) => {
+                    return result == null ||
+                        result.constructor.name === constructor.prototype.constructor.name
+                        ? converter(result)
+                        : converter(Object.create(constructor.prototype, Object.getOwnPropertyDescriptors(result)));
+                });
+            },
+        };
+    };
+}
+function withPrototypeForArrayMembers(memberConstructor, memberConverter = (i) => i) {
+    return (target, propertyKey, descriptor) => {
+        const originalMethod = descriptor.value;
+        return {
+            value: function (...args) {
+                const originalResult = originalMethod.apply(this, args);
+                if (!(originalResult instanceof Promise)) {
+                    throw new Error(`Error applying prototype to stored value -- result is not a promise for method ${String(propertyKey)}`);
+                }
+                return originalResult.then((result) => {
+                    if (result == null) {
+                        return null;
+                    }
+                    else if (!(result instanceof Array)) {
+                        throw new Error(`Attempted to retrieve non array type from state as an array for method ${String(propertyKey)}`);
+                    }
+                    else {
+                        return result.map((r) => {
+                            return r == null ||
+                                r.constructor.name === memberConstructor.prototype.constructor.name
+                                ? memberConverter(r)
+                                : memberConverter(Object.create(memberConstructor.prototype, Object.getOwnPropertyDescriptors(r)));
+                        });
+                    }
+                });
+            },
+        };
+    };
+}
+function withPrototypeForObjectValues(valuesConstructor, valuesConverter = (i) => i) {
+    return (target, propertyKey, descriptor) => {
+        const originalMethod = descriptor.value;
+        return {
+            value: function (...args) {
+                const originalResult = originalMethod.apply(this, args);
+                if (!(originalResult instanceof Promise)) {
+                    throw new Error(`Error applying prototype to stored value -- result is not a promise for method ${String(propertyKey)}`);
+                }
+                return originalResult.then((result) => {
+                    if (result == null) {
+                        return null;
+                    }
+                    else {
+                        for (const [key, val] of Object.entries(result)) {
+                            result[key] =
+                                val == null || val.constructor.name === valuesConstructor.prototype.constructor.name
+                                    ? valuesConverter(val)
+                                    : valuesConverter(Object.create(valuesConstructor.prototype, Object.getOwnPropertyDescriptors(val)));
+                        }
+                        return result;
+                    }
+                });
+            },
+        };
+    };
+}
+function withPrototypeForMap(valuesConstructor, valuesConverter = (i) => i) {
+    return (target, propertyKey, descriptor) => {
+        const originalMethod = descriptor.value;
+        return {
+            value: function (...args) {
+                const originalResult = originalMethod.apply(this, args);
+                if (!(originalResult instanceof Promise)) {
+                    throw new Error(`Error applying prototype to stored value -- result is not a promise for method ${String(propertyKey)}`);
+                }
+                return originalResult.then((result) => {
+                    if (result == null) {
+                        return null;
+                    }
+                    else if (result instanceof Map) {
+                        return result;
+                    }
+                    else {
+                        for (const key in Object.keys(result)) {
+                            result[key] =
+                                result[key] == null ||
+                                    result[key].constructor.name === valuesConstructor.prototype.constructor.name
+                                    ? valuesConverter(result[key])
+                                    : valuesConverter(Object.create(valuesConstructor.prototype, Object.getOwnPropertyDescriptors(result[key])));
+                        }
+                        return new Map(Object.entries(result));
+                    }
+                });
+            },
+        };
+    };
 }
 
 ;// CONCATENATED MODULE: ../../libs/common/src/services/token.service.ts
@@ -26305,6 +26975,15 @@ class StateMigrationService {
                     case StateVersion.Three:
                         yield this.migrateStateFrom3To4();
                         break;
+                    case StateVersion.Four: {
+                        const authenticatedAccounts = yield this.getAuthenticatedAccounts();
+                        for (const account of authenticatedAccounts) {
+                            const migratedAccount = yield this.migrateAccountFrom4To5(account);
+                            yield this.set(account.profile.userId, migratedAccount);
+                        }
+                        yield this.setCurrentStateVersion(StateVersion.Five);
+                        break;
+                    }
                 }
                 currentStateVersion += 1;
             }
@@ -26559,6 +27238,21 @@ class StateMigrationService {
             yield this.set(stateMigration_service_keys.global, globals);
         });
     }
+    migrateAccountFrom4To5(account) {
+        var _a, _b;
+        return stateMigration_service_awaiter(this, void 0, void 0, function* () {
+            const encryptedOrgKeys = (_b = (_a = account.keys) === null || _a === void 0 ? void 0 : _a.organizationKeys) === null || _b === void 0 ? void 0 : _b.encrypted;
+            if (encryptedOrgKeys != null) {
+                for (const [orgId, encKey] of Object.entries(encryptedOrgKeys)) {
+                    encryptedOrgKeys[orgId] = {
+                        type: "organization",
+                        key: encKey, // Account v4 does not reflect the current account model so we have to cast
+                    };
+                }
+            }
+            return account;
+        });
+    }
     get options() {
         return { htmlStorageLocation: HtmlStorageLocation.Local };
     }
@@ -26582,6 +27276,19 @@ class StateMigrationService {
             return (_b = (_a = (yield this.getGlobals())) === null || _a === void 0 ? void 0 : _a.stateVersion) !== null && _b !== void 0 ? _b : StateVersion.One;
         });
     }
+    setCurrentStateVersion(newVersion) {
+        return stateMigration_service_awaiter(this, void 0, void 0, function* () {
+            const globals = yield this.getGlobals();
+            globals.stateVersion = newVersion;
+            yield this.set(stateMigration_service_keys.global, globals);
+        });
+    }
+    getAuthenticatedAccounts() {
+        return stateMigration_service_awaiter(this, void 0, void 0, function* () {
+            const authenticatedUserIds = yield this.get(stateMigration_service_keys.authenticatedAccounts);
+            return Promise.all(authenticatedUserIds.map((id) => this.get(id)));
+        });
+    }
 }
 
 ;// CONCATENATED MODULE: ../../libs/common/src/models/data/organizationData.ts
@@ -26601,6 +27308,7 @@ class OrganizationData {
         this.useApi = response.useApi;
         this.useSso = response.useSso;
         this.useKeyConnector = response.useKeyConnector;
+        this.useScim = response.useScim;
         this.useResetPassword = response.useResetPassword;
         this.selfHost = response.selfHost;
         this.usersGetPremium = response.usersGetPremium;
@@ -26626,19 +27334,6 @@ class OrganizationData {
     }
 }
 
-;// CONCATENATED MODULE: ../../libs/common/src/models/data/providerData.ts
-class ProviderData {
-    constructor(response) {
-        this.id = response.id;
-        this.name = response.name;
-        this.status = response.status;
-        this.type = response.type;
-        this.enabled = response.enabled;
-        this.userId = response.userId;
-        this.useEvents = response.useEvents;
-    }
-}
-
 ;// CONCATENATED MODULE: ../../libs/common/src/services/sync.service.ts
 var sync_service_decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -26667,7 +27362,7 @@ var sync_service_awaiter = (undefined && undefined.__awaiter) || function (thisA
 
 
 class SyncService {
-    constructor(apiService, settingsService, folderService, cipherService, cryptoService, collectionService, messagingService, policyService, sendService, logService, keyConnectorService, stateService, organizationService, providerService, logoutCallback) {
+    constructor(apiService, settingsService, folderService, cipherService, cryptoService, collectionService, messagingService, policyService, sendService, logService, keyConnectorService, stateService, organizationService, providerService, folderApiService, logoutCallback) {
         this.apiService = apiService;
         this.settingsService = settingsService;
         this.folderService = folderService;
@@ -26682,6 +27377,7 @@ class SyncService {
         this.stateService = stateService;
         this.organizationService = organizationService;
         this.providerService = providerService;
+        this.folderApiService = folderApiService;
         this.logoutCallback = logoutCallback;
         this.syncInProgress = false;
     }
@@ -26754,7 +27450,7 @@ class SyncService {
                     const localFolder = yield this.folderService.get(notification.id);
                     if ((!isEdit && localFolder == null) ||
                         (isEdit && localFolder != null && localFolder.revisionDate < notification.revisionDate)) {
-                        const remoteFolder = yield this.apiService.getFolder(notification.id);
+                        const remoteFolder = yield this.folderApiService.get(notification.id);
                         if (remoteFolder != null) {
                             yield this.folderService.upsert(new FolderData(remoteFolder));
                             this.messagingService.send("syncedUpsertedFolder", { folderId: notification.id });
@@ -26823,7 +27519,7 @@ class SyncService {
                         }
                     }
                     if (shouldUpdate) {
-                        const remoteCipher = yield this.apiService.getCipher(notification.id);
+                        const remoteCipher = yield this.apiService.getFullCipherDetails(notification.id);
                         if (remoteCipher != null) {
                             yield this.cipherService.upsert(new CipherData(remoteCipher));
                             this.messagingService.send("syncedUpsertedCipher", { cipherId: notification.id });
@@ -27043,10 +27739,9 @@ var totp_service_awaiter = (undefined && undefined.__awaiter) || function (thisA
 const B32Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 const SteamChars = "23456789BCDFGHJKMNPQRTVWXY";
 class TotpService {
-    constructor(cryptoFunctionService, logService, stateService) {
+    constructor(cryptoFunctionService, logService) {
         this.cryptoFunctionService = cryptoFunctionService;
         this.logService = logService;
-        this.stateService = stateService;
     }
     getCode(key) {
         return totp_service_awaiter(this, void 0, void 0, function* () {
@@ -27146,11 +27841,6 @@ class TotpService {
         }
         return period;
     }
-    isAutoCopyEnabled() {
-        return totp_service_awaiter(this, void 0, void 0, function* () {
-            return !(yield this.stateService.getDisableAutoTotpCopy());
-        });
-    }
     // Helpers
     leftPad(s, l, p) {
         if (l + 1 >= s.length) {
@@ -27516,6 +28206,7 @@ class VaultTimeoutService {
             }
             if (userId == null || userId === (yield this.stateService.getUserId())) {
                 this.searchService.clearIndex();
+                yield this.folderService.clearCache();
             }
             yield this.stateService.setEverBeenUnlocked(true, { userId: userId });
             yield this.stateService.setBiometricLocked(true, { userId: userId });
@@ -27524,7 +28215,6 @@ class VaultTimeoutService {
             yield this.cryptoService.clearOrgKeys(true, userId);
             yield this.cryptoService.clearKeyPair(true, userId);
             yield this.cryptoService.clearEncKey(true, userId);
-            yield this.folderService.clearCache(userId);
             yield this.cipherService.clearCache(userId);
             yield this.collectionService.clearCache(userId);
             this.messagingService.send("locked", { userId: userId });
@@ -27659,7 +28349,6 @@ var DeviceType;
 ;// CONCATENATED MODULE: ../../libs/node/src/cli/services/cliPlatformUtils.service.ts
 
 
-
 // eslint-disable-next-line
 const cliPlatformUtils_service_open = __webpack_require__(634);
 class CliPlatformUtilsService {
@@ -27724,9 +28413,6 @@ class CliPlatformUtilsService {
             cliPlatformUtils_service_open(uri);
         }
     }
-    saveFile(win, blobData, blobOptions, fileName) {
-        throw new Error("Not implemented.");
-    }
     getApplicationVersion() {
         return Promise.resolve(this.packageJson.version);
     }
@@ -27763,15 +28449,6 @@ class CliPlatformUtilsService {
     authenticateBiometric() {
         return Promise.resolve(false);
     }
-    getDefaultSystemTheme() {
-        return Promise.resolve(ThemeType.Light);
-    }
-    onDefaultSystemThemeChange() {
-        /* noop */
-    }
-    getEffectiveTheme() {
-        return Promise.resolve(ThemeType.Light);
-    }
     supportsSecureStorage() {
         return false;
     }
@@ -27803,117 +28480,6 @@ const external_https_proxy_agent_namespaceObject = require("https-proxy-agent");
 ;// CONCATENATED MODULE: external "node-fetch"
 const external_node_fetch_namespaceObject = require("node-fetch");
 var external_node_fetch_default = /*#__PURE__*/__webpack_require__.n(external_node_fetch_namespaceObject);
-;// CONCATENATED MODULE: ../../libs/common/src/models/response/billingResponse.ts
-
-class BillingResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.invoices = [];
-        this.transactions = [];
-        this.balance = this.getResponseProperty("Balance");
-        const paymentSource = this.getResponseProperty("PaymentSource");
-        const transactions = this.getResponseProperty("Transactions");
-        const invoices = this.getResponseProperty("Invoices");
-        this.paymentSource = paymentSource == null ? null : new BillingSourceResponse(paymentSource);
-        if (transactions != null) {
-            this.transactions = transactions.map((t) => new BillingTransactionResponse(t));
-        }
-        if (invoices != null) {
-            this.invoices = invoices.map((i) => new BillingInvoiceResponse(i));
-        }
-    }
-}
-class BillingSourceResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.type = this.getResponseProperty("Type");
-        this.cardBrand = this.getResponseProperty("CardBrand");
-        this.description = this.getResponseProperty("Description");
-        this.needsVerification = this.getResponseProperty("NeedsVerification");
-    }
-}
-class BillingInvoiceResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.url = this.getResponseProperty("Url");
-        this.pdfUrl = this.getResponseProperty("PdfUrl");
-        this.number = this.getResponseProperty("Number");
-        this.paid = this.getResponseProperty("Paid");
-        this.date = this.getResponseProperty("Date");
-        this.amount = this.getResponseProperty("Amount");
-    }
-}
-class BillingTransactionResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.createdDate = this.getResponseProperty("CreatedDate");
-        this.amount = this.getResponseProperty("Amount");
-        this.refunded = this.getResponseProperty("Refunded");
-        this.partiallyRefunded = this.getResponseProperty("PartiallyRefunded");
-        this.refundedAmount = this.getResponseProperty("RefundedAmount");
-        this.type = this.getResponseProperty("Type");
-        this.paymentMethodType = this.getResponseProperty("PaymentMethodType");
-        this.details = this.getResponseProperty("Details");
-    }
-}
-
-;// CONCATENATED MODULE: ../../libs/common/src/models/response/billingHistoryResponse.ts
-
-
-class BillingHistoryResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.invoices = [];
-        this.transactions = [];
-        const transactions = this.getResponseProperty("Transactions");
-        const invoices = this.getResponseProperty("Invoices");
-        if (transactions != null) {
-            this.transactions = transactions.map((t) => new BillingTransactionResponse(t));
-        }
-        if (invoices != null) {
-            this.invoices = invoices.map((i) => new BillingInvoiceResponse(i));
-        }
-    }
-    get hasNoHistory() {
-        return this.invoices.length == 0 && this.transactions.length == 0;
-    }
-}
-
-;// CONCATENATED MODULE: ../../libs/common/src/models/response/billingPaymentResponse.ts
-
-
-class BillingPaymentResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.balance = this.getResponseProperty("Balance");
-        const paymentSource = this.getResponseProperty("PaymentSource");
-        this.paymentSource = paymentSource == null ? null : new BillingSourceResponse(paymentSource);
-    }
-}
-
-;// CONCATENATED MODULE: ../../libs/common/src/models/response/organizationConnectionResponse.ts
-
-class OrganizationConnectionResponse extends BaseResponse {
-    constructor(response, configType) {
-        super(response);
-        this.id = this.getResponseProperty("Id");
-        this.type = this.getResponseProperty("Type");
-        this.organizationId = this.getResponseProperty("OrganizationId");
-        this.enabled = this.getResponseProperty("Enabled");
-        const rawConfig = this.getResponseProperty("Config");
-        this.config = rawConfig == null ? null : new configType(rawConfig);
-    }
-}
-
-;// CONCATENATED MODULE: ../../libs/common/src/models/response/ssoPreValidateResponse.ts
-
-class SsoPreValidateResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.token = this.getResponseProperty("Token");
-    }
-}
-
 ;// CONCATENATED MODULE: ../../libs/common/src/models/response/apiKeyResponse.ts
 
 class ApiKeyResponse extends BaseResponse {
@@ -28029,6 +28595,94 @@ class AttachmentUploadDataResponse extends BaseResponse {
     }
 }
 
+;// CONCATENATED MODULE: ../../libs/common/src/models/response/billingResponse.ts
+
+class BillingResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.invoices = [];
+        this.transactions = [];
+        this.balance = this.getResponseProperty("Balance");
+        const paymentSource = this.getResponseProperty("PaymentSource");
+        const transactions = this.getResponseProperty("Transactions");
+        const invoices = this.getResponseProperty("Invoices");
+        this.paymentSource = paymentSource == null ? null : new BillingSourceResponse(paymentSource);
+        if (transactions != null) {
+            this.transactions = transactions.map((t) => new BillingTransactionResponse(t));
+        }
+        if (invoices != null) {
+            this.invoices = invoices.map((i) => new BillingInvoiceResponse(i));
+        }
+    }
+}
+class BillingSourceResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.type = this.getResponseProperty("Type");
+        this.cardBrand = this.getResponseProperty("CardBrand");
+        this.description = this.getResponseProperty("Description");
+        this.needsVerification = this.getResponseProperty("NeedsVerification");
+    }
+}
+class BillingInvoiceResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.url = this.getResponseProperty("Url");
+        this.pdfUrl = this.getResponseProperty("PdfUrl");
+        this.number = this.getResponseProperty("Number");
+        this.paid = this.getResponseProperty("Paid");
+        this.date = this.getResponseProperty("Date");
+        this.amount = this.getResponseProperty("Amount");
+    }
+}
+class BillingTransactionResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.createdDate = this.getResponseProperty("CreatedDate");
+        this.amount = this.getResponseProperty("Amount");
+        this.refunded = this.getResponseProperty("Refunded");
+        this.partiallyRefunded = this.getResponseProperty("PartiallyRefunded");
+        this.refundedAmount = this.getResponseProperty("RefundedAmount");
+        this.type = this.getResponseProperty("Type");
+        this.paymentMethodType = this.getResponseProperty("PaymentMethodType");
+        this.details = this.getResponseProperty("Details");
+    }
+}
+
+;// CONCATENATED MODULE: ../../libs/common/src/models/response/billingHistoryResponse.ts
+
+
+class BillingHistoryResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.invoices = [];
+        this.transactions = [];
+        const transactions = this.getResponseProperty("Transactions");
+        const invoices = this.getResponseProperty("Invoices");
+        if (transactions != null) {
+            this.transactions = transactions.map((t) => new BillingTransactionResponse(t));
+        }
+        if (invoices != null) {
+            this.invoices = invoices.map((i) => new BillingInvoiceResponse(i));
+        }
+    }
+    get hasNoHistory() {
+        return this.invoices.length == 0 && this.transactions.length == 0;
+    }
+}
+
+;// CONCATENATED MODULE: ../../libs/common/src/models/response/billingPaymentResponse.ts
+
+
+class BillingPaymentResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.balance = this.getResponseProperty("Balance");
+        const paymentSource = this.getResponseProperty("PaymentSource");
+        this.paymentSource = paymentSource == null ? null : new BillingSourceResponse(paymentSource);
+    }
+}
+
 ;// CONCATENATED MODULE: ../../libs/common/src/models/response/breachAccountResponse.ts
 
 class BreachAccountResponse extends BaseResponse {
@@ -28201,17 +28855,6 @@ class EventResponse extends BaseResponse {
     }
 }
 
-;// CONCATENATED MODULE: ../../libs/common/src/models/response/folderResponse.ts
-
-class FolderResponse extends BaseResponse {
-    constructor(response) {
-        super(response);
-        this.id = this.getResponseProperty("Id");
-        this.name = this.getResponseProperty("Name");
-        this.revisionDate = this.getResponseProperty("RevisionDate");
-    }
-}
-
 ;// CONCATENATED MODULE: ../../libs/common/src/models/response/groupResponse.ts
 
 
@@ -28416,6 +29059,20 @@ class OrganizationAutoEnrollStatusResponse extends BaseResponse {
     }
 }
 
+;// CONCATENATED MODULE: ../../libs/common/src/models/response/organizationConnectionResponse.ts
+
+class OrganizationConnectionResponse extends BaseResponse {
+    constructor(response, configType) {
+        super(response);
+        this.id = this.getResponseProperty("Id");
+        this.type = this.getResponseProperty("Type");
+        this.organizationId = this.getResponseProperty("OrganizationId");
+        this.enabled = this.getResponseProperty("Enabled");
+        const rawConfig = this.getResponseProperty("Config");
+        this.config = rawConfig == null ? null : new configType(rawConfig);
+    }
+}
+
 ;// CONCATENATED MODULE: ../../libs/common/src/models/response/keysResponse.ts
 
 class KeysResponse extends BaseResponse {
@@ -28649,6 +29306,7 @@ class PermissionsApi extends BaseResponse {
         this.managePolicies = this.getResponseProperty("ManagePolicies");
         this.manageUsers = this.getResponseProperty("ManageUsers");
         this.manageResetPassword = this.getResponseProperty("ManageResetPassword");
+        this.manageScim = this.getResponseProperty("ManageScim");
     }
 }
 
@@ -28703,7 +29361,7 @@ class OrganizationUserResetPasswordDetailsReponse extends BaseResponse {
 
 class ProfileOrganizationResponse extends BaseResponse {
     constructor(response) {
-        var _a, _b;
+        var _a, _b, _c;
         super(response);
         this.id = this.getResponseProperty("Id");
         this.name = this.getResponseProperty("Name");
@@ -28716,6 +29374,7 @@ class ProfileOrganizationResponse extends BaseResponse {
         this.useApi = this.getResponseProperty("UseApi");
         this.useSso = this.getResponseProperty("UseSso");
         this.useKeyConnector = (_a = this.getResponseProperty("UseKeyConnector")) !== null && _a !== void 0 ? _a : false;
+        this.useScim = (_b = this.getResponseProperty("UseScim")) !== null && _b !== void 0 ? _b : false;
         this.useResetPassword = this.getResponseProperty("UseResetPassword");
         this.selfHost = this.getResponseProperty("SelfHost");
         this.usersGetPremium = this.getResponseProperty("UsersGetPremium");
@@ -28737,7 +29396,7 @@ class ProfileOrganizationResponse extends BaseResponse {
         this.familySponsorshipFriendlyName = this.getResponseProperty("FamilySponsorshipFriendlyName");
         this.familySponsorshipAvailable = this.getResponseProperty("FamilySponsorshipAvailable");
         this.planProductType = this.getResponseProperty("PlanProductType");
-        this.keyConnectorEnabled = (_b = this.getResponseProperty("KeyConnectorEnabled")) !== null && _b !== void 0 ? _b : false;
+        this.keyConnectorEnabled = (_c = this.getResponseProperty("KeyConnectorEnabled")) !== null && _c !== void 0 ? _c : false;
         this.keyConnectorUrl = this.getResponseProperty("KeyConnectorUrl");
         const familySponsorshipLastSyncDateString = this.getResponseProperty("FamilySponsorshipLastSyncDate");
         if (familySponsorshipLastSyncDateString) {
@@ -29007,6 +29666,15 @@ class SendFileUploadDataResponse extends BaseResponse {
     }
 }
 
+;// CONCATENATED MODULE: ../../libs/common/src/models/response/ssoPreValidateResponse.ts
+
+class SsoPreValidateResponse extends BaseResponse {
+    constructor(response) {
+        super(response);
+        this.token = this.getResponseProperty("Token");
+    }
+}
+
 ;// CONCATENATED MODULE: ../../libs/common/src/models/response/syncResponse.ts
 
 
@@ -29271,7 +29939,6 @@ var api_service_awaiter = (undefined && undefined.__awaiter) || function (thisAr
 
 
 
-
 
 
 class ApiService {
@@ -29526,28 +30193,6 @@ class ApiService {
             return new BillingPaymentResponse(r);
         });
     }
-    // Folder APIs
-    getFolder(id) {
-        return api_service_awaiter(this, void 0, void 0, function* () {
-            const r = yield this.send("GET", "/folders/" + id, null, true, true);
-            return new FolderResponse(r);
-        });
-    }
-    postFolder(request) {
-        return api_service_awaiter(this, void 0, void 0, function* () {
-            const r = yield this.send("POST", "/folders", request, true, true);
-            return new FolderResponse(r);
-        });
-    }
-    putFolder(id, request) {
-        return api_service_awaiter(this, void 0, void 0, function* () {
-            const r = yield this.send("PUT", "/folders/" + id, request, true, true);
-            return new FolderResponse(r);
-        });
-    }
-    deleteFolder(id) {
-        return this.send("DELETE", "/folders/" + id, null, true, false);
-    }
     // Send APIs
     getSend(id) {
         return api_service_awaiter(this, void 0, void 0, function* () {
@@ -29632,6 +30277,12 @@ class ApiService {
             return new CipherResponse(r);
         });
     }
+    getFullCipherDetails(id) {
+        return api_service_awaiter(this, void 0, void 0, function* () {
+            const r = yield this.send("GET", "/ciphers/" + id + "/details", null, true, true);
+            return new CipherResponse(r);
+        });
+    }
     getCipherAdmin(id) {
         return api_service_awaiter(this, void 0, void 0, function* () {
             const r = yield this.send("GET", "/ciphers/" + id + "/admin", null, true, true);
@@ -30013,6 +30664,24 @@ class ApiService {
             return new ListResponse(r, OrganizationUserBulkResponse);
         });
     }
+    deactivateOrganizationUser(organizationId, id) {
+        return this.send("PUT", "/organizations/" + organizationId + "/users/" + id + "/deactivate", null, true, false);
+    }
+    deactivateManyOrganizationUsers(organizationId, request) {
+        return api_service_awaiter(this, void 0, void 0, function* () {
+            const r = yield this.send("PUT", "/organizations/" + organizationId + "/users/deactivate", request, true, true);
+            return new ListResponse(r, OrganizationUserBulkResponse);
+        });
+    }
+    activateOrganizationUser(organizationId, id) {
+        return this.send("PUT", "/organizations/" + organizationId + "/users/" + id + "/activate", null, true, false);
+    }
+    activateManyOrganizationUsers(organizationId, request) {
+        return api_service_awaiter(this, void 0, void 0, function* () {
+            const r = yield this.send("PUT", "/organizations/" + organizationId + "/users/activate", request, true, true);
+            return new ListResponse(r, OrganizationUserBulkResponse);
+        });
+    }
     // Plan APIs
     getPlans() {
         return api_service_awaiter(this, void 0, void 0, function* () {
@@ -30376,9 +31045,12 @@ class ApiService {
             return new ApiKeyResponse(r);
         });
     }
-    getOrganizationApiKeyInformation(id) {
+    getOrganizationApiKeyInformation(id, type = null) {
         return api_service_awaiter(this, void 0, void 0, function* () {
-            const r = yield this.send("GET", "/organizations/" + id + "/api-key-information", null, true, true);
+            const uri = type === null
+                ? "/organizations/" + id + "/api-key-information"
+                : "/organizations/" + id + "/api-key-information/" + type;
+            const r = yield this.send("GET", uri, null, true, true);
             return new ListResponse(r, OrganizationApiKeyInformationResponse);
         });
     }
@@ -32948,12 +33620,13 @@ var create_command_awaiter = (undefined && undefined.__awaiter) || function (thi
 
 
 class CreateCommand {
-    constructor(cipherService, folderService, stateService, cryptoService, apiService) {
+    constructor(cipherService, folderService, stateService, cryptoService, apiService, folderApiService) {
         this.cipherService = cipherService;
         this.folderService = folderService;
         this.stateService = stateService;
         this.cryptoService = cryptoService;
         this.apiService = apiService;
+        this.folderApiService = folderApiService;
     }
     run(object, requestJson, cmdOptions, additionalData = null) {
         return create_command_awaiter(this, void 0, void 0, function* () {
@@ -33064,7 +33737,7 @@ class CreateCommand {
         return create_command_awaiter(this, void 0, void 0, function* () {
             const folder = yield this.folderService.encrypt(FolderExport.toView(req));
             try {
-                yield this.folderService.saveWithServer(folder);
+                yield this.folderApiService.save(folder);
                 const newFolder = yield this.folderService.get(folder.id);
                 const decFolder = yield newFolder.decrypt();
                 const res = new folderResponse_FolderResponse(decFolder);
@@ -33132,11 +33805,12 @@ var delete_command_awaiter = (undefined && undefined.__awaiter) || function (thi
 
 
 class DeleteCommand {
-    constructor(cipherService, folderService, stateService, apiService) {
+    constructor(cipherService, folderService, stateService, apiService, folderApiService) {
         this.cipherService = cipherService;
         this.folderService = folderService;
         this.stateService = stateService;
         this.apiService = apiService;
+        this.folderApiService = folderApiService;
     }
     run(object, id, cmdOptions) {
         return delete_command_awaiter(this, void 0, void 0, function* () {
@@ -33214,7 +33888,7 @@ class DeleteCommand {
                 return Response.notFound();
             }
             try {
-                yield this.folderService.deleteWithServer(id);
+                yield this.folderApiService.delete(id);
                 return Response.success();
             }
             catch (e) {
@@ -33273,11 +33947,12 @@ var edit_command_awaiter = (undefined && undefined.__awaiter) || function (thisA
 
 
 class EditCommand {
-    constructor(cipherService, folderService, cryptoService, apiService) {
+    constructor(cipherService, folderService, cryptoService, apiService, folderApiService) {
         this.cipherService = cipherService;
         this.folderService = folderService;
         this.cryptoService = cryptoService;
         this.apiService = apiService;
+        this.folderApiService = folderApiService;
     }
     run(object, id, requestJson, cmdOptions) {
         return edit_command_awaiter(this, void 0, void 0, function* () {
@@ -33374,7 +34049,7 @@ class EditCommand {
             folderView = FolderExport.toView(req, folderView);
             const encFolder = yield this.folderService.encrypt(folderView);
             try {
-                yield this.folderService.saveWithServer(encFolder);
+                yield this.folderApiService.save(encFolder);
                 const updatedFolder = yield this.folderService.get(folder.id);
                 const decFolder = yield updatedFolder.decrypt();
                 const res = new folderResponse_FolderResponse(decFolder);
@@ -33986,7 +34661,7 @@ class GetCommand extends DownloadCommand {
                 }
             }
             else if (id.trim() !== "") {
-                let folders = yield this.folderService.getAllDecrypted();
+                let folders = yield this.folderService.getAllDecryptedFromState();
                 folders = CliUtils.searchFolders(folders, id);
                 if (folders.length > 1) {
                     return Response.multipleResults(folders.map((f) => f.id));
@@ -34295,7 +34970,7 @@ class ListCommand {
     }
     listFolders(options) {
         return list_command_awaiter(this, void 0, void 0, function* () {
-            let folders = yield this.folderService.getAllDecrypted();
+            let folders = yield this.folderService.getAllDecryptedFromState();
             if (options.search != null && options.search.trim() !== "") {
                 folders = CliUtils.searchFolders(folders, options.search);
             }
@@ -35267,12 +35942,12 @@ class ServeCommand {
         this.main = main;
         this.getCommand = new GetCommand(this.main.cipherService, this.main.folderService, this.main.collectionService, this.main.totpService, this.main.auditService, this.main.cryptoService, this.main.stateService, this.main.searchService, this.main.apiService, this.main.organizationService);
         this.listCommand = new ListCommand(this.main.cipherService, this.main.folderService, this.main.collectionService, this.main.organizationService, this.main.searchService, this.main.apiService);
-        this.createCommand = new CreateCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.cryptoService, this.main.apiService);
-        this.editCommand = new EditCommand(this.main.cipherService, this.main.folderService, this.main.cryptoService, this.main.apiService);
+        this.createCommand = new CreateCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.cryptoService, this.main.apiService, this.main.folderApiService);
+        this.editCommand = new EditCommand(this.main.cipherService, this.main.folderService, this.main.cryptoService, this.main.apiService, this.main.folderApiService);
         this.generateCommand = new GenerateCommand(this.main.passwordGenerationService, this.main.stateService);
         this.syncCommand = new SyncCommand(this.main.syncService);
         this.statusCommand = new StatusCommand(this.main.environmentService, this.main.syncService, this.main.stateService, this.main.authService);
-        this.deleteCommand = new DeleteCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.apiService);
+        this.deleteCommand = new DeleteCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.apiService, this.main.folderApiService);
         this.confirmCommand = new ConfirmCommand(this.main.apiService, this.main.cryptoService);
         this.restoreCommand = new RestoreCommand(this.main.cipherService);
         this.shareCommand = new ShareCommand(this.main.cipherService);
@@ -36462,11 +37137,14 @@ var i18n_service_awaiter = (undefined && undefined.__awaiter) || function (thisA
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+
 class i18n_service_I18nService {
     constructor(systemLanguage, localesDirectory, getLocalesJson) {
         this.systemLanguage = systemLanguage;
         this.localesDirectory = localesDirectory;
         this.getLocalesJson = getLocalesJson;
+        this._locale = new external_rxjs_namespaceObject.ReplaySubject(1);
+        this.locale$ = this._locale.asObservable();
         // First locale is the default (English)
         this.supportedTranslationLocales = ["en"];
         this.localeNames = new Map([
@@ -36539,9 +37217,13 @@ class i18n_service_I18nService {
                 throw new Error("supportedTranslationLocales not set.");
             }
             this.inited = true;
-            this.locale = this.translationLocale = locale != null ? locale : this.systemLanguage;
+            this.translationLocale = locale != null ? locale : this.systemLanguage;
+            this._locale.next(this.translationLocale);
             try {
-                this.collator = new Intl.Collator(this.locale, { numeric: true, sensitivity: "base" });
+                this.collator = new Intl.Collator(this.translationLocale, {
+                    numeric: true,
+                    sensitivity: "base",
+                });
             }
             catch (_a) {
                 this.collator = null;
@@ -37352,7 +38034,7 @@ class VaultProgram extends Program {
                 return;
             }
             yield this.exitIfLocked();
-            const command = new CreateCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.cryptoService, this.main.apiService);
+            const command = new CreateCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.cryptoService, this.main.apiService, this.main.folderApiService);
             const response = yield command.run(object, encodedJson, cmd);
             this.processResponse(response);
         }));
@@ -37382,7 +38064,7 @@ class VaultProgram extends Program {
                 return;
             }
             yield this.exitIfLocked();
-            const command = new EditCommand(this.main.cipherService, this.main.folderService, this.main.cryptoService, this.main.apiService);
+            const command = new EditCommand(this.main.cipherService, this.main.folderService, this.main.cryptoService, this.main.apiService, this.main.folderApiService);
             const response = yield command.run(object, id, encodedJson, cmd);
             this.processResponse(response);
         }));
@@ -37412,7 +38094,7 @@ class VaultProgram extends Program {
                 return;
             }
             yield this.exitIfLocked();
-            const command = new DeleteCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.apiService);
+            const command = new DeleteCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.apiService, this.main.folderApiService);
             const response = yield command.run(object, id, cmd);
             this.processResponse(response);
         }));
@@ -37612,6 +38294,10 @@ var bw_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argum
 
 
 
+
+
+
+
 
 
 
@@ -37647,11 +38333,13 @@ class Main {
         this.platformUtilsService = new CliPlatformUtilsService(ClientType.Cli, packageJson);
         this.logService = new ConsoleLogService(this.platformUtilsService.isDev(), (level) => process.env.BITWARDENCLI_DEBUG !== "true" && level <= LogLevelType.Info);
         this.cryptoFunctionService = new NodeCryptoFunctionService();
+        this.encryptService = new EncryptService(this.cryptoFunctionService, this.logService, true);
         this.storageService = new LowdbStorageService(this.logService, null, p, false, true);
         this.secureStorageService = new NodeEnvSecureStorageService(this.storageService, this.logService, () => this.cryptoService);
+        this.memoryStorageService = new MemoryStorageService();
         this.stateMigrationService = new StateMigrationService(this.storageService, this.secureStorageService, new StateFactory(GlobalState, Account));
-        this.stateService = new StateService(this.storageService, this.secureStorageService, this.logService, this.stateMigrationService, new StateFactory(GlobalState, Account));
-        this.cryptoService = new CryptoService(this.cryptoFunctionService, this.platformUtilsService, this.logService, this.stateService);
+        this.stateService = new StateService(this.storageService, this.secureStorageService, this.memoryStorageService, this.logService, this.stateMigrationService, new StateFactory(GlobalState, Account));
+        this.cryptoService = new CryptoService(this.cryptoFunctionService, this.encryptService, this.platformUtilsService, this.logService, this.stateService);
         this.appIdService = new AppIdService(this.storageService);
         this.tokenService = new TokenService(this.stateService);
         this.messagingService = new NoopMessagingService();
@@ -37666,7 +38354,9 @@ class Main {
         this.settingsService = new SettingsService(this.stateService);
         this.fileUploadService = new FileUploadService(this.logService, this.apiService);
         this.cipherService = new CipherService(this.cryptoService, this.settingsService, this.apiService, this.fileUploadService, this.i18nService, null, this.logService, this.stateService);
-        this.folderService = new FolderService(this.cryptoService, this.apiService, this.i18nService, this.cipherService, this.stateService);
+        this.broadcasterService = new BroadcasterService();
+        this.folderService = new FolderService(this.cryptoService, this.i18nService, this.cipherService, this.stateService);
+        this.folderApiService = new FolderApiService(this.folderService, this.apiService);
         this.collectionService = new CollectionService(this.cryptoService, this.i18nService, this.stateService);
         this.searchService = new SearchService(this.cipherService, this.logService, this.i18nService);
         this.providerService = new ProviderService(this.stateService);
@@ -37678,9 +38368,9 @@ class Main {
         this.authService = new AuthService(this.cryptoService, this.apiService, this.tokenService, this.appIdService, this.platformUtilsService, this.messagingService, this.logService, this.keyConnectorService, this.environmentService, this.stateService, this.twoFactorService, this.i18nService);
         const lockedCallback = () => bw_awaiter(this, void 0, void 0, function* () { return yield this.cryptoService.clearStoredKey(KeySuffixOptions.Auto); });
         this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService, this.collectionService, this.cryptoService, this.platformUtilsService, this.messagingService, this.searchService, this.tokenService, this.policyService, this.keyConnectorService, this.stateService, this.authService, lockedCallback, null);
-        this.syncService = new SyncService(this.apiService, this.settingsService, this.folderService, this.cipherService, this.cryptoService, this.collectionService, this.messagingService, this.policyService, this.sendService, this.logService, this.keyConnectorService, this.stateService, this.organizationService, this.providerService, (expired) => bw_awaiter(this, void 0, void 0, function* () { return yield this.logout(); }));
+        this.syncService = new SyncService(this.apiService, this.settingsService, this.folderService, this.cipherService, this.cryptoService, this.collectionService, this.messagingService, this.policyService, this.sendService, this.logService, this.keyConnectorService, this.stateService, this.organizationService, this.providerService, this.folderApiService, (expired) => bw_awaiter(this, void 0, void 0, function* () { return yield this.logout(); }));
         this.passwordGenerationService = new PasswordGenerationService(this.cryptoService, this.policyService, this.stateService);
-        this.totpService = new TotpService(this.cryptoFunctionService, this.logService, this.stateService);
+        this.totpService = new TotpService(this.cryptoFunctionService, this.logService);
         this.importService = new ImportService(this.cipherService, this.folderService, this.apiService, this.i18nService, this.collectionService, this.platformUtilsService, this.cryptoService);
         this.exportService = new ExportService(this.folderService, this.cipherService, this.apiService, this.cryptoService, this.cryptoFunctionService);
         this.auditService = new AuditService(this.cryptoFunctionService, this.apiService);