2018-07-21 11:27:00 -04:00
|
|
|
--- a/src/app/services/services.module.ts
|
|
|
|
+++ b/src/app/services/services.module.ts
|
2018-08-27 21:21:22 -04:00
|
|
|
@@ -120,20 +120,17 @@ const notificationsService = new NotificationsService(userService, syncService,
|
|
|
|
const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
|
2018-08-14 16:48:56 -04:00
|
|
|
const auditService = new AuditService(cryptoFunctionService, apiService);
|
|
|
|
|
|
|
|
-const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(),
|
|
|
|
+const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true,
|
|
|
|
platformUtilsService, storageService, appIdService);
|
|
|
|
containerService.attachToWindow(window);
|
|
|
|
|
2018-07-21 11:27:00 -04:00
|
|
|
export function initFactory(): Function {
|
|
|
|
return async () => {
|
2018-08-09 08:38:40 -04:00
|
|
|
await (storageService as HtmlStorageService).init();
|
2018-07-21 11:27:00 -04:00
|
|
|
- const isDev = platformUtilsService.isDev();
|
|
|
|
- if (!isDev && platformUtilsService.isSelfHost()) {
|
|
|
|
- environmentService.baseUrl = window.location.origin;
|
2018-08-27 21:21:22 -04:00
|
|
|
- } else {
|
|
|
|
- environmentService.notificationsUrl = isDev ? 'http://localhost:61840' :
|
|
|
|
- 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications';
|
2018-07-21 11:27:00 -04:00
|
|
|
- }
|
|
|
|
+ const isDev = false;
|
|
|
|
+ environmentService.baseUrl = window.location.origin;
|
2018-08-27 21:21:22 -04:00
|
|
|
+ environmentService.notificationsUrl = window.location.origin + '/notifications';
|
|
|
|
+
|
2018-07-21 11:27:00 -04:00
|
|
|
await apiService.setUrls({
|
|
|
|
base: isDev ? null : window.location.origin,
|
|
|
|
api: isDev ? 'http://localhost:4000' : null,
|