@bitwarden/cli 1.21.0 → 1.21.1

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":"1.21.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":{"sub:init":"git submodule update --init --recursive","sub:update":"git submodule update --remote","sub:pull":"git submodule foreach git pull origin master","clean":"rimraf dist/**/*","symlink:win":"rmdir /S /Q ./jslib && cmd /c mklink /J .\\\\jslib ..\\\\jslib","symlink:mac":"npm run symlink:lin","symlink:lin":"rm -rf ./jslib && ln -s ../jslib ./jslib","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","lint":"tslint \'src/**/*.ts\' \'spec/**/*.ts\' && prettier --check .","lint:fix":"tslint \'src/**/*.ts\' \'spec/**/*.ts\' --fix","prettier":"prettier --write .","prepare":"husky install","test":"jasmine-ts -r tsconfig-paths/register -P spec/tsconfig.json","test:watch":"nodemon -w ./spec -w ./src -w ./jslib --ext \\"ts,js,mjs,json\\" --exec jasmine-ts -r tsconfig-paths/register -P spec/tsconfig.json"},"bin":{"bw":"build/bw.js"},"pkg":{"assets":"./build/**/*"},"devDependencies":{"@fluffy-spoon/substitute":"^1.208.0","@types/express":"^4.17.13","@types/inquirer":"^7.3.1","@types/jasmine":"^3.7.0","@types/jsdom":"^16.2.10","@types/lowdb":"^1.0.10","@types/lunr":"^2.3.3","@types/multer":"^1.4.7","@types/node":"^16.11.12","@types/node-fetch":"^2.5.10","@types/node-forge":"^0.9.7","@types/papaparse":"^5.2.5","@types/proper-lockfile":"^4.1.2","@types/retry":"^0.12.1","@types/tldjs":"^2.3.0","@types/zxcvbn":"^4.4.1","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^10.2.0","cross-env":"^7.0.3","husky":"^7.0.4","jasmine":"^3.7.0","jasmine-core":"^3.7.1","jasmine-ts":"^0.4.0","jasmine-ts-console-reporter":"^3.1.1","lint-staged":"^12.1.3","pkg":"^5.5.1","prettier":"^2.5.1","rimraf":"^3.0.2","ts-loader":"^8.2.0","ts-node":"^10.4.0","tsconfig-paths":"^3.12.0","tsconfig-paths-webpack-plugin":"^3.5.2","tslint":"^6.1.3","tslint-loader":"^3.5.4","typescript":"4.1.5","webpack":"^5.65.0","webpack-cli":"^4.9.1","webpack-node-externals":"^3.0.0"},"dependencies":{"big-integer":"1.6.48","browser-hrtime":"^1.1.8","chalk":"^4.1.1","commander":"7.2.0","express":"^4.17.1","form-data":"4.0.0","https-proxy-agent":"5.0.0","inquirer":"8.0.0","jsdom":"^16.5.3","lowdb":"1.0.0","lunr":"^2.3.9","multer":"^1.4.3","node-fetch":"^2.6.1","node-forge":"0.10.0","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"},"engines":{"node":"~16","npm":">=7 <=8"},"lint-staged":{"*":"prettier --ignore-unknown --write"}}');
+module.exports = JSON.parse('{"name":"@bitwarden/cli","description":"A secure and free password manager for all of your devices.","version":"1.21.1","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":{"sub:init":"git submodule update --init --recursive","sub:update":"git submodule update --remote","sub:pull":"git submodule foreach git pull origin master","clean":"rimraf dist/**/*","symlink:win":"rmdir /S /Q ./jslib && cmd /c mklink /J .\\\\jslib ..\\\\jslib","symlink:mac":"npm run symlink:lin","symlink:lin":"rm -rf ./jslib && ln -s ../jslib ./jslib","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","lint":"tslint \'src/**/*.ts\' \'spec/**/*.ts\' && prettier --check .","lint:fix":"tslint \'src/**/*.ts\' \'spec/**/*.ts\' --fix","prettier":"prettier --write .","prepare":"husky install","test":"jasmine-ts -r tsconfig-paths/register -P spec/tsconfig.json","test:watch":"nodemon -w ./spec -w ./src -w ./jslib --ext \\"ts,js,mjs,json\\" --exec jasmine-ts -r tsconfig-paths/register -P spec/tsconfig.json"},"bin":{"bw":"build/bw.js"},"pkg":{"assets":"./build/**/*"},"devDependencies":{"@fluffy-spoon/substitute":"^1.208.0","@types/express":"^4.17.13","@types/inquirer":"^7.3.1","@types/jasmine":"^3.7.0","@types/jsdom":"^16.2.10","@types/lowdb":"^1.0.10","@types/lunr":"^2.3.3","@types/multer":"^1.4.7","@types/node":"^16.11.12","@types/node-fetch":"^2.5.10","@types/node-forge":"^0.9.7","@types/papaparse":"^5.2.5","@types/proper-lockfile":"^4.1.2","@types/retry":"^0.12.1","@types/tldjs":"^2.3.0","@types/zxcvbn":"^4.4.1","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^10.2.0","cross-env":"^7.0.3","husky":"^7.0.4","jasmine":"^3.7.0","jasmine-core":"^3.7.1","jasmine-ts":"^0.4.0","jasmine-ts-console-reporter":"^3.1.1","lint-staged":"^12.1.3","pkg":"^5.5.1","prettier":"^2.5.1","rimraf":"^3.0.2","ts-loader":"^8.2.0","ts-node":"^10.4.0","tsconfig-paths":"^3.12.0","tsconfig-paths-webpack-plugin":"^3.5.2","tslint":"^6.1.3","tslint-loader":"^3.5.4","typescript":"4.1.5","webpack":"^5.65.0","webpack-cli":"^4.9.1","webpack-node-externals":"^3.0.0"},"dependencies":{"big-integer":"1.6.48","browser-hrtime":"^1.1.8","chalk":"^4.1.1","commander":"7.2.0","express":"^4.17.1","form-data":"4.0.0","https-proxy-agent":"5.0.0","inquirer":"8.0.0","jsdom":"^16.5.3","lowdb":"1.0.0","lunr":"^2.3.9","multer":"^1.4.3","node-fetch":"^2.6.1","node-forge":"0.10.0","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"},"engines":{"node":"~16","npm":">=7 <=8"},"lint-staged":{"*":"prettier --ignore-unknown --write"}}');
 
 /***/ })
 
