@@ -7,16 +7,19 @@ import { EnvironmentService } from "../../deps/bw/libs/shared/dist/src/services/
77import { StateMigrationService } from "../../deps/bw/libs/shared/dist/src/services/stateMigration.service";
88import { TokenService } from "../../deps/bw/libs/shared/dist/src/services/token.service";
99import { WebCryptoFunctionService } from "../../deps/bw/libs/shared/dist/src/services/webCryptoFunction.service";
10+import { Account, AccountSettings } from "../../deps/bw/libs/shared/dist/src/models/domain/account";
1011
1112// import BrowserStorageService from "../../deps/bw/libs/shared/dist/src/services/browserStorage.service";
1213import { CryptoService } from "../../deps/bw/libs/shared/dist/src/abstractions/crypto.service";
1314import { I18nService } from "../../deps/bw/libs/shared/dist/src/services/i18n.service";
1415import { StateService } from "../../deps/bw/libs/shared/dist/src/services/state.service";
1516
16−export function getAPI() {
17+export function getAPI(urls) {
1718 return function () {
1819 const bg = new MainBackground()
1920
21+ bg.environmentService.setUrls(urls)
22+
2023 return bg.apiService
2124 }
2225}
@@ -38,11 +41,9 @@ class MainBackground {
3841 stateMigrationService; //: StateMigrationService;
3942
4043
41− constructor(isPrivateMode = false) {
44+ constructor() {
4245
43− this.messagingService = isPrivateMode
44− ? new BrowserMessagingPrivateModeBackgroundService()
45− : new BrowserMessagingService();
46+ this.messagingService = new BrowserMessagingService();
4647 this.storageService = new BrowserStorageService();
4748 this.logService = new ConsoleLogService(false);
4849 this.stateMigrationService = new StateMigrationService(
@@ -79,7 +80,7 @@ class MainBackground {
7980 }
8081 }
8182 );
82− this.i18nService = new I18nService(BrowserApi.getUILanguage(window));
83+ this.i18nService = new I18nService("en");
8384 this.cryptoFunctionService = new WebCryptoFunctionService(window);
8485 this.cryptoService = new BrowserCryptoService(
8586 this.cryptoFunctionService,
@@ -135,7 +136,7 @@ class BrowserStorageService {
135136 }
136137
137138 async get(key) {
138− return resolve(JSON.parse(this.storage.getItem(key)));
139+ return JSON.parse(this.storage.getItem(key));
139140 }
140141
141142 async has(key) {
@@ -175,13 +176,6 @@ class BrowserMessagingService {
175176 }
176177}
177178
178−class BrowserMessagingPrivateModeBackgroundService {
179− send(subscriber, arg = {}) {
180− const message = Object.assign({}, { command: subscriber }, arg);
181− window.bitwardenPopupMainMessageListener(message);
182− }
183−}
184−
185179class BrowserPlatformUtilsService {
186180 constructor(messagingService, stateService, clipboardWriteCallback, biometricCallback) {
187181 this.messagingService = messagingService;
@@ -194,31 +188,7 @@ class BrowserPlatformUtilsService {
194188 this.prefersColorSchemeDark = window.matchMedia("(prefers-color-scheme: dark)");
195189 }
196190 getDevice() {
197− if (this.deviceCache) {
198− return this.deviceCache;
199− }
200− if (navigator.userAgent.indexOf(" Firefox/") !== -1 ||
201− navigator.userAgent.indexOf(" Gecko/") !== -1) {
202− this.deviceCache = DeviceType.FirefoxExtension;
203− }
204− else if ((!!window.opr && !!opr.addons) ||
205− !!window.opera ||
206− navigator.userAgent.indexOf(" OPR/") >= 0) {
207− this.deviceCache = DeviceType.OperaExtension;
208− }
209− else if (navigator.userAgent.indexOf(" Edg/") !== -1) {
210− this.deviceCache = DeviceType.EdgeExtension;
211− }
212− else if (navigator.userAgent.indexOf(" Vivaldi/") !== -1) {
213− this.deviceCache = DeviceType.VivaldiExtension;
214− }
215− else if (window.chrome && navigator.userAgent.indexOf(" Chrome/") !== -1) {
216− this.deviceCache = DeviceType.ChromeExtension;
217− }
218− else if (navigator.userAgent.indexOf(" Safari/") !== -1) {
219− this.deviceCache = DeviceType.SafariExtension;
220− }
221− return this.deviceCache;
191+ return 9; // Chrome
222192 }
223193 getDeviceString() {
224194 const device = DeviceType[this.getDevice()].toLowerCase();
@@ -252,33 +222,19 @@ class BrowserPlatformUtilsService {
252222 return false;
253223 }
254224 isViewOpen() {
255− return __awaiter(this, void 0, void 0, function* () {
256− if (yield BrowserApi.isPopupOpen()) {
257− return true;
258− }
259− if (this.isSafari()) {
260− return false;
261− }
262− const sidebarView = this.sidebarViewName();
263− const sidebarOpen = sidebarView != null && chrome.extension.getViews({ type: sidebarView }).length > 0;
264− if (sidebarOpen) {
265− return true;
266− }
267− const tabOpen = chrome.extension.getViews({ type: "tab" }).length > 0;
268− return tabOpen;
269− });
225+ return true;
270226 }
271227 lockTimeout() {
272228 return null;
273229 }
274230 launchUri(uri, options) {
275− BrowserApi.createNewTab(uri, options && options.extensionPage === true);
231+ // BrowserApi.createNewTab(uri, options && options.extensionPage === true);
276232 }
277233 saveFile(win, blobData, blobOptions, fileName) {
278− BrowserApi.downloadFile(win, blobData, blobOptions, fileName);
234+ // BrowserApi.downloadFile(win, blobData, blobOptions, fileName);
279235 }
280236 getApplicationVersion() {
281− return Promise.resolve(BrowserApi.getApplicationVersion());
237+ // return Promise.resolve(BrowserApi.getApplicationVersion());
282238 }
283239 supportsWebAuthn(win) {
284240 return typeof PublicKeyCredential !== "undefined";
@@ -452,16 +408,7 @@ class BrowserPlatformUtilsService {
452408 });
453409 }
454410 supportsBiometric() {
455− return __awaiter(this, void 0, void 0, function* () {
456− const platformInfo = yield BrowserApi.getPlatformInfo();
457− if (platformInfo.os === "android") {
458− return false;
459− }
460− if (this.isFirefox()) {
461− return parseInt((yield browser.runtime.getBrowserInfo()).version.split(".")[0], 10) >= 87;
462− }
463− return true;
464− });
411+ return false;
465412 }
466413 authenticateBiometric() {
467414 return this.biometricCallback();