mirror of
https://github.com/dani-garcia/bw_web_builds.git
synced 2024-12-26 12:28:15 +03:00
0277844cf9
Some misc changes. - Moved old patch files to a `legacy` sub-folder - If a legacy patch is used, show a warning and pause for 10 seconds - Updated the checkout and Dockerfile so both use the same way of cloning the Bitwarden/client repo - Updated the `patch_web_vault.sh` script to try and detect the vault version - Added two new make commands to prepare and release a new version - Added a `.env` feature for the `Makefile` to set some defaults Mainly used for using either `docker` or `podman` and for the GitHub Release script to have a predefined GPG user/key
27 lines
1.5 KiB
Diff
27 lines
1.5 KiB
Diff
--- a/src/app/services/services.module.ts
|
|
+++ b/src/app/services/services.module.ts
|
|
@@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService,
|
|
const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
|
|
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);
|
|
|
|
export function initFactory(): Function {
|
|
return async () => {
|
|
await (storageService as HtmlStorageService).init();
|
|
- const isDev = platformUtilsService.isDev();
|
|
- if (!isDev && platformUtilsService.isSelfHost()) {
|
|
- environmentService.baseUrl = window.location.origin;
|
|
- } else {
|
|
- environmentService.notificationsUrl = isDev ? 'http://localhost:61840' :
|
|
- 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications';
|
|
- }
|
|
+ const isDev = false;
|
|
+ environmentService.baseUrl = window.location.origin;
|
|
+ environmentService.notificationsUrl = window.location.origin + '/notifications';
|
|
apiService.setUrls({
|
|
base: isDev ? null : window.location.origin,
|
|
api: isDev ? 'http://localhost:4000' : null,
|