@@ -1940,6 +1940,14 @@ class ConsoleLogService extends consoleLog_service_ConsoleLogService {
     }
 }
 
+;// CONCATENATED MODULE: ./jslib/common/src/enums/htmlStorageLocation.ts
+var HtmlStorageLocation;
+(function (HtmlStorageLocation) {
+    HtmlStorageLocation["Local"] = "local";
+    HtmlStorageLocation["Memory"] = "memory";
+    HtmlStorageLocation["Session"] = "session";
+})(HtmlStorageLocation || (HtmlStorageLocation = {}));
+
 ;// CONCATENATED MODULE: ./jslib/common/src/services/appId.service.ts
 var appId_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -1951,6 +1959,7 @@ var appId_service_awaiter = (undefined && undefined.__awaiter) || function (this
     });
 };
 
+
 class AppIdService {
     constructor(storageService) {
         this.storageService = storageService;
@@ -1963,12 +1972,16 @@ class AppIdService {
     }
     makeAndGetAppId(key) {
         return appId_service_awaiter(this, void 0, void 0, function* () {
-            const existingId = yield this.storageService.get(key);
+            const existingId = yield this.storageService.get(key, {
+                htmlStorageLocation: HtmlStorageLocation.Local,
+            });
             if (existingId != null) {
                 return existingId;
             }
             const guid = Utils.newGuid();
-            yield this.storageService.save(key, guid);
+            yield this.storageService.save(key, guid, {
+                htmlStorageLocation: HtmlStorageLocation.Local,
+            });
             return guid;
         });
     }
@@ -13832,10 +13845,14 @@ class CryptoService {
     }
     hasKeyStored(keySuffix, userId) {
         return crypto_service_awaiter(this, void 0, void 0, function* () {
-            const key = keySuffix === KeySuffixOptions.Auto
-                ? yield this.stateService.getCryptoMasterKeyAuto({ userId: userId })
-                : yield this.stateService.hasCryptoMasterKeyBiometric({ userId: userId });
-            return key != null;
+            switch (keySuffix) {
+                case KeySuffixOptions.Auto:
+                    return (yield this.stateService.getCryptoMasterKeyAuto({ userId: userId })) != null;
+                case KeySuffixOptions.Biometric:
+                    return (yield this.stateService.hasCryptoMasterKeyBiometric({ userId: userId })) === true;
+                default:
+                    return false;
+            }
         });
     }
     hasEncKey() {
@@ -23266,14 +23283,6 @@ class SettingsService {
     }
 }
 
-;// CONCATENATED MODULE: ./jslib/common/src/enums/htmlStorageLocation.ts
-var HtmlStorageLocation;
-(function (HtmlStorageLocation) {
-    HtmlStorageLocation["Local"] = "local";
-    HtmlStorageLocation["Memory"] = "memory";
-    HtmlStorageLocation["Session"] = "session";
-})(HtmlStorageLocation || (HtmlStorageLocation = {}));
-
 ;// CONCATENATED MODULE: ./jslib/common/src/enums/storageLocation.ts
 var StorageLocation;
 (function (StorageLocation) {
@@ -23336,6 +23345,7 @@ class StateService {
         this.activeAccount = new external_rxjs_namespaceObject.BehaviorSubject(null);
         this.state = new State(this.createGlobals());
         this.hasBeenInited = false;
+        this.accountDiskCache = new Map();
     }
     init() {
         return state_service_awaiter(this, void 0, void 0, function* () {
@@ -23412,19 +23422,13 @@ class StateService {
     getAccessToken(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             return (_b = (_a = (yield this.getAccount(options))) === null || _a === void 0 ? void 0 : _a.tokens) === null || _b === void 0 ? void 0 : _b.accessToken;
         });
     }
     setAccessToken(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             const account = yield this.getAccount(options);
             account.tokens.accessToken = value;
             yield this.saveAccount(account, options);
@@ -23459,19 +23463,13 @@ class StateService {
     getApiKeyClientId(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             return (_b = (_a = (yield this.getAccount(options))) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.apiKeyClientId;
         });
     }
     setApiKeyClientId(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             const account = yield this.getAccount(options);
             account.profile.apiKeyClientId = value;
             yield this.saveAccount(account, options);
@@ -23480,19 +23478,13 @@ class StateService {
     getApiKeyClientSecret(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             return (_b = (_a = (yield this.getAccount(options))) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.apiKeyClientSecret;
         });
     }
     setApiKeyClientSecret(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             const account = yield this.getAccount(options);
             account.keys.apiKeyClientSecret = value;
             yield this.saveAccount(account, options);
@@ -24416,14 +24408,14 @@ 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, yield this.defaultOnDiskOptions())))) === 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, 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, yield this.defaultOnDiskOptions()));
+            const account = yield this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions));
             account.profile.everBeenUnlocked = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
         });
     }
     getForcePasswordReset(options) {
@@ -24716,14 +24708,14 @@ class StateService {
     getProviders(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.providers;
+            return (_b = (_a = (yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions())))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.providers;
         });
     }
     setProviders(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.defaultOnDiskOptions()));
             account.data.providers = value;
