@bitwarden/cli 1.22.0 → 1.22.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.22.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":"eslint . && prettier --check .","lint:fix":"eslint . --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/inquirer":"^7.3.1","@types/jasmine":"^3.7.0","@types/jsdom":"^16.2.10","@types/koa":"^2.13.4","@types/koa__multer":"^2.0.4","@types/koa__router":"^8.0.11","@types/koa-bodyparser":"^4.3.5","@types/koa-json":"^2.0.20","@types/lowdb":"^1.0.10","@types/lunr":"^2.3.3","@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","@typescript-eslint/eslint-plugin":"^5.12.1","@typescript-eslint/parser":"^5.12.1","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^10.2.0","cross-env":"^7.0.3","eslint":"^8.9.0","eslint-config-prettier":"^8.4.0","eslint-import-resolver-typescript":"^2.5.0","eslint-plugin-import":"^2.25.4","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","typescript":"4.1.5","webpack":"^5.65.0","webpack-cli":"^4.9.1","webpack-node-externals":"^3.0.0"},"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":"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":{"./!(jslib)**":"prettier --ignore-unknown --write","*.ts":"eslint --fix"}}');
+module.exports = JSON.parse('{"name":"@bitwarden/cli","description":"A secure and free password manager for all of your devices.","version":"1.22.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":"eslint . && prettier --check .","lint:fix":"eslint . --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/inquirer":"^7.3.1","@types/jasmine":"^3.7.0","@types/jsdom":"^16.2.10","@types/koa":"^2.13.4","@types/koa__multer":"^2.0.4","@types/koa__router":"^8.0.11","@types/koa-bodyparser":"^4.3.5","@types/koa-json":"^2.0.20","@types/lowdb":"^1.0.10","@types/lunr":"^2.3.3","@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","@typescript-eslint/eslint-plugin":"^5.12.1","@typescript-eslint/parser":"^5.12.1","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^10.2.0","cross-env":"^7.0.3","eslint":"^8.9.0","eslint-config-prettier":"^8.4.0","eslint-import-resolver-typescript":"^2.5.0","eslint-plugin-import":"^2.25.4","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","typescript":"4.1.5","webpack":"^5.65.0","webpack-cli":"^4.9.1","webpack-node-externals":"^3.0.0"},"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":"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":{"./!(jslib)**":"prettier --ignore-unknown --write","*.ts":"eslint --fix"}}');
 
 /***/ })
 
@@ -263,43 +263,6 @@ class GlobalState {
     }
 }
 
-;// CONCATENATED MODULE: ./jslib/common/src/enums/authenticationType.ts
-var AuthenticationType;
-(function (AuthenticationType) {
-    AuthenticationType[AuthenticationType["Password"] = 0] = "Password";
-    AuthenticationType[AuthenticationType["Sso"] = 1] = "Sso";
-    AuthenticationType[AuthenticationType["Api"] = 2] = "Api";
-})(AuthenticationType || (AuthenticationType = {}));
-
-;// CONCATENATED MODULE: ./jslib/common/src/models/domain/logInCredentials.ts
-
-class PasswordLogInCredentials {
-    constructor(email, masterPassword, captchaToken, twoFactor) {
-        this.email = email;
-        this.masterPassword = masterPassword;
-        this.captchaToken = captchaToken;
-        this.twoFactor = twoFactor;
-        this.type = AuthenticationType.Password;
-    }
-}
-class SsoLogInCredentials {
-    constructor(code, codeVerifier, redirectUrl, orgId, twoFactor) {
-        this.code = code;
-        this.codeVerifier = codeVerifier;
-        this.redirectUrl = redirectUrl;
-        this.orgId = orgId;
-        this.twoFactor = twoFactor;
-        this.type = AuthenticationType.Sso;
-    }
-}
-class ApiLogInCredentials {
-    constructor(clientId, clientSecret) {
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.type = AuthenticationType.Api;
-    }
-}
-
 ;// CONCATENATED MODULE: ./jslib/common/src/enums/htmlStorageLocation.ts
 var HtmlStorageLocation;
 (function (HtmlStorageLocation) {
@@ -825,6 +788,14 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], AuditService.prototype, "passwordLeaked", null);
 