-            yield this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
         });
     }
     getPublicKey(options) {
@@ -24742,19 +24734,13 @@ class StateService {
     getRefreshToken(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             return (_b = (_a = (yield this.getAccount(options))) === null || _a === void 0 ? void 0 : _a.tokens) === null || _b === void 0 ? void 0 : _b.refreshToken;
         });
     }
     setRefreshToken(value, options) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = (yield this.getVaultTimeoutAction({ userId: options === null || options === void 0 ? void 0 : options.userId })) === "logOut"
-                ? this.defaultInMemoryOptions
-                : yield this.defaultOnDiskOptions();
-            options = this.reconcileOptions(options, defaultOptions);
+            options = yield this.getTimeoutBasedStorageOptions(options);
             const account = yield this.getAccount(options);
             account.tokens.refreshToken = value;
             yield this.saveAccount(account, options);
@@ -25014,7 +25000,12 @@ class StateService {
             if ((options === null || options === void 0 ? void 0 : options.userId) == null && this.state.activeUserId == null) {
                 return null;
             }
+            const cachedAccount = this.accountDiskCache.get(options.userId);
+            if (cachedAccount != null) {
+                return cachedAccount;
+            }
             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 }))) : yield this.storageService.get(options.userId, options);
+            this.accountDiskCache.set(options.userId, account);
             return account;
         });
     }
@@ -25040,6 +25031,7 @@ class StateService {
                 ? this.secureStorageService
                 : this.storageService;
             yield storageLocation.save(`${options.userId}`, account, options);
+            this.accountDiskCache.delete(options.userId);
         });
     }
     saveAccountToMemory(account) {
@@ -25063,7 +25055,7 @@ class StateService {
     // For now these methods exist with some redundancy to facilitate this special web requirement.
     scaffoldNewAccountLocalStorage(account) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const storedAccount = yield this.storageService.get(account.profile.userId, yield this.defaultOnDiskLocalOptions());
+            const storedAccount = yield this.getAccount(this.reconcileOptions({ userId: account.profile.userId }, yield this.defaultOnDiskLocalOptions()));
             // EnvironmentUrls are set before authenticating and should override whatever is stored from any previous session
             const environmentUrls = account.settings.environmentUrls;
             if ((storedAccount === null || storedAccount === void 0 ? void 0 : storedAccount.settings) != null) {
@@ -25074,33 +25066,35 @@ class StateService {
                 yield this.storageService.remove(keys.tempAccountSettings);
             }
             account.settings.environmentUrls = environmentUrls;
-            if (account.settings.vaultTimeoutAction === "logOut") {
+            if (account.settings.vaultTimeoutAction === "logOut" && account.settings.vaultTimeout != null) {
                 account.tokens.accessToken = null;
                 account.tokens.refreshToken = null;
                 account.profile.apiKeyClientId = null;
                 account.keys.apiKeyClientSecret = null;
             }
-            yield this.storageService.save(account.profile.userId, account, yield this.defaultOnDiskLocalOptions());
+            yield this.saveAccount(account, this.reconcileOptions({ userId: account.profile.userId }, yield this.defaultOnDiskLocalOptions()));
         });
     }
     scaffoldNewAccountMemoryStorage(account) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const storedAccount = yield this.storageService.get(account.profile.userId, yield this.defaultOnDiskMemoryOptions());
+            const storedAccount = yield this.getAccount(this.reconcileOptions({ userId: account.profile.userId }, yield this.defaultOnDiskMemoryOptions()));
             if ((storedAccount === null || storedAccount === void 0 ? void 0 : storedAccount.settings) != null) {
                 storedAccount.settings.environmentUrls = account.settings.environmentUrls;
                 account.settings = storedAccount.settings;
             }
             yield this.storageService.save(account.profile.userId, account, yield this.defaultOnDiskMemoryOptions());
+            yield this.saveAccount(account, this.reconcileOptions({ userId: account.profile.userId }, yield this.defaultOnDiskMemoryOptions()));
         });
     }
     scaffoldNewAccountSessionStorage(account) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const storedAccount = yield this.storageService.get(account.profile.userId, yield this.defaultOnDiskOptions());
+            const storedAccount = yield this.getAccount(this.reconcileOptions({ userId: account.profile.userId }, yield this.defaultOnDiskOptions()));
             if ((storedAccount === null || storedAccount === void 0 ? void 0 : storedAccount.settings) != null) {
                 storedAccount.settings.environmentUrls = account.settings.environmentUrls;
                 account.settings = storedAccount.settings;
             }
-            yield this.storageService.save(account.profile.userId, account, yield this.defaultOnDiskOptions());
+            yield this.storageService.save(account.profile.userId, account, yield this.defaultOnDiskMemoryOptions());
+            yield this.saveAccount(account, this.reconcileOptions({ userId: account.profile.userId }, yield this.defaultOnDiskOptions()));
         });
     }
     //
@@ -25180,18 +25174,14 @@ class StateService {
     }
     removeAccountFromLocalStorage(userId = this.state.activeUserId) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const storedAccount = yield this.storageService.get(userId, {
-                htmlStorageLocation: HtmlStorageLocation.Local,
-            });
-            yield this.storageService.save(userId, this.resetAccount(storedAccount), yield this.defaultOnDiskLocalOptions());
+            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) {
         return state_service_awaiter(this, void 0, void 0, function* () {
-            const storedAccount = yield this.storageService.get(userId, {
-                htmlStorageLocation: HtmlStorageLocation.Session,
-            });
-            yield this.storageService.save(userId, this.resetAccount(storedAccount), yield this.defaultOnDiskOptions());
+            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) {
@@ -25203,13 +25193,14 @@ class StateService {
     }
     removeAccountFromMemory(userId = this.state.activeUserId) {
         delete this.state.accounts[userId];
+        this.accountDiskCache.delete(userId);
     }
     pruneInMemoryAccounts() {
         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) {
                 if (!(yield this.getIsAuthenticated({ userId: userId }))) {
-                    delete this.state.accounts[userId];
+                    this.removeAccountFromMemory(userId);
                 }
             }
         });
@@ -25266,6 +25257,10 @@ class StateService {
     }
     dynamicallySetActiveUser() {
         return state_service_awaiter(this, void 0, void 0, function* () {
+            if (this.state.accounts == null || Object.keys(this.state.accounts).length < 1) {
+                yield this.setActiveUser(null);
+                return;
+            }
             for (const userId in this.state.accounts) {
                 if (userId == null) {
                     continue;
@@ -25278,6 +25273,16 @@ class StateService {
             }
         });
     }
+    getTimeoutBasedStorageOptions(options) {
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            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.defaultOnDiskOptions();
+            return this.reconcileOptions(options, defaultOptions);
+        });
+    }
 }
 
 ;// CONCATENATED MODULE: ./jslib/common/src/enums/stateVersion.ts