+;// CONCATENATED MODULE: ./jslib/common/src/enums/authenticationType.ts
+var AuthenticationType;
+(function (AuthenticationType) {
+    AuthenticationType[AuthenticationType["Password"] = 0] = "Password";
+    AuthenticationType[AuthenticationType["Sso"] = 1] = "Sso";
+    AuthenticationType[AuthenticationType["Api"] = 2] = "Api";
+})(AuthenticationType || (AuthenticationType = {}));
+
 ;// CONCATENATED MODULE: ./jslib/common/src/models/request/identityToken/tokenRequest.ts
 class TokenRequest {
     constructor(twoFactor, device) {
@@ -917,6 +888,15 @@ class DeviceRequest {
     }
 }
 
+;// CONCATENATED MODULE: ./jslib/common/src/models/request/identityToken/tokenRequestTwoFactor.ts
+class TokenRequestTwoFactor {
+    constructor(provider = null, token = null, remember = false) {
+        this.provider = provider;
+        this.token = token;
+        this.remember = remember;
+    }
+}
+
 ;// CONCATENATED MODULE: ./jslib/common/src/models/request/keysRequest.ts
 class KeysRequest {
     constructor(publicKey, encryptedPrivateKey) {
@@ -1031,6 +1011,7 @@ var logIn_strategy_awaiter = (undefined && undefined.__awaiter) || function (thi
 
 
 
+
 class LogInStrategy {
     constructor(cryptoService, apiService, tokenService, appIdService, platformUtilsService, messagingService, logService, stateService, twoFactorService) {
         this.cryptoService = cryptoService;
@@ -1083,17 +1064,9 @@ class LogInStrategy {
             }
             const storedTwoFactorToken = yield this.tokenService.getTwoFactorToken();
             if (storedTwoFactorToken != null) {
-                return {
-                    token: storedTwoFactorToken,
-                    provider: TwoFactorProviderType.Remember,
-                    remember: false,
-                };
+                return new TokenRequestTwoFactor(TwoFactorProviderType.Remember, storedTwoFactorToken, false);
             }
-            return {
-                token: null,
-                provider: null,
-                remember: false,
-            };
+            return new TokenRequestTwoFactor();
         });
     }
     saveAccountInformation(tokenResponse) {
@@ -4690,7 +4663,7 @@ class CipherService {
                 ciphers[c.id].deletedDate = null;
                 ciphers[c.id].revisionDate = c.revisionDate;
             };
-            if (cipher.constructor.name === "Array") {
+            if (cipher.constructor.name === Array.name) {
                 cipher.forEach(clearDeletedDate);
             }
             else {
@@ -5209,6 +5182,9 @@ var KdfType;
 (function (KdfType) {
     KdfType[KdfType["PBKDF2_SHA256"] = 0] = "PBKDF2_SHA256";
 })(KdfType || (KdfType = {}));
+const DEFAULT_KDF_TYPE = KdfType.PBKDF2_SHA256;
+const DEFAULT_KDF_ITERATIONS = 100000;
+const SEND_KDF_ITERATIONS = 100000;
 
 ;// CONCATENATED MODULE: ./jslib/common/src/misc/wordlist.ts
 // EFF's Long Wordlist from https://www.eff.org/dice
@@ -14812,7 +14788,7 @@ class ExportService {
                 ? yield this.getOrganizationExport(organizationId, "json")
                 : yield this.getExport("json");
             const salt = Utils.fromBufferToB64(yield this.cryptoFunctionService.randomBytes(16));
-            const kdfIterations = 100000;
+            const kdfIterations = DEFAULT_KDF_ITERATIONS;
             const key = yield this.cryptoService.makePinKey(password, salt, KdfType.PBKDF2_SHA256, kdfIterations);
             const encKeyValidation = yield this.cryptoService.encrypt(Utils.newGuid(), key);
             const encText = yield this.cryptoService.encrypt(clearText, key);
@@ -20665,12 +20641,14 @@ class SafariCsvImporter extends BaseImporter {
             return Promise.resolve(result);
         }
         results.forEach((value) => {
+            var _a;
             const cipher = this.initLoginCipher();
             cipher.name = this.getValueOrDefault(value.Title, "--");
             cipher.login.username = this.getValueOrDefault(value.Username);
             cipher.login.password = this.getValueOrDefault(value.Password);
-            cipher.login.uris = this.makeUriArray(value.Url);
+            cipher.login.uris = this.makeUriArray((_a = value.Url) !== null && _a !== void 0 ? _a : value.URL);
             cipher.login.totp = this.getValueOrDefault(value.OTPAuth);
+            cipher.notes = this.getValueOrDefault(value.Notes);
             this.cleanupCipher(cipher);
             result.ciphers.push(cipher);
         });
@@ -23469,6 +23447,7 @@ var send_service_awaiter = (undefined && undefined.__awaiter) || function (thisA
 
 
 
+
 class SendService {
     constructor(cryptoService, apiService, fileUploadService, i18nService, cryptoFunctionService, stateService) {
         this.cryptoService = cryptoService;
@@ -23497,7 +23476,7 @@ class SendService {
                 model.cryptoKey = yield this.cryptoService.makeSendKey(model.key);
             }
             if (password != null) {
-                const passwordHash = yield this.cryptoFunctionService.pbkdf2(password, model.key, "sha256", 100000);
+                const passwordHash = yield this.cryptoFunctionService.pbkdf2(password, model.key, "sha256", SEND_KDF_ITERATIONS);
                 send.password = Utils.fromBufferToB64(passwordHash);
             }
             send.key = yield this.cryptoService.encrypt(model.key, key);
@@ -25200,6 +25179,32 @@ class StateService {
             yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
         });
     }
+    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;
+        });
+    }
+    setUsernameGenerationOptions(value, options) {
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            account.settings.usernameGenerationOptions = value;
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+        });
+    }
+    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;
+        });
+    }
+    setGeneratorOptions(value, options) {
+        return state_service_awaiter(this, void 0, void 0, function* () {
+            const account = yield this.getAccount(this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+            account.settings.generatorOptions = value;
+            yield this.saveAccount(account, this.reconcileOptions(options, yield this.defaultOnDiskOptions()));
+        });
+    }
     getProtectedPin(options) {
         var _a, _b;
         return state_service_awaiter(this, void 0, void 0, function* () {
@@ -25757,11 +25762,8 @@ class StateService {
         return state_service_awaiter(this, void 0, void 0, function* () {
             yield this.setAccessToken(null, { userId: userId });
             yield this.setLastActive(null, { userId: userId });
-            const index = this.state.authenticatedAccounts.indexOf(userId);
-            if (index > -1) {
-                this.state.authenticatedAccounts.splice(index, 1);
-                yield this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts);
-            }
+            this.state.authenticatedAccounts = this.state.authenticatedAccounts.filter((activeUserId) => activeUserId !== userId);
+            yield this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts);
         });
     }
     removeAccountFromDisk(userId) {
@@ -26476,6 +26478,15 @@ class ProviderData {
 }
 
 ;// CONCATENATED MODULE: ./jslib/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;
+    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 sync_service_metadata = (undefined && undefined.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var sync_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) {
@@ -26492,6 +26503,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) {
         this.apiService = apiService;
@@ -26850,6 +26862,12 @@ class SyncService {
         });
     }
 }
+sync_service_decorate([
+    sequentialize(() => "fullSync"),
+    sync_service_metadata("design:type", Function),
+    sync_service_metadata("design:paramtypes", [Boolean, Object]),
+    sync_service_metadata("design:returntype", Promise)
+], SyncService.prototype, "fullSync", null);
 
 ;// CONCATENATED MODULE: ./jslib/common/src/services/totp.service.ts
 var totp_service_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -27535,9 +27553,6 @@ class CliPlatformUtilsService {
     isSafari() {
         return false;
     }
-    isIE() {
-        return false;
-    }
     isMacAppStore() {
         return false;
     }
@@ -28990,14 +29005,17 @@ var api_service_awaiter = (undefined && undefined.__awaiter) || function (thisAr
 
 
 
+
+
 
 
 
 class ApiService {
-    constructor(tokenService, platformUtilsService, environmentService, logoutCallback, customUserAgent = null) {
+    constructor(tokenService, platformUtilsService, environmentService, appIdService, logoutCallback, customUserAgent = null) {
         this.tokenService = tokenService;
         this.platformUtilsService = platformUtilsService;
         this.environmentService = environmentService;
+        this.appIdService = appIdService;
         this.logoutCallback = logoutCallback;
         this.customUserAgent = customUserAgent;
         this.isWebClient = false;
@@ -30441,18 +30459,6 @@ class ApiService {
             throw new Error("Cannot refresh token, no refresh token or api keys are stored");
         });
     }
-    doApiTokenRefresh() {
-        return api_service_awaiter(this, void 0, void 0, function* () {
-            const clientId = yield this.tokenService.getClientId();
-            const clientSecret = yield this.tokenService.getClientSecret();
-            if (Utils.isNullOrWhitespace(clientId) ||
-                Utils.isNullOrWhitespace(clientSecret) ||
-                this.apiKeyRefresh == null) {
-                throw new Error();
-            }
-            yield this.apiKeyRefresh(clientId, clientSecret);
-        });
-    }
     doRefreshToken() {
         return api_service_awaiter(this, void 0, void 0, function* () {
             const refreshToken = yield this.tokenService.getRefreshToken();
@@ -30490,6 +30496,20 @@ class ApiService {
             }
         });
     }
+    doApiTokenRefresh() {
+        return api_service_awaiter(this, void 0, void 0, function* () {
+            const clientId = yield this.tokenService.getClientId();
+            const clientSecret = yield this.tokenService.getClientSecret();
+            const appId = yield this.appIdService.getAppId();
+            const deviceRequest = new DeviceRequest(appId, this.platformUtilsService);
+            const tokenRequest = new ApiTokenRequest(clientId, clientSecret, new TokenRequestTwoFactor(), deviceRequest);
+            const response = yield this.postIdentityToken(tokenRequest);
+            if (!(response instanceof IdentityTokenResponse)) {
+                throw new Error("Invalid response received when refreshing api token");
+            }
+            yield this.tokenService.setToken(response.accessToken);
+        });
+    }
     send(method, path, body, authed, hasResponse, apiUrl, alterHeaders) {
         return api_service_awaiter(this, void 0, void 0, function* () {
             apiUrl = Utils.isNullOrWhitespace(apiUrl) ? this.environmentService.getApiUrl() : apiUrl;
@@ -30613,9 +30633,8 @@ global.Response = external_node_fetch_namespaceObject.Response;
 global.Headers = external_node_fetch_namespaceObject.Headers;
 global.FormData = external_form_data_namespaceObject;
 class NodeApiService extends ApiService {
-    constructor(tokenService, platformUtilsService, environmentService, logoutCallback, customUserAgent = null, apiKeyRefresh) {
-        super(tokenService, platformUtilsService, environmentService, logoutCallback, customUserAgent);
-        this.apiKeyRefresh = apiKeyRefresh;
+    constructor(tokenService, platformUtilsService, environmentService, appIdService, logoutCallback, customUserAgent = null) {
+        super(tokenService, platformUtilsService, environmentService, appIdService, logoutCallback, customUserAgent);
     }
     nativeFetch(request) {
         const proxy = process.env.http_proxy || process.env.https_proxy;
@@ -31768,6 +31787,35 @@ class LockCommand {
 
 ;// CONCATENATED MODULE: external "http"
 const external_http_namespaceObject = require("http");
+;// CONCATENATED MODULE: ./jslib/common/src/models/domain/logInCredentials.ts
+
+class PasswordLogInCredentials {
+    constructor(email, masterPassword, captchaToken, twoFactor) {
+        this.email = email;
+        this.masterPassword = masterPassword;
+        this.captchaToken = captchaToken;
+        this.twoFactor = twoFactor;
+        this.type = AuthenticationType.Password;
+    }
+}
+class SsoLogInCredentials {
+    constructor(code, codeVerifier, redirectUrl, orgId, twoFactor) {
+        this.code = code;
+        this.codeVerifier = codeVerifier;
+        this.redirectUrl = redirectUrl;
+        this.orgId = orgId;
+        this.twoFactor = twoFactor;
+        this.type = AuthenticationType.Sso;
+    }
+}
+class ApiLogInCredentials {
+    constructor(clientId, clientSecret) {
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.type = AuthenticationType.Api;
+    }
+}
+
 ;// CONCATENATED MODULE: ./jslib/common/src/models/request/twoFactorEmailRequest.ts
 
 class TwoFactorEmailRequest extends SecretVerificationRequest {
@@ -31803,6 +31851,7 @@ var login_command_awaiter = (undefined && undefined.__awaiter) || function (this
 
 
 
+
 class login_command_LoginCommand {
     constructor(authService, apiService, i18nService, environmentService, passwordGenerationService, cryptoFunctionService, platformUtilsService, stateService, cryptoService, policyService, twoFactorService, clientId) {
         this.authService = authService;
@@ -31907,11 +31956,7 @@ class login_command_LoginCommand {
             }
             const twoFactor = twoFactorToken == null
                 ? null
-                : {
-                    provider: twoFactorMethod,
-                    token: twoFactorToken,
-                    remember: false,
-                };
+                : new TokenRequestTwoFactor(twoFactorMethod, twoFactorToken, false);
             try {
                 if (this.validatedParams != null) {
                     yield this.validatedParams();
@@ -31999,18 +32044,10 @@ class login_command_LoginCommand {
                             return Response.badRequest("Code is required.");
                         }
                     }
-                    response = yield this.authService.logInTwoFactor({
-                        provider: selectedProvider.type,
-                        token: twoFactorToken,
-                        remember: false,
-                    }, null);
+                    response = yield this.authService.logInTwoFactor(new TokenRequestTwoFactor(selectedProvider.type, twoFactorToken), null);
                 }
                 if (response.captchaSiteKey) {
-                    const twoFactorRequest = {
-                        provider: selectedProvider.type,
-                        token: twoFactorToken,
-                        remember: false,
-                    };
+                    const twoFactorRequest = new TokenRequestTwoFactor(selectedProvider.type, twoFactorToken);
                     const handledResponse = yield this.handleCaptchaRequired(twoFactorRequest);
                     // Error Response
                     if (handledResponse instanceof Response) {
@@ -32158,7 +32195,7 @@ class login_command_LoginCommand {
             }
             catch (e) {
                 if (e instanceof ErrorResponse ||
-                    (e.constructor.name === "ErrorResponse" &&
+                    (e.constructor.name === ErrorResponse.name &&
                         e.message.includes("Captcha is invalid"))) {
                     return badCaptcha;
                 }
@@ -34916,6 +34953,7 @@ class ServeCommand {
     run(options) {
         return serve_command_awaiter(this, void 0, void 0, function* () {
             const port = options.port || 8087;
+            const hostname = options.hostname || "localhost";
             const server = new external_koa_namespaceObject();
             const router = new router_namespaceObject();
             process.env.BW_SERVE = "true";
@@ -35083,8 +35121,8 @@ class ServeCommand {
             server
                 .use(router.routes())
                 .use(router.allowedMethods())
-                .listen(port, () => {
-                this.main.logService.info("Listening on port " + port);
+                .listen(port, hostname === "all" ? null : hostname, () => {
+                this.main.logService.info("Listening on " + hostname + ":" + port);
             });
         });
     }
@@ -35491,12 +35529,20 @@ class Program extends BaseProgram {
             if (CliUtils.flagEnabled("serve")) {
                 external_commander_namespaceObject.command("serve")
                     .description("Start a RESTful API webserver.")
-                    .option("--port <port>", "The port to run your API webserver on. Default port is 8087.")
+                    .option("--hostname <hostname>", "The hostname to bind your API webserver to.")
+                    .option("--port <port>", "The port to run your API webserver on.")
                     .on("--help", () => {
-                    writeLn("\n  Examples:");
+                    writeLn("\n  Notes:");
+                    writeLn("");
+                    writeLn("    Default hostname is `localhost`.");
+                    writeLn("    Use hostname `all` for no hostname binding.");
+                    writeLn("    Default port is `8087`.");
+                    writeLn("");
+                    writeLn("  Examples:");
                     writeLn("");
                     writeLn("    bw serve");
                     writeLn("    bw serve --port 8080");
+                    writeLn("    bw serve --hostname bwapi.mydomain.com --port 80");
                     writeLn("", true);
                 })
                     .action((cmd) => program_awaiter(this, void 0, void 0, function* () {
@@ -37230,7 +37276,6 @@ var bw_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argum
 
 
 
-
 
 
 // Polyfills
@@ -37272,11 +37317,12 @@ class Main {
         this.tokenService = new TokenService(this.stateService);
         this.messagingService = new NoopMessagingService();
         this.environmentService = new EnvironmentService(this.stateService);
-        this.apiService = new NodeApiService(this.tokenService, this.platformUtilsService, this.environmentService, (expired) => bw_awaiter(this, void 0, void 0, function* () { return yield this.logout(); }), "Bitwarden_CLI/" +
+        const customUserAgent = "Bitwarden_CLI/" +
             this.platformUtilsService.getApplicationVersionSync() +
             " (" +
             this.platformUtilsService.getDeviceString().toUpperCase() +
-            ")", (clientId, clientSecret) => this.authService.logIn(new ApiLogInCredentials(clientId, clientSecret)));
+            ")";
+        this.apiService = new NodeApiService(this.tokenService, this.platformUtilsService, this.environmentService, this.appIdService, (expired) => bw_awaiter(this, void 0, void 0, function* () { return yield this.logout(); }), customUserAgent);
         this.containerService = new ContainerService(this.cryptoService);
         this.settingsService = new SettingsService(this.stateService);
         this.fileUploadService = new FileUploadService(this.logService, this.apiService);