@@ -25285,9 +25290,236 @@ var StateVersion;
 (function (StateVersion) {
     StateVersion[StateVersion["One"] = 1] = "One";
     StateVersion[StateVersion["Two"] = 2] = "Two";
-    StateVersion[StateVersion["Latest"] = 2] = "Latest";
+    StateVersion[StateVersion["Three"] = 3] = "Three";
+    StateVersion[StateVersion["Four"] = 4] = "Four";
+    StateVersion[StateVersion["Latest"] = 4] = "Latest";
 })(StateVersion || (StateVersion = {}));
 
+;// CONCATENATED MODULE: ./jslib/common/src/services/token.service.ts
+var token_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 TokenService {
+    constructor(stateService) {
+        this.stateService = stateService;
+    }
+    static decodeToken(token) {
+        if (token == null) {
+            throw new Error("Token not provided.");
+        }
+        const parts = token.split(".");
+        if (parts.length !== 3) {
+            throw new Error("JWT must have 3 parts");
+        }
+        const decoded = Utils.fromUrlB64ToUtf8(parts[1]);
+        if (decoded == null) {
+            throw new Error("Cannot decode the token");
+        }
+        const decodedToken = JSON.parse(decoded);
+        return decodedToken;
+    }
+    setTokens(accessToken, refreshToken, clientIdClientSecret) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            yield this.setToken(accessToken);
+            yield this.setRefreshToken(refreshToken);
+            if (clientIdClientSecret != null) {
+                yield this.setClientId(clientIdClientSecret[0]);
+                yield this.setClientSecret(clientIdClientSecret[1]);
+            }
+        });
+    }
+    setClientId(clientId) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.setApiKeyClientId(clientId);
+        });
+    }
+    getClientId() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.getApiKeyClientId();
+        });
+    }
+    setClientSecret(clientSecret) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.setApiKeyClientSecret(clientSecret);
+        });
+    }
+    getClientSecret() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.getApiKeyClientSecret();
+        });
+    }
+    setToken(token) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            yield this.stateService.setAccessToken(token);
+        });
+    }
+    getToken() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.getAccessToken();
+        });
+    }
+    setRefreshToken(refreshToken) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.setRefreshToken(refreshToken);
+        });
+    }
+    getRefreshToken() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.getRefreshToken();
+        });
+    }
+    toggleTokens() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const token = yield this.getToken();
+            const refreshToken = yield this.getRefreshToken();
+            const clientId = yield this.getClientId();
+            const clientSecret = yield this.getClientSecret();
+            const timeout = yield this.stateService.getVaultTimeout();
+            const action = yield this.stateService.getVaultTimeoutAction();
+            if ((timeout != null || timeout === 0) && action === "logOut") {
+                // if we have a vault timeout and the action is log out, reset tokens
+                yield this.clearToken();
+            }
+            yield this.setToken(token);
+            yield this.setRefreshToken(refreshToken);
+            yield this.setClientId(clientId);
+            yield this.setClientSecret(clientSecret);
+        });
+    }
+    setTwoFactorToken(token) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.setTwoFactorToken(token);
+        });
+    }
+    getTwoFactorToken() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.getTwoFactorToken();
+        });
+    }
+    clearTwoFactorToken() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            return yield this.stateService.setTwoFactorToken(null);
+        });
+    }
+    clearToken(userId) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            yield this.stateService.setAccessToken(null, { userId: userId });
+            yield this.stateService.setRefreshToken(null, { userId: userId });
+            yield this.stateService.setApiKeyClientId(null, { userId: userId });
+            yield this.stateService.setApiKeyClientSecret(null, { userId: userId });
+        });
+    }
+    // jwthelper methods
+    // ref https://github.com/auth0/angular-jwt/blob/master/src/angularJwt/services/jwt.js
+    decodeToken(token) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const storedToken = yield this.stateService.getDecodedToken();
+            if (token === null && storedToken != null) {
+                return storedToken;
+            }
+            token = token !== null && token !== void 0 ? token : (yield this.stateService.getAccessToken());
+            if (token == null) {
+                throw new Error("Token not found.");
+            }
+            return TokenService.decodeToken(token);
+        });
+    }
+    getTokenExpirationDate() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            if (typeof decoded.exp === "undefined") {
+                return null;
+            }
+            const d = new Date(0); // The 0 here is the key, which sets the date to the epoch
+            d.setUTCSeconds(decoded.exp);
+            return d;
+        });
+    }
+    tokenSecondsRemaining(offsetSeconds = 0) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const d = yield this.getTokenExpirationDate();
+            if (d == null) {
+                return 0;
+            }
+            const msRemaining = d.valueOf() - (new Date().valueOf() + offsetSeconds * 1000);
+            return Math.round(msRemaining / 1000);
+        });
+    }
+    tokenNeedsRefresh(minutes = 5) {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const sRemaining = yield this.tokenSecondsRemaining();
+            return sRemaining < 60 * minutes;
+        });
+    }
+    getUserId() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            if (typeof decoded.sub === "undefined") {
+                throw new Error("No user id found");
+            }
+            return decoded.sub;
+        });
+    }
+    getEmail() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            if (typeof decoded.email === "undefined") {
+                throw new Error("No email found");
+            }
+            return decoded.email;
+        });
+    }
+    getEmailVerified() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            if (typeof decoded.email_verified === "undefined") {
+                throw new Error("No email verification found");
+            }
+            return decoded.email_verified;
+        });
+    }
+    getName() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            if (typeof decoded.name === "undefined") {
+                return null;
+            }
+            return decoded.name;
+        });
+    }
+    getPremium() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            if (typeof decoded.premium === "undefined") {
+                return false;
+            }
+            return decoded.premium;
+        });
+    }
+    getIssuer() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            if (typeof decoded.iss === "undefined") {
+                throw new Error("No issuer found");
+            }
+            return decoded.iss;
+        });
+    }
+    getIsExternal() {
+        return token_service_awaiter(this, void 0, void 0, function* () {
+            const decoded = yield this.decodeToken();
+            return Array.isArray(decoded.amr) && decoded.amr.includes("external");
+        });
+    }
+}
+
 ;// CONCATENATED MODULE: ./jslib/common/src/services/stateMigration.service.ts
 var stateMigration_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -25300,6 +25532,7 @@ var stateMigration_service_awaiter = (undefined && undefined.__awaiter) || funct
 };
 
 
+
 // Originally (before January 2022) storage was handled as a flat key/value pair store.
 // With the move to a typed object for state storage these keys should no longer be in use anywhere outside of this migration.
 const v1Keys = {
@@ -25423,6 +25656,12 @@ class StateMigrationService {
                     case StateVersion.One:
                         yield this.migrateStateFrom1To2();
                         break;
+                    case StateVersion.Two:
+                        yield this.migrateStateFrom2To3();
+                        break;
+                    case StateVersion.Three:
+                        yield this.migrateStateFrom3To4();
+                        break;
                 }
                 currentStateVersion += 1;
             }
@@ -25630,6 +25869,40 @@ class StateMigrationService {
             }
         });
     }
+    migrateStateFrom2To3() {
+        return stateMigration_service_awaiter(this, void 0, void 0, function* () {
+            const authenticatedUserIds = yield this.get(stateMigration_service_keys.authenticatedAccounts);
+            yield Promise.all(authenticatedUserIds.map((userId) => stateMigration_service_awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const account = yield this.get(userId);
+                if (((_a = account === null || account === void 0 ? void 0 : account.profile) === null || _a === void 0 ? void 0 : _a.hasPremiumPersonally) === null &&
+                    ((_b = account.tokens) === null || _b === void 0 ? void 0 : _b.accessToken) != null) {
+                    const decodedToken = yield TokenService.decodeToken(account.tokens.accessToken);
+                    account.profile.hasPremiumPersonally = decodedToken.premium;
+                    yield this.set(userId, account);
+                }
+            })));
+            const globals = yield this.getGlobals();
+            globals.stateVersion = StateVersion.Three;
+            yield this.set(stateMigration_service_keys.global, globals);
+        });
+    }
+    migrateStateFrom3To4() {
+        return stateMigration_service_awaiter(this, void 0, void 0, function* () {
+            const authenticatedUserIds = yield this.get(stateMigration_service_keys.authenticatedAccounts);
+            yield Promise.all(authenticatedUserIds.map((userId) => stateMigration_service_awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const account = yield this.get(userId);
+                if (((_a = account === null || account === void 0 ? void 0 : account.profile) === null || _a === void 0 ? void 0 : _a.everBeenUnlocked) != null) {
+                    delete account.profile.everBeenUnlocked;
+                    return this.set(userId, account);
+                }
+            })));
+            const globals = yield this.getGlobals();
+            globals.stateVersion = StateVersion.Four;
+            yield this.set(stateMigration_service_keys.global, globals);
+        });
+    }
     get options() {
         return { htmlStorageLocation: HtmlStorageLocation.Local };
     }
@@ -26007,10 +26280,8 @@ class SyncService {
                     organizations[o.id].isProviderUser = true;
                 }
             });
-            yield Promise.all([
-                this.organizationService.save(organizations),
-                this.providerService.save(providers),
-            ]);
+            yield this.organizationService.save(organizations);
+            yield this.providerService.save(providers);
             if (yield this.keyConnectorService.userNeedsMigration()) {
                 yield this.keyConnectorService.setConvertAccountRequired(true);
                 this.messagingService.send("convertAccountToKeyConnector");
@@ -26085,225 +26356,6 @@ class SyncService {
     }
 }
 
-;// CONCATENATED MODULE: ./jslib/common/src/services/token.service.ts
-var token_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 TokenService {
-    constructor(stateService) {
-        this.stateService = stateService;
-    }
-    setTokens(accessToken, refreshToken, clientIdClientSecret) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            yield this.setToken(accessToken);
-            yield this.setRefreshToken(refreshToken);
-            if (clientIdClientSecret != null) {
-                yield this.setClientId(clientIdClientSecret[0]);
-                yield this.setClientSecret(clientIdClientSecret[1]);
-            }
-        });
-    }
-    setClientId(clientId) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.setApiKeyClientId(clientId);
-        });
-    }
-    getClientId() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.getApiKeyClientId();
-        });
-    }
-    setClientSecret(clientSecret) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.setApiKeyClientSecret(clientSecret);
-        });
-    }
-    getClientSecret() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.getApiKeyClientSecret();
-        });
-    }
-    setToken(token) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            yield this.stateService.setAccessToken(token);
-        });
-    }
-    getToken() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.getAccessToken();
-        });
-    }
-    setRefreshToken(refreshToken) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.setRefreshToken(refreshToken);
-        });
-    }
-    getRefreshToken() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.getRefreshToken();
-        });
-    }
-    toggleTokens() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const token = yield this.getToken();
-            const refreshToken = yield this.getRefreshToken();
-            const clientId = yield this.getClientId();
-            const clientSecret = yield this.getClientSecret();
-            const timeout = yield this.stateService.getVaultTimeout();
-            const action = yield this.stateService.getVaultTimeoutAction();
-            if ((timeout != null || timeout === 0) && action === "logOut") {
-                // if we have a vault timeout and the action is log out, reset tokens
-                yield this.clearToken();
-            }
-            yield this.setToken(token);
-            yield this.setRefreshToken(refreshToken);
-            yield this.setClientId(clientId);
-            yield this.setClientSecret(clientSecret);
-        });
-    }
-    setTwoFactorToken(token) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.setTwoFactorToken(token);
-        });
-    }
-    getTwoFactorToken() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.getTwoFactorToken();
-        });
-    }
-    clearTwoFactorToken() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            return yield this.stateService.setTwoFactorToken(null);
-        });
-    }
-    clearToken(userId) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            yield this.stateService.setAccessToken(null, { userId: userId });
-            yield this.stateService.setRefreshToken(null, { userId: userId });
-            yield this.stateService.setApiKeyClientId(null, { userId: userId });
-            yield this.stateService.setApiKeyClientSecret(null, { userId: userId });
-        });
-    }
-    // jwthelper methods
-    // ref https://github.com/auth0/angular-jwt/blob/master/src/angularJwt/services/jwt.js
-    decodeToken(token) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const storedToken = yield this.stateService.getDecodedToken();
-            if (token === null && storedToken != null) {
-                return storedToken;
-            }
-            token = token !== null && token !== void 0 ? token : (yield this.stateService.getAccessToken());
-            if (token == null) {
-                throw new Error("Token not found.");
-            }
-            const parts = token.split(".");
-            if (parts.length !== 3) {
-                throw new Error("JWT must have 3 parts");
-            }
-            const decoded = Utils.fromUrlB64ToUtf8(parts[1]);
-            if (decoded == null) {
-                throw new Error("Cannot decode the token");
-            }
-            const decodedToken = JSON.parse(decoded);
-            return decodedToken;
-        });
-    }
-    getTokenExpirationDate() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            if (typeof decoded.exp === "undefined") {
-                return null;
-            }
-            const d = new Date(0); // The 0 here is the key, which sets the date to the epoch
-            d.setUTCSeconds(decoded.exp);
-            return d;
-        });
-    }
-    tokenSecondsRemaining(offsetSeconds = 0) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const d = yield this.getTokenExpirationDate();
-            if (d == null) {
-                return 0;
-            }
-            const msRemaining = d.valueOf() - (new Date().valueOf() + offsetSeconds * 1000);
-            return Math.round(msRemaining / 1000);
-        });
-    }
-    tokenNeedsRefresh(minutes = 5) {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const sRemaining = yield this.tokenSecondsRemaining();
-            return sRemaining < 60 * minutes;
-        });
-    }
-    getUserId() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            if (typeof decoded.sub === "undefined") {
-                throw new Error("No user id found");
-            }
-            return decoded.sub;
-        });
-    }
-    getEmail() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            if (typeof decoded.email === "undefined") {
-                throw new Error("No email found");
-            }
-            return decoded.email;
-        });
-    }
-    getEmailVerified() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            if (typeof decoded.email_verified === "undefined") {
-                throw new Error("No email verification found");
-            }
-            return decoded.email_verified;
-        });
-    }
-    getName() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            if (typeof decoded.name === "undefined") {
-                return null;
-            }
-            return decoded.name;
-        });
-    }
-    getPremium() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            if (typeof decoded.premium === "undefined") {
-                return false;
-            }
-            return decoded.premium;
-        });
-    }
-    getIssuer() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            if (typeof decoded.iss === "undefined") {
-                throw new Error("No issuer found");
-            }
-            return decoded.iss;
-        });
-    }
-    getIsExternal() {
-        return token_service_awaiter(this, void 0, void 0, function* () {
-            const decoded = yield this.decodeToken();
-            return Array.isArray(decoded.amr) && decoded.amr.includes("external");
-        });
-    }
-}
-
 ;// CONCATENATED MODULE: ./jslib/common/src/services/totp.service.ts
 var totp_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -30365,8 +30417,9 @@ var generate_command_awaiter = (undefined && undefined.__awaiter) || function (t
 
 
 class GenerateCommand {
-    constructor(passwordGenerationService) {
+    constructor(passwordGenerationService, stateService) {
         this.passwordGenerationService = passwordGenerationService;
+        this.stateService = stateService;
     }
     run(cmdOptions) {
         return generate_command_awaiter(this, void 0, void 0, function* () {
@@ -30383,8 +30436,10 @@ class GenerateCommand {
                 capitalize: normalizedOptions.capitalize,
                 includeNumber: normalizedOptions.includeNumber,
             };
-            const enforcedOptions = yield this.passwordGenerationService.enforcePasswordGeneratorPoliciesOnOptions(options);
-            const password = yield this.passwordGenerationService.generatePassword(enforcedOptions[0]);
+            const enforcedOptions = (yield this.stateService.getIsAuthenticated())
+                ? (yield this.passwordGenerationService.enforcePasswordGeneratorPoliciesOnOptions(options))[0]
+                : options;
+            const password = yield this.passwordGenerationService.generatePassword(enforcedOptions);
             const res = new StringResponse(password);
             return Response.success(res);
         });
@@ -33549,7 +33604,7 @@ class ServeCommand {
         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.generateCommand = new GenerateCommand(this.main.passwordGenerationService);
+        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.vaultTimeoutService);
         this.deleteCommand = new DeleteCommand(this.main.cipherService, this.main.folderService, this.main.stateService, this.main.apiService);
@@ -34290,7 +34345,7 @@ class Program extends BaseProgram {
                 writeLn("", true);
             })
                 .action((options) => program_awaiter(this, void 0, void 0, function* () {
-                const command = new GenerateCommand(this.main.passwordGenerationService);
+                const command = new GenerateCommand(this.main.passwordGenerationService, this.main.stateService);
                 const response = yield command.run(options);
                 this.processResponse(response);
             }));