├── .build_env.template ├── .dockerignore ├── .env.template ├── .github ├── CODEOWNERS └── workflows │ ├── ci.yml │ └── release.yml ├── .gitignore ├── .hadolint.yaml ├── Dockerfile ├── LICENSE.txt ├── Makefile ├── README.md ├── package_web_vault.sh ├── patches ├── legacy │ ├── v2.10.0.patch │ ├── v2.11.0.patch │ ├── v2.12.0.patch │ ├── v2.14.0.patch │ ├── v2.15.1.patch │ ├── v2.16.0.patch │ ├── v2.16.1.patch │ ├── v2.17.1.patch │ ├── v2.18.0.patch │ ├── v2.18.1.patch │ ├── v2.19.0.patch │ ├── v2.20.1.patch │ ├── v2.20.3.patch │ ├── v2.20.4.patch │ ├── v2.21.1.patch │ ├── v2.22.3.patch │ ├── v2.23.0.patch │ ├── v2.24.0.patch │ ├── v2.25.0.patch │ ├── v2.26.1.patch │ ├── v2.27.0.patch │ ├── v2.28.0.patch │ ├── v2.5.0.patch │ ├── v2.8.0.patch │ ├── v2022.05.0.patch │ ├── v2022.10.0.patch │ ├── v2022.10.2a.patch │ ├── v2022.11.1.patch │ ├── v2022.12.0.patch │ ├── v2022.5.2.patch │ ├── v2022.6.0.patch │ ├── v2022.8.0.patch │ ├── v2022.9.0.patch │ ├── v2022.9.2.patch │ ├── v2023.1.0.patch │ ├── v2023.1.1.patch │ ├── v2023.10.0.patch │ ├── v2023.12.0.patch │ ├── v2023.2.0.patch │ ├── v2023.3.0.patch │ ├── v2023.4.0.patch │ ├── v2023.5.0.patch │ ├── v2023.5.1.patch │ ├── v2023.7.1.patch │ ├── v2023.8.2.patch │ └── v2023.9.1.patch ├── v2024.1.0.patch ├── v2024.1.2.patch ├── v2024.10.5.patch ├── v2024.11.2.patch ├── v2024.12.0.patch ├── v2024.2.4.patch ├── v2024.3.0.patch ├── v2024.3.1.patch ├── v2024.4.1.patch ├── v2024.4.2.patch ├── v2024.5.0.patch ├── v2024.6.2.patch ├── v2025.1.0.patch ├── v2025.1.1.patch ├── v2025.1.2.patch ├── v2025.2.1.patch ├── v2025.2.2.patch ├── v2025.3.1.patch ├── v2025.4.0.patch └── v2025.4.1.patch ├── resources ├── src │ ├── favicon.ico │ └── images │ │ ├── icon-dark.png │ │ ├── icon-white.png │ │ ├── icon-white.svg │ │ ├── icons │ │ ├── android-chrome-192x192.png │ │ ├── android-chrome-512x512.png │ │ ├── apple-touch-icon.png │ │ ├── favicon-16x16.png │ │ ├── favicon-32x32.png │ │ ├── mstile-150x150.png │ │ └── safari-pinned-tab.svg │ │ ├── logo-dark@2x.png │ │ ├── logo-white.svg │ │ ├── logo-white@2x.png │ │ └── logo.svg ├── vaultwarden-admin-console-logo.svg ├── vaultwarden-icon.svg └── vaultwarden-password-manager-logo.svg └── scripts ├── .script_env ├── build_web_vault.sh ├── checkout_web_vault.sh ├── gh_prepare.sh ├── gh_release.sh ├── package_web_vault.sh └── tar_web_vault.sh /.build_env.template: -------------------------------------------------------------------------------- 1 | # shellcheck disable=SC2034,SC2148 2 | # ### 3 | # Do not use quotes for these variables! 4 | # 5 | # These variables will be loaded during the building process 6 | # This can be useful if you need to provide special variables for NodeJS or other applications 7 | # Make sure you export variables which are used for external scripts, else they will not be seen! 8 | # ### 9 | 10 | # Configure NodeJS Virtual Memory Allocation 11 | # NODE_OPTIONS=--max-old-space-size=4096 12 | # export NODE_OPTIONS 13 | 14 | # vim: syntax=sh filetype=sh 15 | -------------------------------------------------------------------------------- /.dockerignore: -------------------------------------------------------------------------------- 1 | # Local build artifacts 2 | builds 3 | docker_builds 4 | container_builds 5 | web-vault 6 | 7 | # Documentation 8 | *.md 9 | *.txt 10 | 11 | # IDE files 12 | .vscode 13 | .idea 14 | *.iml 15 | 16 | # Environment files 17 | .env 18 | .build_env 19 | 20 | # Other 21 | .github 22 | Makefile 23 | 24 | # Release files 25 | *.tar.gz 26 | *.tar.gz.asc 27 | *.tar.gz.text 28 | sha256sums.txt 29 | -------------------------------------------------------------------------------- /.env.template: -------------------------------------------------------------------------------- 1 | # shellcheck disable=SC2034,SC2148 2 | # ### 3 | # Do not use quotes for these variables! 4 | # ### 5 | 6 | # To use either docker or podman 7 | # The default is docker 8 | # CONTAINER_CMD=docker 9 | 10 | # This is only used for the gh-release command 11 | # Which Key or User to use to signing the web-vault tar.gz file 12 | # GPG_SIGNING_USER=user@domain.tld 13 | # GPG_SIGNING_USER=MY_LONG_UNIQUE_GPG_KEY_IDENTIFIER 14 | 15 | # vim: syntax=sh filetype=sh 16 | -------------------------------------------------------------------------------- /.github/CODEOWNERS: -------------------------------------------------------------------------------- 1 | /.github @dani-garcia @BlackDex 2 | /.github/CODEOWNERS @dani-garcia @BlackDex 3 | /.github/workflows/** @dani-garcia @BlackDex 4 | -------------------------------------------------------------------------------- /.github/workflows/ci.yml: -------------------------------------------------------------------------------- 1 | name: CI 2 | 3 | on: 4 | pull_request: 5 | paths: 6 | - ".github/workflows/ci.yml" 7 | - "patches/v20*.patch" 8 | - "resources/**" 9 | - "scripts/**" 10 | - "Dockerfile" 11 | 12 | jobs: 13 | docker-build: 14 | runs-on: ubuntu-latest 15 | env: 16 | # Force docker to output the progress in plain 17 | BUILDKIT_PROGRESS: plain 18 | steps: 19 | - name: Checkout 20 | uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 21 | 22 | - name: Build and Extract 23 | shell: bash 24 | run: | 25 | make docker-extract 26 | 27 | - name: Generate checksum 28 | shell: bash 29 | run: | 30 | echo "sha256sum: $(sha256sum container_builds/bw_web_vault.tar.gz)" 31 | 32 | - name: "Upload web-vault artifact" 33 | uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 34 | with: 35 | name: web-vault 36 | compression-level: 0 37 | path: container_builds/bw_web_vault.tar.gz 38 | -------------------------------------------------------------------------------- /.github/workflows/release.yml: -------------------------------------------------------------------------------- 1 | name: Release 2 | 3 | on: 4 | push: 5 | tags: 6 | - 'v[0-9]+.[0-9]+.[0-9]+[a-z]?' 7 | 8 | jobs: 9 | docker-build: 10 | runs-on: ubuntu-latest 11 | env: 12 | # Force docker to output the progress in plain 13 | BUILDKIT_PROGRESS: plain 14 | # vars.DOCKERHUB_REPO needs to be '/', for example 'vaultwarden/web-vault' 15 | # Check for Docker hub credentials in secrets 16 | HAVE_DOCKERHUB_LOGIN: ${{ vars.DOCKERHUB_REPO != '' && secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }} 17 | # vars.GHCR_REPO needs to be 'ghcr.io//' 18 | # Check for Github credentials in secrets 19 | HAVE_GHCR_LOGIN: ${{ vars.GHCR_REPO != '' && github.repository_owner != '' && secrets.GITHUB_TOKEN != '' }} 20 | steps: 21 | - name: Checkout 22 | uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 23 | 24 | # Determine Docker Tag 25 | - name: Init Variables 26 | id: vars 27 | shell: bash 28 | run: | 29 | if [[ "${{ github.ref }}" == refs/tags/* ]]; then 30 | echo "DOCKER_TAG=${GITHUB_REF#refs/*/}" | tee -a "${GITHUB_OUTPUT}" 31 | elif [[ "${{ github.ref }}" == refs/heads/* ]]; then 32 | echo "DOCKER_TAG=testing" | tee -a "${GITHUB_OUTPUT}" 33 | fi 34 | 35 | # Login to Docker Hub 36 | - name: Login to Docker Hub 37 | uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 38 | with: 39 | username: ${{ secrets.DOCKERHUB_USERNAME }} 40 | password: ${{ secrets.DOCKERHUB_TOKEN }} 41 | if: ${{ env.HAVE_DOCKERHUB_LOGIN == 'true' }} 42 | 43 | - name: Tags for DockerHub 44 | if: ${{ env.HAVE_DOCKERHUB_LOGIN == 'true' }} 45 | shell: bash 46 | run: | 47 | echo "tags=${tags:+${tags},}${{ vars.DOCKERHUB_REPO }}:${{ steps.vars.outputs.DOCKER_TAG }}" \ 48 | | tee -a "${GITHUB_ENV}" 49 | 50 | # Login to GitHub Container Registry 51 | - name: Login to GitHub Container Registry 52 | uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 53 | with: 54 | registry: ghcr.io 55 | username: ${{ github.repository_owner }} 56 | password: ${{ secrets.GITHUB_TOKEN }} 57 | if: ${{ env.HAVE_GHCR_LOGIN == 'true' }} 58 | 59 | - name: Tags for ghcr.io 60 | if: ${{ env.HAVE_GHCR_LOGIN == 'true' }} 61 | shell: bash 62 | run: | 63 | echo "tags=${tags:+${tags},}${{ vars.GHCR_REPO }}:${{ steps.vars.outputs.DOCKER_TAG }}" \ 64 | | tee -a "${GITHUB_ENV}" 65 | 66 | - name: Build and push 67 | uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0 68 | with: 69 | context: . 70 | push: true 71 | tags: ${{ env.tags }} 72 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | # Local build artifacts 2 | builds 3 | docker_builds 4 | container_builds 5 | web-vault 6 | 7 | # IDE files 8 | .vscode 9 | .idea 10 | *.iml 11 | 12 | # Environment files 13 | .env 14 | .build_env 15 | 16 | # Release files 17 | *.tar.gz 18 | *.tar.gz.asc 19 | *.tar.gz.text 20 | sha256sums.txt 21 | -------------------------------------------------------------------------------- /.hadolint.yaml: -------------------------------------------------------------------------------- 1 | ignored: 2 | # Disable Multiple consecutive `RUN` instructions check. 3 | - DL3059 4 | # Disable pipefail check 5 | - DL4006 6 | # Disable Shellcheck Quote check 7 | - SC2046 8 | trustedRegistries: 9 | - docker.io 10 | -------------------------------------------------------------------------------- /Dockerfile: -------------------------------------------------------------------------------- 1 | # syntax=docker/dockerfile:1 2 | 3 | # Compile the web vault using docker 4 | # Usage: 5 | # Quick and easy: 6 | # `make container-extract` 7 | # or, if you just want to build 8 | # `make container` 9 | # The default is to use `docker` you can also configure `podman` via a `.env` file 10 | # See the `.env.template` file for more details 11 | # 12 | # docker build -t web_vault_build . 13 | # docker create --name bw_web_vault_extract web_vault_build 14 | # docker cp bw_web_vault_extract:/bw_web_vault.tar.gz . 15 | # docker rm bw_web_vault_extract 16 | # 17 | # Note: you can use --build-arg to specify the version to build: 18 | # docker build -t web_vault_build --build-arg VAULT_VERSION=main . 19 | 20 | FROM node:20-bookworm AS build 21 | RUN node --version && npm --version 22 | 23 | # Can be a tag, release, but prefer a commit hash because it's not changeable 24 | # https://github.com/bitwarden/clients/commit/${VAULT_VERSION} 25 | # 26 | # Using https://github.com/vaultwarden/vw_web_builds/tree/v2025.5.1 27 | ARG VAULT_VERSION=c51d0e09303a86aeda91d9877df4b025edb9a060 28 | ENV VAULT_VERSION=$VAULT_VERSION 29 | ENV VAULT_FOLDER=bw_clients 30 | ENV CHECKOUT_TAGS=false 31 | 32 | RUN mkdir /bw_web_builds 33 | WORKDIR /bw_web_builds 34 | 35 | COPY scripts ./scripts 36 | # Use a glob pattern here so builds will continue even if the `.build_env` does not exists 37 | COPY .build_env* ./ 38 | 39 | RUN ./scripts/checkout_web_vault.sh 40 | RUN ./scripts/build_web_vault.sh 41 | RUN mv "${VAULT_FOLDER}/apps/web/build" ./web-vault 42 | 43 | RUN tar -czvf "bw_web_vault.tar.gz" web-vault --owner=0 --group=0 44 | # Output the sha256sum here so people are able to match the sha256sum from the CI with the assets and the downloaded version if needed 45 | RUN echo "sha256sum: $(sha256sum bw_web_vault.tar.gz)" 46 | 47 | # We copy the final result as a separate empty image so there's no need to download all the intermediate steps 48 | # The result is included both uncompressed and as a tar.gz, to be able to use it in the docker images and the github releases directly 49 | FROM scratch 50 | # hadolint ignore=DL3010 51 | COPY --from=build /bw_web_builds/bw_web_vault.tar.gz /bw_web_vault.tar.gz 52 | COPY --from=build /bw_web_builds/web-vault /web-vault 53 | 54 | # Added so docker create works, can't actually run a scratch image 55 | CMD [""] 56 | -------------------------------------------------------------------------------- /Makefile: -------------------------------------------------------------------------------- 1 | SHELL := bash 2 | .ONESHELL: 3 | .SHELLFLAGS := -eu -o pipefail -c 4 | .DELETE_ON_ERROR: 5 | 6 | help: 7 | @echo "Use either: clean, checkout, build, tar, or full" 8 | @echo "Or for container builds use: container or container-extract" 9 | @echo 10 | @echo "By default docker is used, you can force podman by using podman or podman-extract" 11 | @echo "You can also define the default via a '.env' file, see the '.env.template' for details" 12 | @echo 13 | @echo "For releasing a new version you can use gh-prepare and gh-release" 14 | @echo 15 | .PHONY: help 16 | 17 | # Load .env variables if the file exists 18 | ifneq (,$(wildcard ./.env)) 19 | include .env 20 | export 21 | endif 22 | 23 | # Force docker to output the progress in plain 24 | BUILDKIT_PROGRESS=plain 25 | 26 | ifndef CONTAINER_CMD 27 | CONTAINER_CMD = docker 28 | endif 29 | 30 | clean: 31 | rm -rvf ./web-vault 32 | rm -rvf ./builds 33 | rm -rvf ./docker_builds 34 | rm -rvf ./container_builds 35 | rm -vf ./bw_web_v*.tar.gz* 36 | rm -vf sha256sums.txt 37 | .PHONY: clean 38 | 39 | checkout: 40 | ./scripts/checkout_web_vault.sh 41 | .PHONY: checkout 42 | 43 | build: 44 | ./scripts/build_web_vault.sh 45 | .PHONY: build 46 | 47 | tar: 48 | ./scripts/tar_web_vault.sh 49 | .PHONY: tar 50 | 51 | full: checkout build tar 52 | .PHONY: full 53 | 54 | container: 55 | ${CONTAINER_CMD} build -t bw_web_vault . 56 | .PHONY: container 57 | 58 | container-extract: container 59 | @${CONTAINER_CMD} rm bw_web_vault_extract 2>/dev/null || true 60 | @${CONTAINER_CMD} create --name bw_web_vault_extract bw_web_vault 61 | @mkdir -vp container_builds 62 | @rm -rf ./container_builds/bw_web_vault.tar.gz ./container_builds/web-vault 63 | @${CONTAINER_CMD} cp bw_web_vault_extract:/bw_web_vault.tar.gz ./container_builds/bw_web_vault.tar.gz 64 | @${CONTAINER_CMD} cp bw_web_vault_extract:/web-vault ./container_builds/web-vault 65 | @${CONTAINER_CMD} rm bw_web_vault_extract || true 66 | .PHONY: container-extract 67 | 68 | # Alias for container forcing docker 69 | docker: CONTAINER_CMD := docker 70 | docker: container 71 | .PHONY: docker 72 | 73 | # Alias for container forcing docker 74 | docker-extract: CONTAINER_CMD := docker 75 | docker-extract: container-extract 76 | .PHONY: docker-extract 77 | 78 | # Alias for container forcing podman 79 | podman: CONTAINER_CMD := podman 80 | podman: container 81 | .PHONY: podman 82 | 83 | # Alias for container forcing podman 84 | podman-extract: CONTAINER_CMD := podman 85 | podman-extract: container-extract 86 | .PHONY: podman-extract 87 | 88 | # This part is used for extracing and release a new version on Github 89 | gh-prepare: 90 | ./scripts/gh_prepare.sh 91 | .PHONY: gh-prepare 92 | 93 | gh-release: 94 | ./scripts/gh_release.sh 95 | .PHONY: gh-release 96 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # Web Vault builds for Vaultwarden 2 | 3 | ![Vaultwarden Logo](https://raw.githubusercontent.com/dani-garcia/vaultwarden/refs/heads/main/resources/vaultwarden-logo-auto.svg) 4 | 5 | Scripts and CI to patch (including branding) and build the [Bitwarden web client](https://github.com/bitwarden/clients/tree/main/apps/web) [[disclaimer](#disclaimer)], to make it compatible with [Vaultwarden](https://github.com/dani-garcia/vaultwarden). 6 | 7 | --- 8 | 9 | [![GitHub Release](https://img.shields.io/github/release/dani-garcia/bw_web_builds.svg?style=for-the-badge&logo=vaultwarden&color=005AA4)](https://github.com/dani-garcia/bw_web_builds/releases/latest) 10 | [![ghcr.io Pulls](https://img.shields.io/badge/dynamic/json?style=for-the-badge&logo=github&logoColor=fff&color=005AA4&url=https%3A%2F%2Fipitio.github.io%2Fbackage%2Fdani-garcia%2Fbw_web_builds%2Fbw_web_builds.json&query=%24.downloads&label=ghcr.io%20pulls&cacheSeconds=14400)](https://github.com/dani-garcia/bw_web_builds/pkgs/container/bw_web_builds) 11 | [![Docker Pulls](https://img.shields.io/docker/pulls/vaultwarden/web-vault.svg?style=for-the-badge&logo=docker&logoColor=fff&color=005AA4&label=docker.io%20pulls)](https://hub.docker.com/r/vaultwarden/web-vault)
12 | [![GHA Release](https://img.shields.io/github/actions/workflow/status/dani-garcia/bw_web_builds/release.yml?style=flat-square&logo=github&logoColor=fff&label=Build%20Workflow)](https://github.com/dani-garcia/bw_web_builds/actions/workflows/release.yml) 13 | [![Contributors](https://img.shields.io/github/contributors-anon/dani-garcia/bw_web_builds.svg?style=flat-square&logo=vaultwarden&color=005AA4)](https://github.com/dani-garcia/bw_web_builds/graphs/contributors) 14 | [![Forks](https://img.shields.io/github/forks/dani-garcia/bw_web_builds.svg?style=flat-square&logo=github&logoColor=fff&color=005AA4)](https://github.com/dani-garcia/bw_web_builds/network/members) 15 | [![Stars](https://img.shields.io/github/stars/dani-garcia/bw_web_builds.svg?style=flat-square&logo=github&logoColor=fff&color=005AA4)](https://github.com/dani-garcia/bw_web_builds/stargazers) 16 | [![Issues Open](https://img.shields.io/github/issues/dani-garcia/bw_web_builds.svg?style=flat-square&logo=github&logoColor=fff&color=005AA4&cacheSeconds=300)](https://github.com/dani-garcia/bw_web_builds/issues) 17 | [![Issues Closed](https://img.shields.io/github/issues-closed/dani-garcia/bw_web_builds.svg?style=flat-square&logo=github&logoColor=fff&color=005AA4&cacheSeconds=300)](https://github.com/dani-garcia/bw_web_builds/issues?q=is%3Aissue+is%3Aclosed)
18 | [![Matrix Chat](https://img.shields.io/matrix/vaultwarden:matrix.org.svg?style=flat-square&logo=matrix&logoColor=fff&color=953B00&cacheSeconds=14400)](https://matrix.to/#/#vaultwarden:matrix.org) 19 | [![GitHub Discussions](https://img.shields.io/github/discussions/dani-garcia/vaultwarden?style=flat-square&logo=github&logoColor=fff&color=953B00&cacheSeconds=300)](https://github.com/dani-garcia/vaultwarden/discussions) 20 | [![Discourse Discussions](https://img.shields.io/discourse/topics?server=https%3A%2F%2Fvaultwarden.discourse.group%2F&style=flat-square&logo=discourse&color=953B00)](https://vaultwarden.discourse.group/) 21 | [![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/bw_web_builds.svg?style=flat-square&logo=vaultwarden&color=944000&cacheSeconds=14400)](https://github.com/dani-garcia/bw_web_builds/blob/main/LICENSE.txt) 22 | 23 | 24 | > [!IMPORTANT] 25 | > **When using this web-vault, please report any bugs or suggestions directly to us (see [Get in touch](#get-in-touch)), regardless of whatever other clients you are using (mobile, desktop, browser...). DO NOT use the official Bitwarden support channels.** 26 | 27 | --- 28 | 29 | ## Building the web-vault 30 | 31 | To build the web-vault you need either node and npm installed or use Docker. 32 | 33 | ### Using node and npm 34 | 35 | For a quick and easy local build you could run: 36 | ```bash 37 | make full 38 | ``` 39 | 40 | That will generate a `tar.gz` file within the `builds` directory which you can extract and use with the `WEB_VAULT_FOLDER` environment variable. 41 | 42 | ### Using a container 43 | 44 | Or via the usage of building via a container: 45 | ```bash 46 | make container-extract 47 | ``` 48 | 49 | That will extract the `tar.gz` and files generated via Docker into the `container_builds` directory. 50 | 51 | #### Which container command to use, docker or podman 52 | 53 | The default is to use `docker`, but `podman` works too. 54 | 55 | You can force them by replacing `container` with either `docker` or `podman`, like: 56 | ```bash 57 | make docker-extract 58 | # Or 59 | make podman-extract 60 | ``` 61 | 62 | You can configure the default via a `.env` file. See the `.env.template`.
63 | Or you can set it as a make argument with the make command: 64 | ```bash 65 | make CONTAINER_CMD=podman container-extract 66 | ``` 67 | 68 | ### More information 69 | 70 | For more information see: [Install the web-vault](https://github.com/dani-garcia/vaultwarden/wiki/Building-binary#install-the-web-vault) 71 | 72 | 73 | ### Pre-build 74 | 75 | The builds are available in the [releases page](https://github.com/dani-garcia/bw_web_builds/releases), and can be replicated with the scripts in this repo. 76 | 77 |
78 | 79 | ## Get in touch 80 | 81 | Have a question, suggestion or need help? Join our community on [Matrix](https://matrix.to/#/#vaultwarden:matrix.org), [GitHub Discussions](https://github.com/dani-garcia/vaultwarden/discussions) or [Discourse Forums](https://vaultwarden.discourse.group/). 82 | 83 | Encountered a bug or crash? Please search our issue tracker and discussions to see if it's already been reported. If not, please [start a new discussion](https://github.com/dani-garcia/vaultwarden/discussions) or [create a new issue](https://github.com/dani-garcia/vaultwarden/issues/). Ensure you're using the latest version of Vaultwarden and there aren't any similar issues open or closed! 84 | 85 |
86 | 87 | ## Disclaimer 88 | 89 | **This project is not associated with [Bitwarden](https://bitwarden.com/) or Bitwarden, Inc.** 90 | 91 | However, one of the active maintainers for Vaultwarden is employed by Bitwarden and is allowed to contribute to the project on their own time. These contributions are independent of Bitwarden and are reviewed by other maintainers. 92 | 93 | The maintainers work together to set the direction for the project, focusing on serving the self-hosting community, including individuals, families, and small organizations, while ensuring the project's sustainability. 94 | 95 | **Please note:** We cannot be held liable for any data loss that may occur while using Vaultwarden. This includes passwords, attachments, and other information handled by the application. We highly recommend performing regular backups of your files and database. However, should you experience data loss, we encourage you to contact us immediately. 96 | -------------------------------------------------------------------------------- /package_web_vault.sh: -------------------------------------------------------------------------------- 1 | scripts/package_web_vault.sh -------------------------------------------------------------------------------- /patches/legacy/v2.10.0.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 2 | index 9c152ae1..218e9243 100644 3 | --- a/src/app/services/services.module.ts 4 | +++ b/src/app/services/services.module.ts 5 | @@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService, 6 | const environmentService = new EnvironmentService(apiService, storageService, notificationsService); 7 | const auditService = new AuditService(cryptoFunctionService, apiService); 8 | 9 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 10 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 11 | platformUtilsService, storageService, appIdService); 12 | containerService.attachToWindow(window); 13 | 14 | export function initFactory(): Function { 15 | return async () => { 16 | await (storageService as HtmlStorageService).init(); 17 | - const isDev = platformUtilsService.isDev(); 18 | - if (!isDev && platformUtilsService.isSelfHost()) { 19 | - environmentService.baseUrl = window.location.origin; 20 | - } else { 21 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 22 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 23 | - } 24 | + const isDev = false; 25 | + environmentService.baseUrl = window.location.origin; 26 | + environmentService.notificationsUrl = window.location.origin + '/notifications'; 27 | apiService.setUrls({ 28 | base: isDev ? null : window.location.origin, 29 | api: isDev ? 'http://localhost:4000' : null, 30 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 31 | index 5560c476..a9b954a8 100644 32 | --- a/src/app/settings/two-factor-u2f.component.ts 33 | +++ b/src/app/settings/two-factor-u2f.component.ts 34 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 35 | (window as any).u2f.register(u2fChallenge.appId, [{ 36 | version: u2fChallenge.version, 37 | challenge: u2fChallenge.challenge, 38 | + attestation: 'direct', 39 | }], [], (data: any) => { 40 | this.ngZone.run(() => { 41 | this.u2fListening = false; 42 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 43 | index 2e1dbec9..2d9b635f 100644 44 | --- a/src/scss/styles.scss 45 | +++ b/src/scss/styles.scss 46 | @@ -1,5 +1,34 @@ 47 | @import "../css/webfonts.css"; 48 | 49 | +/**** START Bitwarden_RS CHANGES ****/ 50 | +/* This combines all selectors extending it into one */ 51 | +%bwrs-hide { display: none !important; } 52 | + 53 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 54 | +#bwrs-hide, head { @extend %bwrs-hide; } 55 | + 56 | +/* Hide any link pointing to billing */ 57 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 58 | + 59 | +/* Hide any link pointing to subscriptions */ 60 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 61 | + 62 | +/* Hide Two-Factor menu in Organization settings */ 63 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 64 | + 65 | +/* Hide 2FA Email button */ 66 | +ul.list-group.list-group-2fa > li:nth-child(5) button { @extend %bwrs-hide; } 67 | + 68 | +/* Hide organization plans */ 69 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 70 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 71 | + 72 | +/* Hide Tax Info in Organization settings */ 73 | +app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } 74 | +app-org-account > p { @extend %bwrs-hide; } 75 | +app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } 76 | +/**** END Bitwarden_RS CHANGES ****/ 77 | + 78 | $primary: #3c8dbc; 79 | $primary-accent: #286090; 80 | $secondary: #ced4da; 81 | diff --git a/webpack.config.js b/webpack.config.js 82 | index aecb1860..44acdc1d 100644 83 | --- a/webpack.config.js 84 | +++ b/webpack.config.js 85 | @@ -170,6 +170,7 @@ const config = { 86 | }, 87 | minimizer: [ 88 | new TerserPlugin({ 89 | + sourceMap: true, 90 | terserOptions: { 91 | safari10: true, 92 | }, 93 | -------------------------------------------------------------------------------- /patches/legacy/v2.11.0.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 2 | index a92bf70c..cf5a4cb4 100644 3 | --- a/src/app/services/services.module.ts 4 | +++ b/src/app/services/services.module.ts 5 | @@ -123,20 +123,16 @@ const environmentService = new EnvironmentService(apiService, storageService, no 6 | const auditService = new AuditService(cryptoFunctionService, apiService); 7 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 8 | 9 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 10 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 11 | platformUtilsService, storageService, appIdService); 12 | containerService.attachToWindow(window); 13 | 14 | export function initFactory(): Function { 15 | return async () => { 16 | await (storageService as HtmlStorageService).init(); 17 | - const isDev = platformUtilsService.isDev(); 18 | - if (!isDev && platformUtilsService.isSelfHost()) { 19 | - environmentService.baseUrl = window.location.origin; 20 | - } else { 21 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 22 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 23 | - } 24 | + const isDev = false; 25 | + environmentService.baseUrl = window.location.origin; 26 | + environmentService.notificationsUrl = window.location.origin + '/notifications'; 27 | apiService.setUrls({ 28 | base: isDev ? null : window.location.origin, 29 | api: isDev ? 'http://localhost:4000' : null, 30 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 31 | index 5560c476..a9b954a8 100644 32 | --- a/src/app/settings/two-factor-u2f.component.ts 33 | +++ b/src/app/settings/two-factor-u2f.component.ts 34 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 35 | (window as any).u2f.register(u2fChallenge.appId, [{ 36 | version: u2fChallenge.version, 37 | challenge: u2fChallenge.challenge, 38 | + attestation: 'direct', 39 | }], [], (data: any) => { 40 | this.ngZone.run(() => { 41 | this.u2fListening = false; 42 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 43 | index 2e1dbec9..2d9b635f 100644 44 | --- a/src/scss/styles.scss 45 | +++ b/src/scss/styles.scss 46 | @@ -1,5 +1,31 @@ 47 | @import "../css/webfonts.css"; 48 | 49 | +/**** START Bitwarden_RS CHANGES ****/ 50 | +/* This combines all selectors extending it into one */ 51 | +%bwrs-hide { display: none !important; } 52 | + 53 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 54 | +#bwrs-hide, head { @extend %bwrs-hide; } 55 | + 56 | +/* Hide any link pointing to billing */ 57 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 58 | + 59 | +/* Hide any link pointing to subscriptions */ 60 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 61 | + 62 | +/* Hide Two-Factor menu in Organization settings */ 63 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 64 | + 65 | +/* Hide organization plans */ 66 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 67 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 68 | + 69 | +/* Hide Tax Info in Organization settings */ 70 | +app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } 71 | +app-org-account > p { @extend %bwrs-hide; } 72 | +app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } 73 | +/**** END Bitwarden_RS CHANGES ****/ 74 | + 75 | $primary: #3c8dbc; 76 | $primary-accent: #286090; 77 | $secondary: #ced4da; 78 | diff --git a/webpack.config.js b/webpack.config.js 79 | index aecb1860..44acdc1d 100644 80 | --- a/webpack.config.js 81 | +++ b/webpack.config.js 82 | @@ -170,6 +170,7 @@ const config = { 83 | }, 84 | minimizer: [ 85 | new TerserPlugin({ 86 | + sourceMap: true, 87 | terserOptions: { 88 | safari10: true, 89 | }, 90 | -------------------------------------------------------------------------------- /patches/legacy/v2.12.0.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 2 | index 2c694d95..bba34865 100644 3 | --- a/src/app/app.component.ts 4 | +++ b/src/app/app.component.ts 5 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 6 | } 7 | break; 8 | case 'showToast': 9 | + if (typeof message.text === "string" && (message.text.indexOf("this.subtle") != -1 || message.text.indexOf("importKey") != -1)) { 10 | + message.title="This browser requires HTTPS to use the web vault"; 11 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 12 | + } 13 | this.showToast(message); 14 | break; 15 | case 'analyticsEventTrack': 16 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 17 | index c74261dd..f61ccefe 100644 18 | --- a/src/app/services/services.module.ts 19 | +++ b/src/app/services/services.module.ts 20 | @@ -127,22 +127,31 @@ const environmentService = new EnvironmentService(apiService, storageService, no 21 | const auditService = new AuditService(cryptoFunctionService, apiService); 22 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 23 | 24 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 25 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 26 | platformUtilsService, storageService, appIdService); 27 | containerService.attachToWindow(window); 28 | 29 | export function initFactory(): Function { 30 | + function getBaseUrl() { 31 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 32 | + // `window.location.href` should have one of the following forms: 33 | + // 34 | + // - `https://bitwarden.example.com/base/path/` 35 | + // - `https://bitwarden.example.com/base/path/#/some/endpoint[?queryParam=...]` 36 | + // 37 | + // We want to get to just `https://bitwarden.example.com/base/path`. 38 | + let baseUrl = window.location.href; 39 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 40 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 41 | + return baseUrl; 42 | + } 43 | return async () => { 44 | await (storageService as HtmlStorageService).init(); 45 | - const isDev = platformUtilsService.isDev(); 46 | - if (!isDev && platformUtilsService.isSelfHost()) { 47 | - environmentService.baseUrl = window.location.origin; 48 | - } else { 49 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 50 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 51 | - } 52 | + const isDev = false; 53 | + environmentService.baseUrl = getBaseUrl(); 54 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 55 | apiService.setUrls({ 56 | - base: isDev ? null : window.location.origin, 57 | + base: isDev ? null : environmentService.baseUrl, 58 | api: isDev ? 'http://localhost:4000' : null, 59 | identity: isDev ? 'http://localhost:33656' : null, 60 | events: isDev ? 'http://localhost:46273' : null, 61 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 62 | index 5560c476..a9b954a8 100644 63 | --- a/src/app/settings/two-factor-u2f.component.ts 64 | +++ b/src/app/settings/two-factor-u2f.component.ts 65 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 66 | (window as any).u2f.register(u2fChallenge.appId, [{ 67 | version: u2fChallenge.version, 68 | challenge: u2fChallenge.challenge, 69 | + attestation: 'direct', 70 | }], [], (data: any) => { 71 | this.ngZone.run(() => { 72 | this.u2fListening = false; 73 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 74 | index 80951953..5c784175 100644 75 | --- a/src/scss/styles.scss 76 | +++ b/src/scss/styles.scss 77 | @@ -1,5 +1,31 @@ 78 | @import "../css/webfonts.css"; 79 | 80 | +/**** START Bitwarden_RS CHANGES ****/ 81 | +/* This combines all selectors extending it into one */ 82 | +%bwrs-hide { display: none !important; } 83 | + 84 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 85 | +#bwrs-hide, head { @extend %bwrs-hide; } 86 | + 87 | +/* Hide any link pointing to billing */ 88 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 89 | + 90 | +/* Hide any link pointing to subscriptions */ 91 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 92 | + 93 | +/* Hide Two-Factor menu in Organization settings */ 94 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 95 | + 96 | +/* Hide organization plans */ 97 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 98 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 99 | + 100 | +/* Hide Tax Info in Organization settings */ 101 | +app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } 102 | +app-org-account > p { @extend %bwrs-hide; } 103 | +app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } 104 | +/**** END Bitwarden_RS CHANGES ****/ 105 | + 106 | $primary: #3c8dbc; 107 | $primary-accent: #286090; 108 | $secondary: #ced4da; 109 | diff --git a/webpack.config.js b/webpack.config.js 110 | index aecb1860..44acdc1d 100644 111 | --- a/webpack.config.js 112 | +++ b/webpack.config.js 113 | @@ -170,6 +170,7 @@ const config = { 114 | }, 115 | minimizer: [ 116 | new TerserPlugin({ 117 | + sourceMap: true, 118 | terserOptions: { 119 | safari10: true, 120 | }, 121 | -------------------------------------------------------------------------------- /patches/legacy/v2.14.0.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 2 | index 2c694d95..bba34865 100644 3 | --- a/src/app/app.component.ts 4 | +++ b/src/app/app.component.ts 5 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 6 | } 7 | break; 8 | case 'showToast': 9 | + if (typeof message.text === "string" && (message.text.indexOf("this.subtle") != -1 || message.text.indexOf("importKey") != -1)) { 10 | + message.title="This browser requires HTTPS to use the web vault"; 11 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 12 | + } 13 | this.showToast(message); 14 | break; 15 | case 'analyticsEventTrack': 16 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 17 | index c74261dd..f61ccefe 100644 18 | --- a/src/app/services/services.module.ts 19 | +++ b/src/app/services/services.module.ts 20 | @@ -127,22 +127,31 @@ const environmentService = new EnvironmentService(apiService, storageService, no 21 | const auditService = new AuditService(cryptoFunctionService, apiService); 22 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 23 | 24 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 25 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 26 | platformUtilsService, storageService, appIdService); 27 | containerService.attachToWindow(window); 28 | 29 | export function initFactory(): Function { 30 | + function getBaseUrl() { 31 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 32 | + // `window.location.href` should have one of the following forms: 33 | + // 34 | + // - `https://bitwarden.example.com/base/path/` 35 | + // - `https://bitwarden.example.com/base/path/#/some/endpoint[?queryParam=...]` 36 | + // 37 | + // We want to get to just `https://bitwarden.example.com/base/path`. 38 | + let baseUrl = window.location.href; 39 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 40 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 41 | + return baseUrl; 42 | + } 43 | return async () => { 44 | await (storageService as HtmlStorageService).init(); 45 | - const isDev = platformUtilsService.isDev(); 46 | - if (!isDev && platformUtilsService.isSelfHost()) { 47 | - environmentService.baseUrl = window.location.origin; 48 | - } else { 49 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 50 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 51 | - } 52 | + const isDev = false; 53 | + environmentService.baseUrl = getBaseUrl(); 54 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 55 | apiService.setUrls({ 56 | - base: isDev ? null : window.location.origin, 57 | + base: isDev ? null : environmentService.baseUrl, 58 | api: isDev ? 'http://localhost:4000' : null, 59 | identity: isDev ? 'http://localhost:33656' : null, 60 | events: isDev ? 'http://localhost:46273' : null, 61 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 62 | index 5560c476..a9b954a8 100644 63 | --- a/src/app/settings/two-factor-u2f.component.ts 64 | +++ b/src/app/settings/two-factor-u2f.component.ts 65 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 66 | (window as any).u2f.register(u2fChallenge.appId, [{ 67 | version: u2fChallenge.version, 68 | challenge: u2fChallenge.challenge, 69 | + attestation: 'direct', 70 | }], [], (data: any) => { 71 | this.ngZone.run(() => { 72 | this.u2fListening = false; 73 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 74 | index 80951953..5c784175 100644 75 | --- a/src/scss/styles.scss 76 | +++ b/src/scss/styles.scss 77 | @@ -1,5 +1,31 @@ 78 | @import "../css/webfonts.css"; 79 | 80 | +/**** START Bitwarden_RS CHANGES ****/ 81 | +/* This combines all selectors extending it into one */ 82 | +%bwrs-hide { display: none !important; } 83 | + 84 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 85 | +#bwrs-hide, head { @extend %bwrs-hide; } 86 | + 87 | +/* Hide any link pointing to billing */ 88 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 89 | + 90 | +/* Hide any link pointing to subscriptions */ 91 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 92 | + 93 | +/* Hide Two-Factor menu in Organization settings */ 94 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 95 | + 96 | +/* Hide organization plans */ 97 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 98 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 99 | + 100 | +/* Hide Tax Info in Organization settings */ 101 | +app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } 102 | +app-org-account > p { @extend %bwrs-hide; } 103 | +app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } 104 | +/**** END Bitwarden_RS CHANGES ****/ 105 | + 106 | $primary: #175DDC; 107 | $primary-accent: #1252A3; 108 | $secondary: #ced4da; 109 | diff --git a/webpack.config.js b/webpack.config.js 110 | index aecb1860..44acdc1d 100644 111 | --- a/webpack.config.js 112 | +++ b/webpack.config.js 113 | @@ -170,6 +170,7 @@ const config = { 114 | }, 115 | minimizer: [ 116 | new TerserPlugin({ 117 | + sourceMap: true, 118 | terserOptions: { 119 | safari10: true, 120 | }, 121 | -------------------------------------------------------------------------------- /patches/legacy/v2.15.1.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 2 | index 6807ec89..62dbe456 100644 3 | --- a/src/app/app.component.ts 4 | +++ b/src/app/app.component.ts 5 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 6 | } 7 | break; 8 | case 'showToast': 9 | + if (typeof message.text === "string" && (message.text.indexOf("this.subtle") != -1 || message.text.indexOf("importKey") != -1)) { 10 | + message.title="This browser requires HTTPS to use the web vault"; 11 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 12 | + } 13 | this.showToast(message); 14 | break; 15 | case 'analyticsEventTrack': 16 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 17 | index e64240ad..025fdef1 100644 18 | --- a/src/app/services/services.module.ts 19 | +++ b/src/app/services/services.module.ts 20 | @@ -127,24 +127,32 @@ const environmentService = new EnvironmentService(apiService, storageService, no 21 | const auditService = new AuditService(cryptoFunctionService, apiService); 22 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 23 | 24 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 25 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 26 | platformUtilsService, storageService, appIdService); 27 | containerService.attachToWindow(window); 28 | 29 | export function initFactory(): Function { 30 | + function getBaseUrl() { 31 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 32 | + // `window.location.href` should have one of the following forms: 33 | + // 34 | + // - `https://bitwarden.example.com/base/path/` 35 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 36 | + // 37 | + // We want to get to just `https://bitwarden.example.com/base/path`. 38 | + let baseUrl = window.location.href; 39 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 40 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 41 | + return baseUrl; 42 | + } 43 | return async () => { 44 | await (storageService as HtmlStorageService).init(); 45 | - const isDev = platformUtilsService.isDev(); 46 | - if (!isDev && platformUtilsService.isSelfHost()) { 47 | - environmentService.baseUrl = window.location.origin; 48 | - } else { 49 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 50 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 51 | - environmentService.enterpriseUrl = isDev ? 'http://localhost:61840' : 52 | - 'https://enterprise.bitwarden.com'; // window.location.origin + '/enterprise'; 53 | - } 54 | + const isDev = false; 55 | + environmentService.baseUrl = getBaseUrl(); 56 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 57 | + environmentService.enterpriseUrl = environmentService.baseUrl + '/enterprise'; 58 | apiService.setUrls({ 59 | - base: isDev ? null : window.location.origin, 60 | + base: isDev ? null : environmentService.baseUrl, 61 | api: isDev ? 'http://localhost:4000' : null, 62 | identity: isDev ? 'http://localhost:33656' : null, 63 | events: isDev ? 'http://localhost:46273' : null, 64 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 65 | index 5560c476..a9b954a8 100644 66 | --- a/src/app/settings/two-factor-u2f.component.ts 67 | +++ b/src/app/settings/two-factor-u2f.component.ts 68 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 69 | (window as any).u2f.register(u2fChallenge.appId, [{ 70 | version: u2fChallenge.version, 71 | challenge: u2fChallenge.challenge, 72 | + attestation: 'direct', 73 | }], [], (data: any) => { 74 | this.ngZone.run(() => { 75 | this.u2fListening = false; 76 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 77 | index 676e275f..ba9888fc 100644 78 | --- a/src/scss/styles.scss 79 | +++ b/src/scss/styles.scss 80 | @@ -1,5 +1,31 @@ 81 | @import "../css/webfonts.css"; 82 | 83 | +/**** START Bitwarden_RS CHANGES ****/ 84 | +/* This combines all selectors extending it into one */ 85 | +%bwrs-hide { display: none !important; } 86 | + 87 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 88 | +#bwrs-hide, head { @extend %bwrs-hide; } 89 | + 90 | +/* Hide any link pointing to billing */ 91 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 92 | + 93 | +/* Hide any link pointing to subscriptions */ 94 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 95 | + 96 | +/* Hide Two-Factor menu in Organization settings */ 97 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 98 | + 99 | +/* Hide organization plans */ 100 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 101 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 102 | + 103 | +/* Hide Tax Info in Organization settings */ 104 | +app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } 105 | +app-org-account > p { @extend %bwrs-hide; } 106 | +app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } 107 | +/**** END Bitwarden_RS CHANGES ****/ 108 | + 109 | $primary: #175DDC; 110 | $primary-accent: #1252A3; 111 | $secondary: #ced4da; 112 | diff --git a/webpack.config.js b/webpack.config.js 113 | index 3391d5ff..c4e2c0b5 100644 114 | --- a/webpack.config.js 115 | +++ b/webpack.config.js 116 | @@ -170,6 +170,7 @@ const config = { 117 | }, 118 | minimizer: [ 119 | new TerserPlugin({ 120 | + sourceMap: true, 121 | terserOptions: { 122 | safari10: true, 123 | }, 124 | -------------------------------------------------------------------------------- /patches/legacy/v2.16.0.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 2 | index fabd9294..2f0d88ad 100644 3 | --- a/src/app/app.component.ts 4 | +++ b/src/app/app.component.ts 5 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 6 | } 7 | break; 8 | case 'showToast': 9 | + if (typeof message.text === "string" && (message.text.indexOf("this.subtle") != -1 || message.text.indexOf("importKey") != -1)) { 10 | + message.title="This browser requires HTTPS to use the web vault"; 11 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 12 | + } 13 | this.showToast(message); 14 | break; 15 | case 'analyticsEventTrack': 16 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 17 | index dc4290f1..e3f74602 100644 18 | --- a/src/app/services/services.module.ts 19 | +++ b/src/app/services/services.module.ts 20 | @@ -127,24 +127,32 @@ const environmentService = new EnvironmentService(apiService, storageService, no 21 | const auditService = new AuditService(cryptoFunctionService, apiService); 22 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 23 | 24 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 25 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 26 | platformUtilsService, storageService, appIdService); 27 | containerService.attachToWindow(window); 28 | 29 | export function initFactory(): Function { 30 | + function getBaseUrl() { 31 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 32 | + // `window.location.href` should have one of the following forms: 33 | + // 34 | + // - `https://bitwarden.example.com/base/path/` 35 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 36 | + // 37 | + // We want to get to just `https://bitwarden.example.com/base/path`. 38 | + let baseUrl = window.location.href; 39 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 40 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 41 | + return baseUrl; 42 | + } 43 | return async () => { 44 | await (storageService as HtmlStorageService).init(); 45 | - const isDev = platformUtilsService.isDev(); 46 | - if (!isDev && platformUtilsService.isSelfHost()) { 47 | - environmentService.baseUrl = window.location.origin; 48 | - } else { 49 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 50 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 51 | - environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : 52 | - 'https://portal.bitwarden.com'; // window.location.origin + '/portal'; 53 | - } 54 | + const isDev = false; 55 | + environmentService.baseUrl = getBaseUrl(); 56 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 57 | + environmentService.enterpriseUrl = environmentService.baseUrl + '/portal'; 58 | apiService.setUrls({ 59 | - base: isDev ? null : window.location.origin, 60 | + base: isDev ? null : environmentService.baseUrl, 61 | api: isDev ? 'http://localhost:4000' : null, 62 | identity: isDev ? 'http://localhost:33656' : null, 63 | events: isDev ? 'http://localhost:46273' : null, 64 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 65 | index 5560c476..a9b954a8 100644 66 | --- a/src/app/settings/two-factor-u2f.component.ts 67 | +++ b/src/app/settings/two-factor-u2f.component.ts 68 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 69 | (window as any).u2f.register(u2fChallenge.appId, [{ 70 | version: u2fChallenge.version, 71 | challenge: u2fChallenge.challenge, 72 | + attestation: 'direct', 73 | }], [], (data: any) => { 74 | this.ngZone.run(() => { 75 | this.u2fListening = false; 76 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 77 | index 676e275f..ab3304af 100644 78 | --- a/src/scss/styles.scss 79 | +++ b/src/scss/styles.scss 80 | @@ -1,5 +1,34 @@ 81 | @import "../css/webfonts.css"; 82 | 83 | +/**** START Bitwarden_RS CHANGES ****/ 84 | +/* This combines all selectors extending it into one */ 85 | +%bwrs-hide { display: none !important; } 86 | + 87 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 88 | +#bwrs-hide, head { @extend %bwrs-hide; } 89 | + 90 | +/* Hide any link pointing to billing */ 91 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 92 | + 93 | +/* Hide any link pointing to subscriptions */ 94 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 95 | + 96 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 97 | +a[href$="/sso"] { @extend %bwrs-hide; } 98 | + 99 | +/* Hide Two-Factor menu in Organization settings */ 100 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 101 | + 102 | +/* Hide organization plans */ 103 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 104 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 105 | + 106 | +/* Hide Tax Info in Organization settings */ 107 | +app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } 108 | +app-org-account > p { @extend %bwrs-hide; } 109 | +app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } 110 | +/**** END Bitwarden_RS CHANGES ****/ 111 | + 112 | $primary: #175DDC; 113 | $primary-accent: #1252A3; 114 | $secondary: #ced4da; 115 | diff --git a/webpack.config.js b/webpack.config.js 116 | index 5f00785a..a3cd89bd 100644 117 | --- a/webpack.config.js 118 | +++ b/webpack.config.js 119 | @@ -176,6 +176,7 @@ const config = { 120 | }, 121 | minimizer: [ 122 | new TerserPlugin({ 123 | + sourceMap: true, 124 | terserOptions: { 125 | safari10: true, 126 | }, 127 | -------------------------------------------------------------------------------- /patches/legacy/v2.16.1.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 2 | index fabd9294..2f0d88ad 100644 3 | --- a/src/app/app.component.ts 4 | +++ b/src/app/app.component.ts 5 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 6 | } 7 | break; 8 | case 'showToast': 9 | + if (typeof message.text === "string" && (message.text.indexOf("this.subtle") != -1 || message.text.indexOf("importKey") != -1)) { 10 | + message.title="This browser requires HTTPS to use the web vault"; 11 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 12 | + } 13 | this.showToast(message); 14 | break; 15 | case 'analyticsEventTrack': 16 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 17 | index d5892f0f..50547d1b 100644 18 | --- a/src/app/services/services.module.ts 19 | +++ b/src/app/services/services.module.ts 20 | @@ -127,24 +127,32 @@ const environmentService = new EnvironmentService(apiService, storageService, no 21 | const auditService = new AuditService(cryptoFunctionService, apiService); 22 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 23 | 24 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 25 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 26 | platformUtilsService, storageService, appIdService); 27 | containerService.attachToWindow(window); 28 | 29 | export function initFactory(): Function { 30 | + function getBaseUrl() { 31 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 32 | + // `window.location.href` should have one of the following forms: 33 | + // 34 | + // - `https://bitwarden.example.com/base/path/` 35 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 36 | + // 37 | + // We want to get to just `https://bitwarden.example.com/base/path`. 38 | + let baseUrl = window.location.href; 39 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 40 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 41 | + return baseUrl; 42 | + } 43 | return async () => { 44 | await (storageService as HtmlStorageService).init(); 45 | - const isDev = platformUtilsService.isDev(); 46 | - if (!isDev && platformUtilsService.isSelfHost()) { 47 | - environmentService.baseUrl = window.location.origin; 48 | - } else { 49 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 50 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 51 | - environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : 52 | - 'https://portal.bitwarden.com'; // window.location.origin + '/portal'; 53 | - } 54 | + const isDev = false; 55 | + environmentService.baseUrl = getBaseUrl(); 56 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 57 | + environmentService.enterpriseUrl = environmentService.baseUrl + '/portal'; 58 | apiService.setUrls({ 59 | - base: isDev ? null : window.location.origin, 60 | + base: isDev ? null : environmentService.baseUrl, 61 | api: isDev ? 'http://localhost:4000' : null, 62 | identity: isDev ? 'http://localhost:33656' : null, 63 | events: isDev ? 'http://localhost:46273' : null, 64 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 65 | index 5560c476..a9b954a8 100644 66 | --- a/src/app/settings/two-factor-u2f.component.ts 67 | +++ b/src/app/settings/two-factor-u2f.component.ts 68 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 69 | (window as any).u2f.register(u2fChallenge.appId, [{ 70 | version: u2fChallenge.version, 71 | challenge: u2fChallenge.challenge, 72 | + attestation: 'direct', 73 | }], [], (data: any) => { 74 | this.ngZone.run(() => { 75 | this.u2fListening = false; 76 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 77 | index 676e275f..7aec40ad 100644 78 | --- a/src/scss/styles.scss 79 | +++ b/src/scss/styles.scss 80 | @@ -1,5 +1,34 @@ 81 | @import "../css/webfonts.css"; 82 | 83 | +/**** START Bitwarden_RS CHANGES ****/ 84 | +/* This combines all selectors extending it into one */ 85 | +%bwrs-hide { display: none !important; } 86 | + 87 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 88 | +#bwrs-hide, head { @extend %bwrs-hide; } 89 | + 90 | +/* Hide any link pointing to billing */ 91 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 92 | + 93 | +/* Hide any link pointing to subscriptions */ 94 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 95 | + 96 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 97 | +a[href$="/sso"] { @extend %bwrs-hide; } 98 | + 99 | +/* Hide Two-Factor menu in Organization settings */ 100 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 101 | + 102 | +/* Hide organization plans */ 103 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 104 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 105 | + 106 | +/* Hide Tax Info and Form in Organization settings */ 107 | +app-org-account > div.secondary-header:nth-child(3) { @extend %bwrs-hide; } 108 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %bwrs-hide; } 109 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %bwrs-hide; } 110 | +/**** END Bitwarden_RS CHANGES ****/ 111 | + 112 | $primary: #175DDC; 113 | $primary-accent: #1252A3; 114 | $secondary: #ced4da; 115 | diff --git a/webpack.config.js b/webpack.config.js 116 | index 5f00785a..a3cd89bd 100644 117 | --- a/webpack.config.js 118 | +++ b/webpack.config.js 119 | @@ -176,6 +176,7 @@ const config = { 120 | }, 121 | minimizer: [ 122 | new TerserPlugin({ 123 | + sourceMap: true, 124 | terserOptions: { 125 | safari10: true, 126 | }, 127 | -------------------------------------------------------------------------------- /patches/legacy/v2.17.1.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 2 | index 51853633..c9b3d48a 100644 3 | --- a/src/app/app.component.ts 4 | +++ b/src/app/app.component.ts 5 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 6 | } 7 | break; 8 | case 'showToast': 9 | + if (typeof message.text === "string" && (message.text.indexOf("this.subtle") != -1 || message.text.indexOf("importKey") != -1)) { 10 | + message.title="This browser requires HTTPS to use the web vault"; 11 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 12 | + } 13 | this.showToast(message); 14 | break; 15 | case 'analyticsEventTrack': 16 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 17 | index 092af73a..95eb8f49 100644 18 | --- a/src/app/services/services.module.ts 19 | +++ b/src/app/services/services.module.ts 20 | @@ -131,24 +131,32 @@ const environmentService = new EnvironmentService(apiService, storageService, no 21 | const auditService = new AuditService(cryptoFunctionService, apiService); 22 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 23 | 24 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 25 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 26 | platformUtilsService, storageService, appIdService); 27 | containerService.attachToWindow(window); 28 | 29 | export function initFactory(): Function { 30 | + function getBaseUrl() { 31 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 32 | + // `window.location.href` should have one of the following forms: 33 | + // 34 | + // - `https://bitwarden.example.com/base/path/` 35 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 36 | + // 37 | + // We want to get to just `https://bitwarden.example.com/base/path`. 38 | + let baseUrl = window.location.href; 39 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 40 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 41 | + return baseUrl; 42 | + } 43 | return async () => { 44 | await (storageService as HtmlStorageService).init(); 45 | - const isDev = platformUtilsService.isDev(); 46 | - if (!isDev && platformUtilsService.isSelfHost()) { 47 | - environmentService.baseUrl = window.location.origin; 48 | - } else { 49 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 50 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 51 | - environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : 52 | - 'https://portal.bitwarden.com'; // window.location.origin + '/portal'; 53 | - } 54 | + const isDev = false; 55 | + environmentService.baseUrl = getBaseUrl(); 56 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 57 | + environmentService.enterpriseUrl = environmentService.baseUrl + '/portal'; 58 | apiService.setUrls({ 59 | - base: isDev ? null : window.location.origin, 60 | + base: isDev ? null : environmentService.baseUrl, 61 | api: isDev ? 'http://localhost:4000' : null, 62 | identity: isDev ? 'http://localhost:33656' : null, 63 | events: isDev ? 'http://localhost:46273' : null, 64 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 65 | index 5560c476..a9b954a8 100644 66 | --- a/src/app/settings/two-factor-u2f.component.ts 67 | +++ b/src/app/settings/two-factor-u2f.component.ts 68 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 69 | (window as any).u2f.register(u2fChallenge.appId, [{ 70 | version: u2fChallenge.version, 71 | challenge: u2fChallenge.challenge, 72 | + attestation: 'direct', 73 | }], [], (data: any) => { 74 | this.ngZone.run(() => { 75 | this.u2fListening = false; 76 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 77 | index 55b3c92c..91279fef 100644 78 | --- a/src/scss/styles.scss 79 | +++ b/src/scss/styles.scss 80 | @@ -1,5 +1,42 @@ 81 | @import "../css/webfonts.css"; 82 | 83 | +/**** START Bitwarden_RS CHANGES ****/ 84 | +/* This combines all selectors extending it into one */ 85 | +%bwrs-hide { display: none !important; } 86 | + 87 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 88 | +#bwrs-hide, head { @extend %bwrs-hide; } 89 | + 90 | +/* Hide any link pointing to billing */ 91 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 92 | + 93 | +/* Hide any link pointing to subscriptions */ 94 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 95 | + 96 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 97 | +a[href$="/sso"] { @extend %bwrs-hide; } 98 | + 99 | +/* Hide Two-Factor menu in Organization settings */ 100 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 101 | + 102 | +/* Hide organization plans */ 103 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 104 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 105 | + 106 | +/* Hide the `API Key` section under `My Account` */ 107 | +app-account > div:nth-child(9), 108 | +app-account > p, 109 | +app-account > button:nth-child(11), 110 | +app-account > button:nth-child(12) { 111 | + @extend %bwrs-hide; 112 | +} 113 | + 114 | +/* Hide Tax Info and Form in Organization settings */ 115 | +app-org-account > div.secondary-header:nth-child(3) { @extend %bwrs-hide; } 116 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %bwrs-hide; } 117 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %bwrs-hide; } 118 | +/**** END Bitwarden_RS CHANGES ****/ 119 | + 120 | $primary: #175DDC; 121 | $primary-accent: #1252A3; 122 | $secondary: #ced4da; 123 | diff --git a/webpack.config.js b/webpack.config.js 124 | index 6b01c93d..809b396a 100644 125 | --- a/webpack.config.js 126 | +++ b/webpack.config.js 127 | @@ -176,6 +176,7 @@ const config = { 128 | }, 129 | minimizer: [ 130 | new TerserPlugin({ 131 | + sourceMap: true, 132 | terserOptions: { 133 | safari10: true, 134 | }, 135 | -------------------------------------------------------------------------------- /patches/legacy/v2.18.0.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 2 | index 51853633..c9b3d48a 100644 3 | --- a/src/app/app.component.ts 4 | +++ b/src/app/app.component.ts 5 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 6 | } 7 | break; 8 | case 'showToast': 9 | + if (typeof message.text === "string" && (message.text.indexOf("this.subtle") != -1 || message.text.indexOf("importKey") != -1)) { 10 | + message.title="This browser requires HTTPS to use the web vault"; 11 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 12 | + } 13 | this.showToast(message); 14 | break; 15 | case 'analyticsEventTrack': 16 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 17 | index 3e4d8dfa..f5bf60e4 100644 18 | --- a/src/app/services/services.module.ts 19 | +++ b/src/app/services/services.module.ts 20 | @@ -135,24 +135,32 @@ const environmentService = new EnvironmentService(apiService, storageService, no 21 | const auditService = new AuditService(cryptoFunctionService, apiService); 22 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 23 | 24 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 25 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 26 | platformUtilsService, storageService, appIdService); 27 | containerService.attachToWindow(window); 28 | 29 | export function initFactory(): Function { 30 | + function getBaseUrl() { 31 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 32 | + // `window.location.href` should have one of the following forms: 33 | + // 34 | + // - `https://bitwarden.example.com/base/path/` 35 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 36 | + // 37 | + // We want to get to just `https://bitwarden.example.com/base/path`. 38 | + let baseUrl = window.location.href; 39 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 40 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 41 | + return baseUrl; 42 | + } 43 | return async () => { 44 | await (storageService as HtmlStorageService).init(); 45 | - const isDev = platformUtilsService.isDev(); 46 | - if (!isDev && platformUtilsService.isSelfHost()) { 47 | - environmentService.baseUrl = window.location.origin; 48 | - } else { 49 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 50 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 51 | - environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : 52 | - 'https://portal.bitwarden.com'; // window.location.origin + '/portal'; 53 | - } 54 | + const isDev = false; 55 | + environmentService.baseUrl = getBaseUrl(); 56 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 57 | + environmentService.enterpriseUrl = environmentService.baseUrl + '/portal'; 58 | apiService.setUrls({ 59 | - base: isDev ? null : window.location.origin, 60 | + base: isDev ? null : environmentService.baseUrl, 61 | api: isDev ? 'http://localhost:4000' : null, 62 | identity: isDev ? 'http://localhost:33656' : null, 63 | events: isDev ? 'http://localhost:46273' : null, 64 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 65 | index 5560c476..a9b954a8 100644 66 | --- a/src/app/settings/two-factor-u2f.component.ts 67 | +++ b/src/app/settings/two-factor-u2f.component.ts 68 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 69 | (window as any).u2f.register(u2fChallenge.appId, [{ 70 | version: u2fChallenge.version, 71 | challenge: u2fChallenge.challenge, 72 | + attestation: 'direct', 73 | }], [], (data: any) => { 74 | this.ngZone.run(() => { 75 | this.u2fListening = false; 76 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 77 | index 55b3c92c..a716bfd6 100644 78 | --- a/src/scss/styles.scss 79 | +++ b/src/scss/styles.scss 80 | @@ -1,5 +1,50 @@ 81 | @import "../css/webfonts.css"; 82 | 83 | +/**** START Bitwarden_RS CHANGES ****/ 84 | +/* This combines all selectors extending it into one */ 85 | +%bwrs-hide { display: none !important; } 86 | + 87 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 88 | +#bwrs-hide, head { @extend %bwrs-hide; } 89 | + 90 | +/* Hide any link pointing to billing */ 91 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 92 | + 93 | +/* Hide any link pointing to subscriptions */ 94 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 95 | + 96 | +/* Hide any link pointing to emergency access */ 97 | +a[href$="/settings/emergency-access"] { @extend %bwrs-hide; } 98 | + 99 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 100 | +a[href$="/sso"] { @extend %bwrs-hide; } 101 | + 102 | +/* Hide Two-Factor menu in Organization settings */ 103 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 104 | + 105 | +/* Hide organization plans */ 106 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 107 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 108 | + 109 | +/* Hide the `API Key` section under `My Account` */ 110 | +app-account > div:nth-child(9), 111 | +app-account > p, 112 | +app-account > button:nth-child(11), 113 | +app-account > button:nth-child(12) { 114 | + @extend %bwrs-hide; 115 | +} 116 | + 117 | +/* Hide the radio button and label for the `Custom` org user type */ 118 | +#userTypeCustom, label[for^=userTypeCustom] { 119 | + @extend %bwrs-hide; 120 | +} 121 | + 122 | +/* Hide Tax Info and Form in Organization settings */ 123 | +app-org-account > div.secondary-header:nth-child(3) { @extend %bwrs-hide; } 124 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %bwrs-hide; } 125 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %bwrs-hide; } 126 | +/**** END Bitwarden_RS CHANGES ****/ 127 | + 128 | $primary: #175DDC; 129 | $primary-accent: #1252A3; 130 | $secondary: #ced4da; 131 | diff --git a/webpack.config.js b/webpack.config.js 132 | index 6b01c93d..809b396a 100644 133 | --- a/webpack.config.js 134 | +++ b/webpack.config.js 135 | @@ -176,6 +176,7 @@ const config = { 136 | }, 137 | minimizer: [ 138 | new TerserPlugin({ 139 | + sourceMap: true, 140 | terserOptions: { 141 | safari10: true, 142 | }, 143 | -------------------------------------------------------------------------------- /patches/legacy/v2.18.1.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/src/angular/components/register.component.ts b/jslib/src/angular/components/register.component.ts 3 | index 6149f83..005d528 100644 4 | --- a/jslib/src/angular/components/register.component.ts 5 | +++ b/jslib/src/angular/components/register.component.ts 6 | @@ -69,6 +69,12 @@ export class RegisterComponent { 7 | } 8 | 9 | async submit() { 10 | + if (typeof crypto.subtle === 'undefined') { 11 | + this.platformUtilsService.showToast('error', "This browser requires HTTPS to use the web vault", 12 | + "Check the bitwarden_rs wiki for details on how to enable it"); 13 | + return; 14 | + } 15 | + 16 | if (!this.acceptPolicies && this.showTerms) { 17 | this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), 18 | this.i18nService.t('acceptPoliciesError')); 19 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 20 | index 51853633..f589e498 100644 21 | --- a/src/app/app.component.ts 22 | +++ b/src/app/app.component.ts 23 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 24 | } 25 | break; 26 | case 'showToast': 27 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 28 | + message.title="This browser requires HTTPS to use the web vault"; 29 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 30 | + } 31 | this.showToast(message); 32 | break; 33 | case 'analyticsEventTrack': 34 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 35 | index 3e4d8dfa..f5bf60e4 100644 36 | --- a/src/app/services/services.module.ts 37 | +++ b/src/app/services/services.module.ts 38 | @@ -135,24 +135,32 @@ const environmentService = new EnvironmentService(apiService, storageService, no 39 | const auditService = new AuditService(cryptoFunctionService, apiService); 40 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 41 | 42 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 43 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 44 | platformUtilsService, storageService, appIdService); 45 | containerService.attachToWindow(window); 46 | 47 | export function initFactory(): Function { 48 | + function getBaseUrl() { 49 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 50 | + // `window.location.href` should have one of the following forms: 51 | + // 52 | + // - `https://bitwarden.example.com/base/path/` 53 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 54 | + // 55 | + // We want to get to just `https://bitwarden.example.com/base/path`. 56 | + let baseUrl = window.location.href; 57 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 58 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 59 | + return baseUrl; 60 | + } 61 | return async () => { 62 | await (storageService as HtmlStorageService).init(); 63 | - const isDev = platformUtilsService.isDev(); 64 | - if (!isDev && platformUtilsService.isSelfHost()) { 65 | - environmentService.baseUrl = window.location.origin; 66 | - } else { 67 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 68 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 69 | - environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : 70 | - 'https://portal.bitwarden.com'; // window.location.origin + '/portal'; 71 | - } 72 | + const isDev = false; 73 | + environmentService.baseUrl = getBaseUrl(); 74 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 75 | + environmentService.enterpriseUrl = environmentService.baseUrl + '/portal'; 76 | apiService.setUrls({ 77 | - base: isDev ? null : window.location.origin, 78 | + base: isDev ? null : environmentService.baseUrl, 79 | api: isDev ? 'http://localhost:4000' : null, 80 | identity: isDev ? 'http://localhost:33656' : null, 81 | events: isDev ? 'http://localhost:46273' : null, 82 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 83 | index 5560c476..a9b954a8 100644 84 | --- a/src/app/settings/two-factor-u2f.component.ts 85 | +++ b/src/app/settings/two-factor-u2f.component.ts 86 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 87 | (window as any).u2f.register(u2fChallenge.appId, [{ 88 | version: u2fChallenge.version, 89 | challenge: u2fChallenge.challenge, 90 | + attestation: 'direct', 91 | }], [], (data: any) => { 92 | this.ngZone.run(() => { 93 | this.u2fListening = false; 94 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 95 | index 55b3c92c..c48e2baf 100644 96 | --- a/src/scss/styles.scss 97 | +++ b/src/scss/styles.scss 98 | @@ -1,5 +1,56 @@ 99 | @import "../css/webfonts.css"; 100 | 101 | +/**** START Bitwarden_RS CHANGES ****/ 102 | +/* This combines all selectors extending it into one */ 103 | +%bwrs-hide { display: none !important; } 104 | + 105 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 106 | +#bwrs-hide, head { @extend %bwrs-hide; } 107 | + 108 | +/* Hide any link pointing to billing */ 109 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 110 | + 111 | +/* Hide any link pointing to subscriptions */ 112 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 113 | + 114 | +/* Hide any link pointing to emergency access */ 115 | +a[href$="/settings/emergency-access"] { @extend %bwrs-hide; } 116 | + 117 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 118 | +a[href$="/sso"] { @extend %bwrs-hide; } 119 | + 120 | +/* Hide Two-Factor menu in Organization settings */ 121 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 122 | + 123 | +/* Hide organization plans */ 124 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 125 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 126 | + 127 | +/* Hide the `API Key` section under `My Account` */ 128 | +app-account > div:nth-child(9), 129 | +app-account > p, 130 | +app-account > button:nth-child(11), 131 | +app-account > button:nth-child(12) { 132 | + @extend %bwrs-hide; 133 | +} 134 | + 135 | +/* Hide the radio button and label for the `Custom` org user type */ 136 | +#userTypeCustom, label[for^=userTypeCustom] { 137 | + @extend %bwrs-hide; 138 | +} 139 | + 140 | +/* Hide the warning that policy config is moving to Business Portal */ 141 | +app-org-policies > app-callout { @extend %bwrs-hide; } 142 | + 143 | +/* Hide `Single Organization` policy */ 144 | +app-org-policies > table > tbody > tr:nth-child(4) { @extend %bwrs-hide; } 145 | + 146 | +/* Hide Tax Info and Form in Organization settings */ 147 | +app-org-account > div.secondary-header:nth-child(3) { @extend %bwrs-hide; } 148 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %bwrs-hide; } 149 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %bwrs-hide; } 150 | +/**** END Bitwarden_RS CHANGES ****/ 151 | + 152 | $primary: #175DDC; 153 | $primary-accent: #1252A3; 154 | $secondary: #ced4da; 155 | -------------------------------------------------------------------------------- /patches/legacy/v2.19.0.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/src/angular/components/register.component.ts b/jslib/src/angular/components/register.component.ts 3 | index 6149f83..005d528 100644 4 | --- a/jslib/src/angular/components/register.component.ts 5 | +++ b/jslib/src/angular/components/register.component.ts 6 | @@ -69,6 +69,12 @@ export class RegisterComponent { 7 | } 8 | 9 | async submit() { 10 | + if (typeof crypto.subtle === 'undefined') { 11 | + this.platformUtilsService.showToast('error', "This browser requires HTTPS to use the web vault", 12 | + "Check the bitwarden_rs wiki for details on how to enable it"); 13 | + return; 14 | + } 15 | + 16 | if (!this.acceptPolicies && this.showTerms) { 17 | this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), 18 | this.i18nService.t('acceptPoliciesError')); 19 | diff --git a/src/404.html b/src/404.html 20 | index dae3951b..b4b3e39b 100644 21 | --- a/src/404.html 22 | +++ b/src/404.html 23 | @@ -45,10 +45,10 @@ 24 | 25 |

26 |

You can return to the web vault, check our status page 27 | - or contact us.

28 | + or contact us.

29 | 30 |
31 | - © Copyright 2021 Bitwarden, Inc. 32 | + © Copyright 2021 Bitwarden, Inc. (Powered by Vaultwarden) 33 |
34 | 35 | 36 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 37 | index 9c5b6b5d..287338d2 100644 38 | --- a/src/app/app.component.ts 39 | +++ b/src/app/app.component.ts 40 | @@ -140,6 +140,10 @@ export class AppComponent implements OnDestroy, OnInit { 41 | } 42 | break; 43 | case 'showToast': 44 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 45 | + message.title="This browser requires HTTPS to use the web vault"; 46 | + message.text="Check the bitwarden_rs wiki for details on how to enable it"; 47 | + } 48 | this.showToast(message); 49 | break; 50 | case 'analyticsEventTrack': 51 | diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html 52 | index b001b9e3..c1bd2ac8 100644 53 | --- a/src/app/layouts/footer.component.html 54 | +++ b/src/app/layouts/footer.component.html 55 | @@ -1,7 +1,7 @@ 56 |
57 |
58 |
59 | - © {{year}}, Bitwarden Inc. 60 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 61 |
62 |
63 |
64 | diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html 65 | index 4c2c4ca1..dc990b22 100644 66 | --- a/src/app/layouts/frontend-layout.component.html 67 | +++ b/src/app/layouts/frontend-layout.component.html 68 | @@ -1,5 +1,5 @@ 69 | 70 |
71 | - © {{year}}, Bitwarden Inc. 72 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 73 |
{{'versionNumber' | i18n : version}} 74 |
75 | diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html 76 | index b28897c9..524764c6 100644 77 | --- a/src/app/layouts/navbar.component.html 78 | +++ b/src/app/layouts/navbar.component.html 79 | @@ -38,7 +38,7 @@ 80 | 81 | {{'myAccount' | i18n}} 82 | 83 | - 84 | + 85 | 86 | {{'getHelp' | i18n}} 87 | 88 | diff --git a/src/app/organizations/settings/organization-subscription.component.ts b/src/app/organizations/settings/organization-subscription.component.ts 89 | index e5caf468..fd7a4b1f 100644 90 | --- a/src/app/organizations/settings/organization-subscription.component.ts 91 | +++ b/src/app/organizations/settings/organization-subscription.component.ts 92 | @@ -109,7 +109,7 @@ export class OrganizationSubscriptionComponent implements OnInit { 93 | const contactSupport = await this.platformUtilsService.showDialog(this.i18nService.t('changeBillingPlanDesc'), 94 | this.i18nService.t('changeBillingPlan'), this.i18nService.t('contactSupport'), this.i18nService.t('close')); 95 | if (contactSupport) { 96 | - this.platformUtilsService.launchUri('https://bitwarden.com/contact'); 97 | + this.platformUtilsService.launchUri('https://github.com/dani-garcia/vaultwarden'); 98 | } 99 | } 100 | 101 | diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html 102 | index 0f0aa7c3..0a312044 100644 103 | --- a/src/app/send/access.component.html 104 | +++ b/src/app/send/access.component.html 105 | @@ -74,10 +74,7 @@ 106 |
107 |

{{'sendAccessTaglineProductDesc' | i18n}}
108 | {{'sendAccessTaglineLearnMore' | i18n}} Bitwarden Send 110 | - {{'sendAccessTaglineOr' | i18n}} {{'sendAccessTaglineSignUp' | i18n}} 112 | - {{'sendAccessTaglineTryToday' | i18n}} 113 | + href="https://www.bitwarden.com/products/send/" target="_blank">Bitwarden Send. 114 |

115 |
116 |
117 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 118 | index e5c48fe9..17ee65c9 100644 119 | --- a/src/app/services/services.module.ts 120 | +++ b/src/app/services/services.module.ts 121 | @@ -136,25 +136,33 @@ const environmentService = new EnvironmentService(apiService, storageService, no 122 | const auditService = new AuditService(cryptoFunctionService, apiService); 123 | const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); 124 | 125 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 126 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 127 | platformUtilsService, storageService, appIdService); 128 | containerService.attachToWindow(window); 129 | 130 | export function initFactory(): Function { 131 | + function getBaseUrl() { 132 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 133 | + // `window.location.href` should have one of the following forms: 134 | + // 135 | + // - `https://bitwarden.example.com/base/path/` 136 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 137 | + // 138 | + // We want to get to just `https://bitwarden.example.com/base/path`. 139 | + let baseUrl = window.location.href; 140 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 141 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 142 | + return baseUrl; 143 | + } 144 | return async () => { 145 | await (storageService as HtmlStorageService).init(); 146 | - const isDev = platformUtilsService.isDev(); 147 | - if (!isDev && platformUtilsService.isSelfHost()) { 148 | - environmentService.baseUrl = window.location.origin; 149 | - } else { 150 | - environmentService.webVaultUrl = isDev ? 'https://localhost:8080' : null; 151 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 152 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 153 | - environmentService.enterpriseUrl = isDev ? 'http://localhost:52313' : 154 | - 'https://portal.bitwarden.com'; // window.location.origin + '/portal'; 155 | - } 156 | + const isDev = false; 157 | + environmentService.baseUrl = getBaseUrl(); 158 | + environmentService.webVaultUrl = environmentService.baseUrl; 159 | + environmentService.notificationsUrl = environmentService.baseUrl + '/notifications'; 160 | + environmentService.enterpriseUrl = environmentService.baseUrl + '/portal'; 161 | apiService.setUrls({ 162 | - base: isDev ? null : window.location.origin, 163 | + base: isDev ? null : environmentService.baseUrl, 164 | api: isDev ? 'http://localhost:4000' : null, 165 | identity: isDev ? 'http://localhost:33656' : null, 166 | events: isDev ? 'http://localhost:46273' : null, 167 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 168 | index cbcc6f58..9617dc22 100644 169 | --- a/src/app/settings/two-factor-u2f.component.ts 170 | +++ b/src/app/settings/two-factor-u2f.component.ts 171 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 172 | (window as any).u2f.register(u2fChallenge.appId, [{ 173 | version: u2fChallenge.version, 174 | challenge: u2fChallenge.challenge, 175 | + attestation: 'direct', 176 | }], [], (data: any) => { 177 | this.ngZone.run(() => { 178 | this.u2fListening = false; 179 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 180 | index be32ef9e..1408ae03 100644 181 | --- a/src/scss/styles.scss 182 | +++ b/src/scss/styles.scss 183 | @@ -1,5 +1,59 @@ 184 | @import "../css/webfonts.css"; 185 | 186 | +/**** START Bitwarden_RS CHANGES ****/ 187 | +/* This combines all selectors extending it into one */ 188 | +%bwrs-hide { display: none !important; } 189 | + 190 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 191 | +#bwrs-hide, head { @extend %bwrs-hide; } 192 | + 193 | +/* Hide any link pointing to billing */ 194 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 195 | + 196 | +/* Hide any link pointing to subscriptions */ 197 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 198 | + 199 | +/* Hide any link pointing to emergency access */ 200 | +a[href$="/settings/emergency-access"] { @extend %bwrs-hide; } 201 | + 202 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 203 | +a[href$="/sso"] { @extend %bwrs-hide; } 204 | + 205 | +/* Hide the info box that advertises Bitwarden Send */ 206 | +app-send-info.d-block { @extend %bwrs-hide; } 207 | + 208 | +/* Hide Two-Factor menu in Organization settings */ 209 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 210 | + 211 | +/* Hide organization plans */ 212 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 213 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 214 | + 215 | +/* Hide the `API Key` section under `My Account` */ 216 | +app-account > div:nth-child(9), 217 | +app-account > p, 218 | +app-account > button:nth-child(11), 219 | +app-account > button:nth-child(12) { 220 | + @extend %bwrs-hide; 221 | +} 222 | + 223 | +/* Hide the radio button and label for the `Custom` org user type */ 224 | +#userTypeCustom, label[for^=userTypeCustom] { 225 | + @extend %bwrs-hide; 226 | +} 227 | + 228 | +/* Hide the warning that policy config is moving to Business Portal */ 229 | +app-org-policies > app-callout { @extend %bwrs-hide; } 230 | + 231 | +/* Hide `Single Organization` policy */ 232 | +app-org-policies > table > tbody > tr:nth-child(4) { @extend %bwrs-hide; } 233 | + 234 | +/* Hide Tax Info and Form in Organization settings */ 235 | +app-org-account > div.secondary-header:nth-child(3) { @extend %bwrs-hide; } 236 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %bwrs-hide; } 237 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %bwrs-hide; } 238 | +/**** END Bitwarden_RS CHANGES ****/ 239 | + 240 | $primary: #175DDC; 241 | $primary-accent: #1252A3; 242 | $secondary: #ced4da; 243 | -------------------------------------------------------------------------------- /patches/legacy/v2.20.3.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/src/angular/components/register.component.ts b/jslib/src/angular/components/register.component.ts 3 | index ae45add..e6a5590 100644 4 | --- a/jslib/src/angular/components/register.component.ts 5 | +++ b/jslib/src/angular/components/register.component.ts 6 | @@ -69,6 +69,12 @@ export class RegisterComponent { 7 | } 8 | 9 | async submit() { 10 | + if (typeof crypto.subtle === 'undefined') { 11 | + this.platformUtilsService.showToast('error', "This browser requires HTTPS to use the web vault", 12 | + "Check the Vaultwarden wiki for details on how to enable it"); 13 | + return; 14 | + } 15 | + 16 | if (!this.acceptPolicies && this.showTerms) { 17 | this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), 18 | this.i18nService.t('acceptPoliciesError')); 19 | diff --git a/src/404.html b/src/404.html 20 | index eba36375..cb8883ec 100644 21 | --- a/src/404.html 22 | +++ b/src/404.html 23 | @@ -41,10 +41,10 @@ 24 | 25 |

26 |

You can return to the web vault, check our status page 27 | - or contact us.

28 | + or contact us.

29 |
30 |
31 | - © Copyright 2021 Bitwarden, Inc. 32 | + © Copyright 2021 Bitwarden, Inc. (Powered by Vaultwarden) 33 |
34 | 35 | 36 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 37 | index 3fb1700e..f9621866 100644 38 | --- a/src/app/app.component.ts 39 | +++ b/src/app/app.component.ts 40 | @@ -146,6 +146,10 @@ export class AppComponent implements OnDestroy, OnInit { 41 | } 42 | break; 43 | case 'showToast': 44 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 45 | + message.title="This browser requires HTTPS to use the web vault"; 46 | + message.text="Check the Vaultwarden wiki for details on how to enable it"; 47 | + } 48 | this.showToast(message); 49 | break; 50 | case 'setFullWidth': 51 | diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html 52 | index b001b9e3..c1bd2ac8 100644 53 | --- a/src/app/layouts/footer.component.html 54 | +++ b/src/app/layouts/footer.component.html 55 | @@ -1,7 +1,7 @@ 56 |
57 |
58 |
59 | - © {{year}}, Bitwarden Inc. 60 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 61 |
62 |
63 |
64 | diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html 65 | index 4c2c4ca1..dc990b22 100644 66 | --- a/src/app/layouts/frontend-layout.component.html 67 | +++ b/src/app/layouts/frontend-layout.component.html 68 | @@ -1,5 +1,5 @@ 69 | 70 |
71 | - © {{year}}, Bitwarden Inc. 72 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 73 |
{{'versionNumber' | i18n : version}} 74 |
75 | diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html 76 | index b28897c9..524764c6 100644 77 | --- a/src/app/layouts/navbar.component.html 78 | +++ b/src/app/layouts/navbar.component.html 79 | @@ -38,7 +38,7 @@ 80 | 81 | {{'myAccount' | i18n}} 82 | 83 | - 84 | + 85 | 86 | {{'getHelp' | i18n}} 87 | 88 | diff --git a/src/app/organizations/settings/organization-subscription.component.ts b/src/app/organizations/settings/organization-subscription.component.ts 89 | index d8c2e6cf..5e32a9c8 100644 90 | --- a/src/app/organizations/settings/organization-subscription.component.ts 91 | +++ b/src/app/organizations/settings/organization-subscription.component.ts 92 | @@ -105,7 +105,7 @@ export class OrganizationSubscriptionComponent implements OnInit { 93 | const contactSupport = await this.platformUtilsService.showDialog(this.i18nService.t('changeBillingPlanDesc'), 94 | this.i18nService.t('changeBillingPlan'), this.i18nService.t('contactSupport'), this.i18nService.t('close')); 95 | if (contactSupport) { 96 | - this.platformUtilsService.launchUri('https://bitwarden.com/contact'); 97 | + this.platformUtilsService.launchUri('https://github.com/dani-garcia/vaultwarden'); 98 | } 99 | } 100 | 101 | diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html 102 | index 84944a2b..b736bbe4 100644 103 | --- a/src/app/send/access.component.html 104 | +++ b/src/app/send/access.component.html 105 | @@ -82,10 +82,7 @@ 106 |
107 |

{{'sendAccessTaglineProductDesc' | i18n}}
108 | {{'sendAccessTaglineLearnMore' | i18n}} Bitwarden Send 110 | - {{'sendAccessTaglineOr' | i18n}} {{'sendAccessTaglineSignUp' | i18n}} 112 | - {{'sendAccessTaglineTryToday' | i18n}} 113 | + href="https://www.bitwarden.com/products/send/" target="_blank">Bitwarden Send. 114 |

115 |
116 |
117 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 118 | index 65fe1fb8..ef615f80 100644 119 | --- a/src/app/services/services.module.ts 120 | +++ b/src/app/services/services.module.ts 121 | @@ -142,19 +142,25 @@ const passwordRepromptService = new PasswordRepromptService(i18nService, cryptoS 122 | containerService.attachToWindow(window); 123 | 124 | export function initFactory(): Function { 125 | + function getBaseUrl() { 126 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 127 | + // `window.location.href` should have one of the following forms: 128 | + // 129 | + // - `https://bitwarden.example.com/base/path/` 130 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 131 | + // 132 | + // We want to get to just `https://bitwarden.example.com/base/path`. 133 | + let baseUrl = window.location.href; 134 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 135 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 136 | + return baseUrl; 137 | + } 138 | return async () => { 139 | await (storageService as HtmlStorageService).init(); 140 | - const isDev = platformUtilsService.isDev(); 141 | - 142 | - if (isDev || platformUtilsService.isSelfHost()) { 143 | - environmentService.baseUrl = window.location.origin; 144 | - } else { 145 | - environmentService.notificationsUrl = 'https://notifications.bitwarden.com'; 146 | - environmentService.enterpriseUrl = 'https://portal.bitwarden.com'; 147 | - } 148 | 149 | + environmentService.baseUrl = getBaseUrl(); 150 | apiService.setUrls({ 151 | - base: window.location.origin, 152 | + base: environmentService.baseUrl, 153 | api: null, 154 | identity: null, 155 | events: null, 156 | diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts 157 | index 56f99588..6eaa158c 100644 158 | --- a/src/app/vault/vault.component.ts 159 | +++ b/src/app/vault/vault.component.ts 160 | @@ -80,9 +80,7 @@ export class VaultComponent implements OnInit, OnDestroy { 161 | async ngOnInit() { 162 | this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); 163 | this.showBrowserOutdated = window.navigator.userAgent.indexOf('MSIE') !== -1; 164 | - this.trashCleanupWarning = this.i18nService.t( 165 | - this.platformUtilsService.isSelfHost() ? 'trashCleanupWarningSelfHosted' : 'trashCleanupWarning' 166 | - ); 167 | + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); 168 | 169 | const queryParamsSub = this.route.queryParams.subscribe(async params => { 170 | await this.syncService.fullSync(false); 171 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 172 | index 598fea83..f5ed4253 100644 173 | --- a/src/scss/styles.scss 174 | +++ b/src/scss/styles.scss 175 | @@ -1,5 +1,59 @@ 176 | @import "../css/webfonts.css"; 177 | 178 | +/**** START Bitwarden_RS CHANGES ****/ 179 | +/* This combines all selectors extending it into one */ 180 | +%bwrs-hide { display: none !important; } 181 | + 182 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 183 | +#bwrs-hide, head { @extend %bwrs-hide; } 184 | + 185 | +/* Hide any link pointing to billing */ 186 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 187 | + 188 | +/* Hide any link pointing to subscriptions */ 189 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 190 | + 191 | +/* Hide any link pointing to emergency access */ 192 | +a[href$="/settings/emergency-access"] { @extend %bwrs-hide; } 193 | + 194 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 195 | +a[href$="/sso"] { @extend %bwrs-hide; } 196 | + 197 | +/* Hide the info box that advertises Bitwarden Send */ 198 | +app-send-info.d-block { @extend %bwrs-hide; } 199 | + 200 | +/* Hide Two-Factor menu in Organization settings */ 201 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 202 | + 203 | +/* Hide organization plans */ 204 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 205 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 206 | + 207 | +/* Hide the `API Key` section under `My Account` */ 208 | +app-account > div:nth-child(9), 209 | +app-account > p, 210 | +app-account > button:nth-child(11), 211 | +app-account > button:nth-child(12) { 212 | + @extend %bwrs-hide; 213 | +} 214 | + 215 | +/* Hide the radio button and label for the `Custom` org user type */ 216 | +#userTypeCustom, label[for^=userTypeCustom] { 217 | + @extend %bwrs-hide; 218 | +} 219 | + 220 | +/* Hide the warning that policy config is moving to Business Portal */ 221 | +app-org-policies > app-callout { @extend %bwrs-hide; } 222 | + 223 | +/* Hide `Single Organization` policy */ 224 | +app-org-policies > table > tbody > tr:nth-child(4) { @extend %bwrs-hide; } 225 | + 226 | +/* Hide Tax Info and Form in Organization settings */ 227 | +app-org-account > div.secondary-header:nth-child(3) { @extend %bwrs-hide; } 228 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %bwrs-hide; } 229 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %bwrs-hide; } 230 | +/**** END Bitwarden_RS CHANGES ****/ 231 | + 232 | $primary: #175DDC; 233 | $primary-accent: #1252A3; 234 | $secondary: #ced4da; 235 | diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts 236 | index 3f17b987..9d56c416 100644 237 | --- a/src/services/webPlatformUtils.service.ts 238 | +++ b/src/services/webPlatformUtils.service.ts 239 | @@ -249,11 +249,12 @@ export class WebPlatformUtilsService implements PlatformUtilsService { 240 | } 241 | 242 | isDev(): boolean { 243 | - return process.env.ENV === 'development'; 244 | + return false; 245 | } 246 | 247 | + // Even though Vaultwarden is self-hosted, returning true ends up enabling various license checks. 248 | isSelfHost(): boolean { 249 | - return process.env.SELF_HOST.toString() === 'true'; 250 | + return false; 251 | } 252 | 253 | copyToClipboard(text: string, options?: any): void | boolean { 254 | -------------------------------------------------------------------------------- /patches/legacy/v2.23.0.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts 3 | index aecf9ce..7dec3e7 100644 4 | --- a/jslib/angular/src/components/register.component.ts 5 | +++ b/jslib/angular/src/components/register.component.ts 6 | @@ -29,7 +29,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 7 | formPromise: Promise; 8 | masterPasswordScore: number; 9 | referenceData: ReferenceEventRequest; 10 | - showTerms = true; 11 | + showTerms = false; 12 | acceptPolicies: boolean = false; 13 | 14 | protected successRoute = 'login'; 15 | @@ -41,7 +41,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 16 | platformUtilsService: PlatformUtilsService, 17 | protected passwordGenerationService: PasswordGenerationService, environmentService: EnvironmentService) { 18 | super(environmentService, i18nService, platformUtilsService); 19 | - this.showTerms = !platformUtilsService.isSelfHost(); 20 | + this.showTerms = false; 21 | } 22 | 23 | async ngOnInit() { 24 | @@ -79,6 +79,12 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 25 | } 26 | 27 | async submit() { 28 | + if (typeof crypto.subtle === 'undefined') { 29 | + this.platformUtilsService.showToast('error', "This browser requires HTTPS to use the web vault", 30 | + "Check the Vaultwarden wiki for details on how to enable it"); 31 | + return; 32 | + } 33 | + 34 | if (!this.acceptPolicies && this.showTerms) { 35 | this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), 36 | this.i18nService.t('acceptPoliciesError')); 37 | diff --git a/src/404.html b/src/404.html 38 | index eba36375..cb8883ec 100644 39 | --- a/src/404.html 40 | +++ b/src/404.html 41 | @@ -41,10 +41,10 @@ 42 | 43 |

44 |

You can return to the web vault, check our status page 45 | - or contact us.

46 | + or contact us.

47 |
48 |
49 | - © Copyright 2021 Bitwarden, Inc. 50 | + © Copyright 2021 Bitwarden, Inc. (Powered by Vaultwarden) 51 |
52 | 53 | 54 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 55 | index 9d3207e4..779249b8 100644 56 | --- a/src/app/app.component.ts 57 | +++ b/src/app/app.component.ts 58 | @@ -158,6 +158,10 @@ export class AppComponent implements OnDestroy, OnInit { 59 | } 60 | break; 61 | case 'showToast': 62 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 63 | + message.title="This browser requires HTTPS to use the web vault"; 64 | + message.text="Check the Vaultwarden wiki for details on how to enable it"; 65 | + } 66 | this.showToast(message); 67 | break; 68 | case 'setFullWidth': 69 | diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html 70 | index b001b9e3..c1bd2ac8 100644 71 | --- a/src/app/layouts/footer.component.html 72 | +++ b/src/app/layouts/footer.component.html 73 | @@ -1,7 +1,7 @@ 74 |
75 |
76 |
77 | - © {{year}}, Bitwarden Inc. 78 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 79 |
80 |
81 |
82 | diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html 83 | index 4c2c4ca1..dc990b22 100644 84 | --- a/src/app/layouts/frontend-layout.component.html 85 | +++ b/src/app/layouts/frontend-layout.component.html 86 | @@ -1,5 +1,5 @@ 87 | 88 |
89 | - © {{year}}, Bitwarden Inc. 90 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 91 |
{{'versionNumber' | i18n : version}} 92 |
93 | diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html 94 | index bdc5df36..82a8baa4 100644 95 | --- a/src/app/layouts/navbar.component.html 96 | +++ b/src/app/layouts/navbar.component.html 97 | @@ -46,7 +46,7 @@ 98 | 99 | {{'myAccount' | i18n}} 100 | 101 | - 102 | + 103 | 104 | {{'getHelp' | i18n}} 105 | 106 | diff --git a/src/app/organizations/settings/organization-subscription.component.ts b/src/app/organizations/settings/organization-subscription.component.ts 107 | index 216c1d91..73e82119 100644 108 | --- a/src/app/organizations/settings/organization-subscription.component.ts 109 | +++ b/src/app/organizations/settings/organization-subscription.component.ts 110 | @@ -111,7 +111,7 @@ export class OrganizationSubscriptionComponent implements OnInit { 111 | const contactSupport = await this.platformUtilsService.showDialog(this.i18nService.t('changeBillingPlanDesc'), 112 | this.i18nService.t('changeBillingPlan'), this.i18nService.t('contactSupport'), this.i18nService.t('close')); 113 | if (contactSupport) { 114 | - this.platformUtilsService.launchUri('https://bitwarden.com/contact'); 115 | + this.platformUtilsService.launchUri('https://github.com/dani-garcia/vaultwarden'); 116 | } 117 | } 118 | 119 | diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html 120 | index 84944a2b..107ad359 100644 121 | --- a/src/app/send/access.component.html 122 | +++ b/src/app/send/access.component.html 123 | @@ -8,7 +8,7 @@ 124 |
125 |
126 | 127 | - {{'viewSendHiddenEmailWarning' | i18n }} 128 | + {{'viewSendHiddenEmailWarning' | i18n }} 129 | {{'learnMore' | i18n}}. 130 | 131 |
132 | @@ -82,10 +82,7 @@ 133 |
134 |

{{'sendAccessTaglineProductDesc' | i18n}}
135 | {{'sendAccessTaglineLearnMore' | i18n}} Bitwarden Send 137 | - {{'sendAccessTaglineOr' | i18n}} {{'sendAccessTaglineSignUp' | i18n}} 139 | - {{'sendAccessTaglineTryToday' | i18n}} 140 | + href="https://www.bitwarden.com/products/send/" target="_blank">Bitwarden Send. 141 |

142 |
143 |
144 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 145 | index 6639268f..fa5e222b 100644 146 | --- a/src/app/services/services.module.ts 147 | +++ b/src/app/services/services.module.ts 148 | @@ -145,12 +145,23 @@ const eventLoggingService = new EventLoggingService(storageService, apiService, 149 | containerService.attachToWindow(window); 150 | 151 | export function initFactory(): Function { 152 | + function getBaseUrl() { 153 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 154 | + // `window.location.href` should have one of the following forms: 155 | + // 156 | + // - `https://bitwarden.example.com/base/path/` 157 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 158 | + // 159 | + // We want to get to just `https://bitwarden.example.com/base/path`. 160 | + let baseUrl = window.location.href; 161 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 162 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 163 | + return baseUrl; 164 | + } 165 | return async () => { 166 | await (storageService as HtmlStorageService).init(); 167 | 168 | - const urls = process.env.URLS as Urls; 169 | - urls.base ??= window.location.origin; 170 | - environmentService.setUrls(urls, false); 171 | + environmentService.setUrls({ base: getBaseUrl() }, false); 172 | 173 | setTimeout(() => notificationsService.init(), 3000); 174 | 175 | diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts 176 | index 7ac88452..e6d92ec7 100644 177 | --- a/src/app/vault/vault.component.ts 178 | +++ b/src/app/vault/vault.component.ts 179 | @@ -77,9 +77,7 @@ export class VaultComponent implements OnInit, OnDestroy { 180 | async ngOnInit() { 181 | this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); 182 | this.showBrowserOutdated = window.navigator.userAgent.indexOf('MSIE') !== -1; 183 | - this.trashCleanupWarning = this.i18nService.t( 184 | - this.platformUtilsService.isSelfHost() ? 'trashCleanupWarningSelfHosted' : 'trashCleanupWarning' 185 | - ); 186 | + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); 187 | 188 | const queryParamsSub = this.route.queryParams.subscribe(async params => { 189 | await this.syncService.fullSync(false); 190 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 191 | index a3fb35de..e439e08e 100644 192 | --- a/src/scss/styles.scss 193 | +++ b/src/scss/styles.scss 194 | @@ -1,5 +1,53 @@ 195 | @import "../css/webfonts.css"; 196 | 197 | +/**** START Bitwarden_RS CHANGES ****/ 198 | +/* This combines all selectors extending it into one */ 199 | +%bwrs-hide { display: none !important; } 200 | + 201 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 202 | +#bwrs-hide, head { @extend %bwrs-hide; } 203 | + 204 | +/* Hide any link pointing to billing */ 205 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 206 | + 207 | +/* Hide any link pointing to subscriptions */ 208 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 209 | + 210 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 211 | +a[href$="/sso"] { @extend %bwrs-hide; } 212 | + 213 | +/* Hide the info box that advertises Bitwarden Send */ 214 | +app-send-info.d-block { @extend %bwrs-hide; } 215 | + 216 | +/* Hide Two-Factor menu in Organization settings */ 217 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 218 | + 219 | +/* Hide organization plans */ 220 | +app-organization-plans > form > div.form-check { @extend %bwrs-hide; } 221 | +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } 222 | + 223 | +/* Hide the `API Key` section under `My Account` */ 224 | +app-account > div:nth-child(9), 225 | +app-account > p, 226 | +app-account > button:nth-child(11), 227 | +app-account > button:nth-child(12) { 228 | + @extend %bwrs-hide; 229 | +} 230 | + 231 | +/* Hide the radio button and label for the `Custom` org user type */ 232 | +#userTypeCustom, label[for^=userTypeCustom] { 233 | + @extend %bwrs-hide; 234 | +} 235 | + 236 | +/* Hide the warning that policy config is moving to Business Portal */ 237 | +app-org-policies > app-callout { @extend %bwrs-hide; } 238 | + 239 | +/* Hide Tax Info and Form in Organization settings */ 240 | +app-org-account > div.secondary-header:nth-child(3) { @extend %bwrs-hide; } 241 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %bwrs-hide; } 242 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %bwrs-hide; } 243 | +/**** END Bitwarden_RS CHANGES ****/ 244 | + 245 | $primary: #175DDC; 246 | $primary-accent: #1252A3; 247 | $secondary: #ced4da; 248 | diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts 249 | index fb321f5b..bdb1ad85 100644 250 | --- a/src/services/webPlatformUtils.service.ts 251 | +++ b/src/services/webPlatformUtils.service.ts 252 | @@ -223,11 +223,11 @@ export class WebPlatformUtilsService implements PlatformUtilsService { 253 | } 254 | 255 | isDev(): boolean { 256 | - return process.env.NODE_ENV === 'development'; 257 | + return false; 258 | } 259 | 260 | isSelfHost(): boolean { 261 | - return process.env.ENV.toString() === 'selfhosted'; 262 | + return false; 263 | } 264 | 265 | copyToClipboard(text: string, options?: any): void | boolean { 266 | -------------------------------------------------------------------------------- /patches/legacy/v2.25.0.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts 3 | index fd91af2..abcfd62 100644 4 | --- a/jslib/angular/src/components/register.component.ts 5 | +++ b/jslib/angular/src/components/register.component.ts 6 | @@ -30,7 +30,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 7 | formPromise: Promise; 8 | masterPasswordScore: number; 9 | referenceData: ReferenceEventRequest; 10 | - showTerms = true; 11 | + showTerms = false; 12 | acceptPolicies: boolean = false; 13 | 14 | protected successRoute = 'login'; 15 | @@ -43,7 +43,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 16 | protected passwordGenerationService: PasswordGenerationService, environmentService: EnvironmentService, 17 | protected logService: LogService) { 18 | super(environmentService, i18nService, platformUtilsService); 19 | - this.showTerms = !platformUtilsService.isSelfHost(); 20 | + this.showTerms = false; 21 | } 22 | 23 | async ngOnInit() { 24 | @@ -81,6 +81,12 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 25 | } 26 | 27 | async submit() { 28 | + if (typeof crypto.subtle === 'undefined') { 29 | + this.platformUtilsService.showToast('error', "This browser requires HTTPS to use the web vault", 30 | + "Check the Vaultwarden wiki for details on how to enable it"); 31 | + return; 32 | + } 33 | + 34 | if (!this.acceptPolicies && this.showTerms) { 35 | this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), 36 | this.i18nService.t('acceptPoliciesError')); 37 | diff --git a/src/404.html b/src/404.html 38 | index eba36375..cb8883ec 100644 39 | --- a/src/404.html 40 | +++ b/src/404.html 41 | @@ -41,10 +41,10 @@ 42 | 43 |

44 |

You can return to the web vault, check our status page 45 | - or contact us.

46 | + or contact us.

47 |
48 |
49 | - © Copyright 2021 Bitwarden, Inc. 50 | + © Copyright 2021 Bitwarden, Inc. (Powered by Vaultwarden) 51 |
52 | 53 | 54 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 55 | index f01ecb69..22fd7dc2 100644 56 | --- a/src/app/app.component.ts 57 | +++ b/src/app/app.component.ts 58 | @@ -160,6 +160,10 @@ export class AppComponent implements OnDestroy, OnInit { 59 | } 60 | break; 61 | case 'showToast': 62 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 63 | + message.title="This browser requires HTTPS to use the web vault"; 64 | + message.text="Check the Vaultwarden wiki for details on how to enable it"; 65 | + } 66 | this.showToast(message); 67 | break; 68 | case 'setFullWidth': 69 | diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html 70 | index b001b9e3..c1bd2ac8 100644 71 | --- a/src/app/layouts/footer.component.html 72 | +++ b/src/app/layouts/footer.component.html 73 | @@ -1,7 +1,7 @@ 74 |
75 |
76 |
77 | - © {{year}}, Bitwarden Inc. 78 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 79 |
80 |
81 |
82 | diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html 83 | index 4c2c4ca1..dc990b22 100644 84 | --- a/src/app/layouts/frontend-layout.component.html 85 | +++ b/src/app/layouts/frontend-layout.component.html 86 | @@ -1,5 +1,5 @@ 87 | 88 |
89 | - © {{year}}, Bitwarden Inc. 90 | + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden) 91 |
{{'versionNumber' | i18n : version}} 92 |
93 | diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html 94 | index 8581e239..24ae6788 100644 95 | --- a/src/app/layouts/navbar.component.html 96 | +++ b/src/app/layouts/navbar.component.html 97 | @@ -46,7 +46,7 @@ 98 | 99 | {{'myAccount' | i18n}} 100 | 101 | - 102 | + 103 | 104 | {{'getHelp' | i18n}} 105 | 106 | diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts 107 | index 715453fd..b7c2a7b2 100644 108 | --- a/src/app/organizations/vault/vault.component.ts 109 | +++ b/src/app/organizations/vault/vault.component.ts 110 | @@ -63,9 +63,7 @@ export class VaultComponent implements OnInit, OnDestroy { 111 | private platformUtilsService: PlatformUtilsService) { } 112 | 113 | ngOnInit() { 114 | - this.trashCleanupWarning = this.i18nService.t( 115 | - this.platformUtilsService.isSelfHost() ? 'trashCleanupWarningSelfHosted' : 'trashCleanupWarning' 116 | - ); 117 | + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); 118 | 119 | this.route.parent.params.pipe(first()).subscribe(async params => { 120 | this.organization = await this.userService.getOrganization(params.organizationId); 121 | diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html 122 | index 84944a2b..107ad359 100644 123 | --- a/src/app/send/access.component.html 124 | +++ b/src/app/send/access.component.html 125 | @@ -8,7 +8,7 @@ 126 |
127 |
128 | 129 | - {{'viewSendHiddenEmailWarning' | i18n }} 130 | + {{'viewSendHiddenEmailWarning' | i18n }} 131 | {{'learnMore' | i18n}}. 132 | 133 |
134 | @@ -82,10 +82,7 @@ 135 |
136 |

{{'sendAccessTaglineProductDesc' | i18n}}
137 | {{'sendAccessTaglineLearnMore' | i18n}} Bitwarden Send 139 | - {{'sendAccessTaglineOr' | i18n}} {{'sendAccessTaglineSignUp' | i18n}} 141 | - {{'sendAccessTaglineTryToday' | i18n}} 142 | + href="https://www.bitwarden.com/products/send/" target="_blank">Bitwarden Send. 143 |

144 |
145 |
146 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 147 | index 9064202e..4e818965 100644 148 | --- a/src/app/services/services.module.ts 149 | +++ b/src/app/services/services.module.ts 150 | @@ -155,12 +155,23 @@ const userVerificationService = new UserVerificationService(cryptoService, i18nS 151 | containerService.attachToWindow(window); 152 | 153 | export function initFactory(): Function { 154 | + function getBaseUrl() { 155 | + // If the base URL is `https://bitwarden.example.com/base/path/`, 156 | + // `window.location.href` should have one of the following forms: 157 | + // 158 | + // - `https://bitwarden.example.com/base/path/` 159 | + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` 160 | + // 161 | + // We want to get to just `https://bitwarden.example.com/base/path`. 162 | + let baseUrl = window.location.href; 163 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 164 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 165 | + return baseUrl; 166 | + } 167 | return async () => { 168 | await (storageService as HtmlStorageService).init(); 169 | 170 | - const urls = process.env.URLS as Urls; 171 | - urls.base ??= window.location.origin; 172 | - environmentService.setUrls(urls, false); 173 | + environmentService.setUrls({ base: getBaseUrl() }, false); 174 | 175 | setTimeout(() => notificationsService.init(), 3000); 176 | 177 | diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts 178 | index d91211eb..edd2a82d 100644 179 | --- a/src/app/vault/vault.component.ts 180 | +++ b/src/app/vault/vault.component.ts 181 | @@ -81,9 +81,7 @@ export class VaultComponent implements OnInit, OnDestroy { 182 | async ngOnInit() { 183 | this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); 184 | this.showBrowserOutdated = window.navigator.userAgent.indexOf('MSIE') !== -1; 185 | - this.trashCleanupWarning = this.i18nService.t( 186 | - this.platformUtilsService.isSelfHost() ? 'trashCleanupWarningSelfHosted' : 'trashCleanupWarning' 187 | - ); 188 | + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); 189 | 190 | this.route.queryParams.pipe(first()).subscribe(async params => { 191 | await this.syncService.fullSync(false); 192 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 193 | index 45a91fe1..4509368f 100644 194 | --- a/src/scss/styles.scss 195 | +++ b/src/scss/styles.scss 196 | @@ -55,3 +55,49 @@ 197 | @import "./plugins"; 198 | @import "./tables"; 199 | @import "./toasts"; 200 | + 201 | +/**** START Vaultwarden CHANGES ****/ 202 | +/* This combines all selectors extending it into one */ 203 | +%vw-hide { display: none !important; } 204 | + 205 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 206 | +#vw-hide, head { @extend %vw-hide; } 207 | + 208 | +/* Hide any link pointing to billing */ 209 | +a[href$="/settings/billing"] { @extend %vw-hide; } 210 | + 211 | +/* Hide any link pointing to subscriptions */ 212 | +a[href$="/settings/subscription"] { @extend %vw-hide; } 213 | + 214 | +/* Hide any link pointing to Sponsored Families */ 215 | +a[href$="/settings/sponsored-families"] { @extend %vw-hide; } 216 | + 217 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 218 | +a[href$="/sso"] { @extend %vw-hide; } 219 | + 220 | +/* Hide the info box that advertises Bitwarden Send */ 221 | +app-send-info.d-block { @extend %vw-hide; } 222 | + 223 | +/* Hide Two-Factor menu in Organization settings */ 224 | +app-org-settings a[href$="/settings/two-factor"] { @extend %vw-hide; } 225 | + 226 | +/* Hide organization plans */ 227 | +app-organization-plans > form > div.form-check { @extend %vw-hide; } 228 | +app-organization-plans > form > h2.mt-5 { @extend %vw-hide; } 229 | + 230 | +/* Hide the `This account is owned by a business` checkbox and label */ 231 | +#ownedBusiness, label[for^=ownedBusiness] { @extend %vw-hide; } 232 | + 233 | +/* Hide the radio button and label for the `Custom` org user type */ 234 | +#userTypeCustom, label[for^=userTypeCustom] { 235 | + @extend %vw-hide; 236 | +} 237 | + 238 | +/* Hide the warning that policy config is moving to Business Portal */ 239 | +app-org-policies > app-callout { @extend %vw-hide; } 240 | + 241 | +/* Hide Tax Info and Form in Organization settings */ 242 | +app-org-account > div.secondary-header:nth-child(3) { @extend %vw-hide; } 243 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %vw-hide; } 244 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %vw-hide; } 245 | +/**** END Vaultwarden CHANGES ****/ 246 | diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts 247 | index 13f754c0..c40612d8 100644 248 | --- a/src/services/webPlatformUtils.service.ts 249 | +++ b/src/services/webPlatformUtils.service.ts 250 | @@ -224,11 +224,11 @@ export class WebPlatformUtilsService implements PlatformUtilsService { 251 | } 252 | 253 | isDev(): boolean { 254 | - return process.env.NODE_ENV === 'development'; 255 | + return false; 256 | } 257 | 258 | isSelfHost(): boolean { 259 | - return process.env.ENV.toString() === 'selfhosted'; 260 | + return false; 261 | } 262 | 263 | copyToClipboard(text: string, options?: any): void | boolean { 264 | -------------------------------------------------------------------------------- /patches/legacy/v2.26.1.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts 3 | index 16ccb6ea..52ef9b28 100644 4 | --- a/jslib/angular/src/components/register.component.ts 5 | +++ b/jslib/angular/src/components/register.component.ts 6 | @@ -30,7 +30,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 7 | formPromise: Promise; 8 | masterPasswordScore: number; 9 | referenceData: ReferenceEventRequest; 10 | - showTerms = true; 11 | + showTerms = false; 12 | acceptPolicies: boolean = false; 13 | 14 | protected successRoute = "login"; 15 | @@ -49,7 +49,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 16 | protected logService: LogService 17 | ) { 18 | super(environmentService, i18nService, platformUtilsService); 19 | - this.showTerms = !platformUtilsService.isSelfHost(); 20 | + this.showTerms = false; 21 | } 22 | 23 | async ngOnInit() { 24 | @@ -87,6 +87,15 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 25 | } 26 | 27 | async submit() { 28 | + if (typeof crypto.subtle === 'undefined') { 29 | + this.platformUtilsService.showToast( 30 | + "error", 31 | + "This browser requires HTTPS to use the web vault", 32 | + "Check the Vaultwarden wiki for details on how to enable it" 33 | + ); 34 | + return; 35 | + } 36 | + 37 | if (!this.acceptPolicies && this.showTerms) { 38 | this.platformUtilsService.showToast( 39 | "error", 40 | diff --git a/src/404.html b/src/404.html 41 | index 6cf5e363..54d11495 100644 42 | --- a/src/404.html 43 | +++ b/src/404.html 44 | @@ -42,11 +42,10 @@ 45 | 46 |

47 |

48 | - You can return to the web vault, check our 49 | - status page or 50 | - contact us. 51 | + You can return to the web vault, or 52 | + contact us. 53 |

54 |
55 | -
© Copyright 2022 Bitwarden, Inc.
56 | +
© Copyright 2022 Bitwarden, Inc. (Powered by Vaultwarden)
57 | 58 | 59 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 60 | index 726a129e..35e62d1b 100644 61 | --- a/src/app/app.component.ts 62 | +++ b/src/app/app.component.ts 63 | @@ -158,6 +158,10 @@ export class AppComponent implements OnDestroy, OnInit { 64 | } 65 | break; 66 | case "showToast": 67 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 68 | + message.title="This browser requires HTTPS to use the web vault"; 69 | + message.text="Check the Vaultwarden wiki for details on how to enable it"; 70 | + } 71 | this.showToast(message); 72 | break; 73 | case "setFullWidth": 74 | diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html 75 | index 8601e123..22a0248b 100644 76 | --- a/src/app/layouts/footer.component.html 77 | +++ b/src/app/layouts/footer.component.html 78 | @@ -1,6 +1,6 @@ 79 |
80 |
81 | -
© {{ year }}, Bitwarden Inc.
82 | +
© {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
83 |
84 |
85 | {{ "versionNumber" | i18n: version }} 86 | diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html 87 | index 479302d3..84930683 100644 88 | --- a/src/app/layouts/frontend-layout.component.html 89 | +++ b/src/app/layouts/frontend-layout.component.html 90 | @@ -1,5 +1,5 @@ 91 | 92 |
93 | - © {{ year }}, Bitwarden Inc.
94 | + © {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
95 | {{ "versionNumber" | i18n: version }} 96 |
97 | diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html 98 | index 6ea3deed..944c34cc 100644 99 | --- a/src/app/layouts/navbar.component.html 100 | +++ b/src/app/layouts/navbar.component.html 101 | @@ -60,7 +60,7 @@ 102 | 103 | {{ "myAccount" | i18n }} 104 | 105 | - 106 | + 107 | 108 | {{ "getHelp" | i18n }} 109 | 110 | diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts 111 | index f8c83f9e..cfeabb27 100644 112 | --- a/src/app/organizations/vault/vault.component.ts 113 | +++ b/src/app/organizations/vault/vault.component.ts 114 | @@ -71,11 +71,7 @@ export class VaultComponent implements OnInit, OnDestroy { 115 | ) {} 116 | 117 | ngOnInit() { 118 | - this.trashCleanupWarning = this.i18nService.t( 119 | - this.platformUtilsService.isSelfHost() 120 | - ? "trashCleanupWarningSelfHosted" 121 | - : "trashCleanupWarning" 122 | - ); 123 | + this.trashCleanupWarning = this.i18nService.t("trashCleanupWarningSelfHosted"); 124 | this.route.parent.params.pipe(first()).subscribe(async (params) => { 125 | this.organization = await this.organizationService.get(params.organizationId); 126 | this.groupingsComponent.organization = this.organization; 127 | diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html 128 | index 19bc107b..7e1dbcc7 100644 129 | --- a/src/app/send/access.component.html 130 | +++ b/src/app/send/access.component.html 131 | @@ -137,15 +137,6 @@ 132 |
133 |

134 | {{ "sendAccessTaglineProductDesc" | i18n }}
135 | - {{ "sendAccessTaglineLearnMore" | i18n }} 136 | - Bitwarden Send 139 | - {{ "sendAccessTaglineOr" | i18n }} 140 | - {{ 141 | - "sendAccessTaglineSignUp" | i18n 142 | - }} 143 | - {{ "sendAccessTaglineTryToday" | i18n }} 144 |

145 |
146 |
147 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 148 | index 7cd0b25b..2d5756d4 100644 149 | --- a/src/app/services/services.module.ts 150 | +++ b/src/app/services/services.module.ts 151 | @@ -73,11 +73,23 @@ export function initFactory( 152 | platformUtilsService: PlatformUtilsServiceAbstraction, 153 | cryptoService: CryptoServiceAbstraction 154 | ): Function { 155 | + function getBaseUrl() { 156 | + // If the base URL is `https://vaultwarden.example.com/base/path/`, 157 | + // `window.location.href` should have one of the following forms: 158 | + // 159 | + // - `https://vaultwarden.example.com/base/path/` 160 | + // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]` 161 | + // 162 | + // We want to get to just `https://vaultwarden.example.com/base/path`. 163 | + let baseUrl = window.location.href; 164 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 165 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 166 | + return baseUrl; 167 | + } 168 | return async () => { 169 | await stateService.init(); 170 | 171 | - const urls = process.env.URLS as Urls; 172 | - urls.base ??= window.location.origin; 173 | + const urls = {base: getBaseUrl()}; 174 | environmentService.setUrls(urls); 175 | 176 | setTimeout(() => notificationsService.init(), 3000); 177 | diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts 178 | index 5b93c322..958eefa5 100644 179 | --- a/src/app/vault/vault.component.ts 180 | +++ b/src/app/vault/vault.component.ts 181 | @@ -94,11 +94,7 @@ export class VaultComponent implements OnInit, OnDestroy { 182 | async ngOnInit() { 183 | this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); 184 | this.showBrowserOutdated = window.navigator.userAgent.indexOf("MSIE") !== -1; 185 | - this.trashCleanupWarning = this.i18nService.t( 186 | - this.platformUtilsService.isSelfHost() 187 | - ? "trashCleanupWarningSelfHosted" 188 | - : "trashCleanupWarning" 189 | - ); 190 | + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); 191 | 192 | this.route.queryParams.pipe(first()).subscribe(async (params) => { 193 | await this.syncService.fullSync(false); 194 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 195 | index f914b514..a5cef65f 100644 196 | --- a/src/scss/styles.scss 197 | +++ b/src/scss/styles.scss 198 | @@ -56,3 +56,55 @@ 199 | @import "./plugins"; 200 | @import "./tables"; 201 | @import "./toasts"; 202 | + 203 | + 204 | +/**** START Vaultwarden CHANGES ****/ 205 | +/* This combines all selectors extending it into one */ 206 | +%vw-hide { display: none !important; } 207 | + 208 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 209 | +#vw-hide, head { @extend %vw-hide; } 210 | + 211 | +/* Hide any link pointing to billing */ 212 | +a[href$="/settings/billing"] { @extend %vw-hide; } 213 | + 214 | +/* Hide any link pointing to subscriptions */ 215 | +a[href$="/settings/subscription"] { @extend %vw-hide; } 216 | + 217 | +/* Hide any link pointing to Sponsored Families */ 218 | +a[href$="/settings/sponsored-families"] { @extend %vw-hide; } 219 | + 220 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 221 | +a[href$="/sso"] { @extend %vw-hide; } 222 | + 223 | +/* Hide the info box that advertises Bitwarden Send */ 224 | +app-send-info.d-block { @extend %vw-hide; } 225 | + 226 | +/* Hide Two-Factor menu in Organization settings */ 227 | +app-org-settings a[href$="/settings/two-factor"] { @extend %vw-hide; } 228 | + 229 | +/* Hide organization plans */ 230 | +app-organization-plans > form > div.form-check { @extend %vw-hide; } 231 | +app-organization-plans > form > h2.mt-5 { @extend %vw-hide; } 232 | + 233 | +/* Hide the `This account is owned by a business` checkbox and label */ 234 | +#ownedBusiness, label[for^=ownedBusiness] { @extend %vw-hide; } 235 | + 236 | +/* Hide External Id field for Collections */ 237 | +app-collection-add-edit form div.form-group:nth-child(2) { @extend %vw-hide; } 238 | + 239 | +/* Hide the radio button and label for the `Custom` org user type */ 240 | +#userTypeCustom, label[for^=userTypeCustom] { @extend %vw-hide; } 241 | + 242 | +/* Hide the warning that policy config is moving to Business Portal */ 243 | +app-org-policies > app-callout { @extend %vw-hide; } 244 | + 245 | +/* Hide Business Name and Identifier */ 246 | +app-org-account form div.form-group:nth-child(3) { display: none; } 247 | +app-org-account form div.form-group:nth-child(4) { display: none; } 248 | + 249 | +/* Hide Tax Info and Form in Organization settings */ 250 | +app-org-account > div.secondary-header:nth-child(3) { @extend %vw-hide; } 251 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %vw-hide; } 252 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %vw-hide; } 253 | +/**** END Vaultwarden CHANGES ****/ 254 | diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts 255 | index e5958aa4..5eb24d1f 100644 256 | --- a/src/services/webPlatformUtils.service.ts 257 | +++ b/src/services/webPlatformUtils.service.ts 258 | @@ -243,11 +243,11 @@ export class WebPlatformUtilsService implements PlatformUtilsService { 259 | } 260 | 261 | isDev(): boolean { 262 | - return process.env.NODE_ENV === "development"; 263 | + return false; 264 | } 265 | 266 | isSelfHost(): boolean { 267 | - return process.env.ENV.toString() === "selfhosted"; 268 | + return false; 269 | } 270 | 271 | copyToClipboard(text: string, options?: any): void | boolean { 272 | -------------------------------------------------------------------------------- /patches/legacy/v2.27.0.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts 3 | index f66800c9..d7866fc0 100644 4 | --- a/jslib/angular/src/components/register.component.ts 5 | +++ b/jslib/angular/src/components/register.component.ts 6 | @@ -28,7 +28,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 7 | formPromise: Promise; 8 | masterPasswordScore: number; 9 | referenceData: ReferenceEventRequest; 10 | - showTerms = true; 11 | + showTerms = false; 12 | acceptPolicies = false; 13 | 14 | protected successRoute = "login"; 15 | @@ -47,7 +47,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 16 | protected logService: LogService 17 | ) { 18 | super(environmentService, i18nService, platformUtilsService); 19 | - this.showTerms = !platformUtilsService.isSelfHost(); 20 | + this.showTerms = false; 21 | } 22 | 23 | async ngOnInit() { 24 | @@ -85,6 +85,15 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 25 | } 26 | 27 | async submit() { 28 | + if (typeof crypto.subtle === 'undefined') { 29 | + this.platformUtilsService.showToast( 30 | + "error", 31 | + "This browser requires HTTPS to use the web vault", 32 | + "Check the Vaultwarden wiki for details on how to enable it" 33 | + ); 34 | + return; 35 | + } 36 | + 37 | if (!this.acceptPolicies && this.showTerms) { 38 | this.platformUtilsService.showToast( 39 | "error", 40 | diff --git a/src/404.html b/src/404.html 41 | index 6cf5e363..54d11495 100644 42 | --- a/src/404.html 43 | +++ b/src/404.html 44 | @@ -42,11 +42,10 @@ 45 | 46 |

47 |

48 | - You can return to the web vault, check our 49 | - status page or 50 | - contact us. 51 | + You can return to the web vault, or 52 | + contact us. 53 |

54 |
55 | -
© Copyright 2022 Bitwarden, Inc.
56 | +
© Copyright 2022 Bitwarden, Inc. (Powered by Vaultwarden)
57 | 58 | 59 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 60 | index cd94408f..56bc4bdb 100644 61 | --- a/src/app/app.component.ts 62 | +++ b/src/app/app.component.ts 63 | @@ -159,6 +159,10 @@ export class AppComponent implements OnDestroy, OnInit { 64 | break; 65 | } 66 | case "showToast": 67 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 68 | + message.title="This browser requires HTTPS to use the web vault"; 69 | + message.text="Check the Vaultwarden wiki for details on how to enable it"; 70 | + } 71 | this.showToast(message); 72 | break; 73 | case "setFullWidth": 74 | diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html 75 | index 8601e123..22a0248b 100644 76 | --- a/src/app/layouts/footer.component.html 77 | +++ b/src/app/layouts/footer.component.html 78 | @@ -1,6 +1,6 @@ 79 |
80 |
81 | -
© {{ year }}, Bitwarden Inc.
82 | +
© {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
83 |
84 |
85 | {{ "versionNumber" | i18n: version }} 86 | diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html 87 | index 479302d3..84930683 100644 88 | --- a/src/app/layouts/frontend-layout.component.html 89 | +++ b/src/app/layouts/frontend-layout.component.html 90 | @@ -1,5 +1,5 @@ 91 | 92 |
93 | - © {{ year }}, Bitwarden Inc.
94 | + © {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
95 | {{ "versionNumber" | i18n: version }} 96 |
97 | diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html 98 | index 13fc0846..d0c6ad2d 100644 99 | --- a/src/app/layouts/navbar.component.html 100 | +++ b/src/app/layouts/navbar.component.html 101 | @@ -62,7 +62,7 @@ 102 | 103 | 110 | diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts 111 | index ea7d683e..2b534e05 100644 112 | --- a/src/app/organizations/vault/vault.component.ts 113 | +++ b/src/app/organizations/vault/vault.component.ts 114 | @@ -68,11 +68,7 @@ export class VaultComponent implements OnInit, OnDestroy { 115 | ) {} 116 | 117 | ngOnInit() { 118 | - this.trashCleanupWarning = this.i18nService.t( 119 | - this.platformUtilsService.isSelfHost() 120 | - ? "trashCleanupWarningSelfHosted" 121 | - : "trashCleanupWarning" 122 | - ); 123 | + this.trashCleanupWarning = this.i18nService.t("trashCleanupWarningSelfHosted"); 124 | this.route.parent.params.pipe(first()).subscribe(async (params) => { 125 | this.organization = await this.organizationService.get(params.organizationId); 126 | this.groupingsComponent.organization = this.organization; 127 | diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html 128 | index 19bc107b..7e1dbcc7 100644 129 | --- a/src/app/send/access.component.html 130 | +++ b/src/app/send/access.component.html 131 | @@ -137,15 +137,6 @@ 132 |
133 |

134 | {{ "sendAccessTaglineProductDesc" | i18n }}
135 | - {{ "sendAccessTaglineLearnMore" | i18n }} 136 | - Bitwarden Send 139 | - {{ "sendAccessTaglineOr" | i18n }} 140 | - {{ 141 | - "sendAccessTaglineSignUp" | i18n 142 | - }} 143 | - {{ "sendAccessTaglineTryToday" | i18n }} 144 |

145 |
146 |
147 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 148 | index c8e95320..88f5240c 100644 149 | --- a/src/app/services/services.module.ts 150 | +++ b/src/app/services/services.module.ts 151 | @@ -65,11 +65,23 @@ export function initFactory( 152 | platformUtilsService: PlatformUtilsServiceAbstraction, 153 | cryptoService: CryptoServiceAbstraction 154 | ): () => void { 155 | + function getBaseUrl() { 156 | + // If the base URL is `https://vaultwarden.example.com/base/path/`, 157 | + // `window.location.href` should have one of the following forms: 158 | + // 159 | + // - `https://vaultwarden.example.com/base/path/` 160 | + // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]` 161 | + // 162 | + // We want to get to just `https://vaultwarden.example.com/base/path`. 163 | + let baseUrl = window.location.href; 164 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 165 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 166 | + return baseUrl; 167 | + } 168 | return async () => { 169 | await stateService.init(); 170 | 171 | - const urls = process.env.URLS as Urls; 172 | - urls.base ??= window.location.origin; 173 | + const urls = {base: getBaseUrl()}; 174 | environmentService.setUrls(urls); 175 | 176 | setTimeout(() => notificationsService.init(), 3000); 177 | diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts 178 | index c3730bfa..3fab9245 100644 179 | --- a/src/app/vault/vault.component.ts 180 | +++ b/src/app/vault/vault.component.ts 181 | @@ -91,11 +91,7 @@ export class VaultComponent implements OnInit, OnDestroy { 182 | async ngOnInit() { 183 | this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); 184 | this.showBrowserOutdated = window.navigator.userAgent.indexOf("MSIE") !== -1; 185 | - this.trashCleanupWarning = this.i18nService.t( 186 | - this.platformUtilsService.isSelfHost() 187 | - ? "trashCleanupWarningSelfHosted" 188 | - : "trashCleanupWarning" 189 | - ); 190 | + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); 191 | 192 | this.route.queryParams.pipe(first()).subscribe(async (params) => { 193 | await this.syncService.fullSync(false); 194 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 195 | index d2678ac8..fb467a7e 100644 196 | --- a/src/scss/styles.scss 197 | +++ b/src/scss/styles.scss 198 | @@ -56,3 +56,55 @@ 199 | @import "./plugins"; 200 | @import "./tables"; 201 | @import "./toasts"; 202 | + 203 | + 204 | +/**** START Vaultwarden CHANGES ****/ 205 | +/* This combines all selectors extending it into one */ 206 | +%vw-hide { display: none !important; } 207 | + 208 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 209 | +#vw-hide, head { @extend %vw-hide; } 210 | + 211 | +/* Hide any link pointing to billing */ 212 | +a[href$="/settings/billing"] { @extend %vw-hide; } 213 | + 214 | +/* Hide any link pointing to subscriptions */ 215 | +a[href$="/settings/subscription"] { @extend %vw-hide; } 216 | + 217 | +/* Hide any link pointing to Sponsored Families */ 218 | +a[href$="/settings/sponsored-families"] { @extend %vw-hide; } 219 | + 220 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 221 | +a[href$="/sso"] { @extend %vw-hide; } 222 | + 223 | +/* Hide the info box that advertises Bitwarden Send */ 224 | +app-send-info.d-block { @extend %vw-hide; } 225 | + 226 | +/* Hide Two-Factor menu in Organization settings */ 227 | +app-org-settings a[href$="/settings/two-factor"] { @extend %vw-hide; } 228 | + 229 | +/* Hide organization plans */ 230 | +app-organization-plans > form > div.form-check { @extend %vw-hide; } 231 | +app-organization-plans > form > h2.mt-5 { @extend %vw-hide; } 232 | + 233 | +/* Hide the `This account is owned by a business` checkbox and label */ 234 | +#ownedBusiness, label[for^=ownedBusiness] { @extend %vw-hide; } 235 | + 236 | +/* Hide External Id field for Collections */ 237 | +app-collection-add-edit form div.form-group:nth-child(2) { @extend %vw-hide; } 238 | + 239 | +/* Hide the radio button and label for the `Custom` org user type */ 240 | +#userTypeCustom, label[for^=userTypeCustom] { @extend %vw-hide; } 241 | + 242 | +/* Hide the warning that policy config is moving to Business Portal */ 243 | +app-org-policies > app-callout { @extend %vw-hide; } 244 | + 245 | +/* Hide Business Name and Identifier */ 246 | +app-org-account form div.form-group:nth-child(3) { display: none; } 247 | +app-org-account form div.form-group:nth-child(4) { display: none; } 248 | + 249 | +/* Hide Tax Info and Form in Organization settings */ 250 | +app-org-account > div.secondary-header:nth-child(3) { @extend %vw-hide; } 251 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %vw-hide; } 252 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %vw-hide; } 253 | +/**** END Vaultwarden CHANGES ****/ 254 | diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts 255 | index 9132479b..3463a59e 100644 256 | --- a/src/services/webPlatformUtils.service.ts 257 | +++ b/src/services/webPlatformUtils.service.ts 258 | @@ -245,11 +245,11 @@ export class WebPlatformUtilsService implements PlatformUtilsService { 259 | } 260 | 261 | isDev(): boolean { 262 | - return process.env.NODE_ENV === "development"; 263 | + return false; 264 | } 265 | 266 | isSelfHost(): boolean { 267 | - return process.env.ENV.toString() === "selfhosted"; 268 | + return false; 269 | } 270 | 271 | copyToClipboard(text: string, options?: any): void | boolean { 272 | -------------------------------------------------------------------------------- /patches/legacy/v2.28.0.patch: -------------------------------------------------------------------------------- 1 | Submodule jslib contains modified content 2 | diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts 3 | index d4b99e17..c1626200 100644 4 | --- a/jslib/angular/src/components/register.component.ts 5 | +++ b/jslib/angular/src/components/register.component.ts 6 | @@ -28,7 +28,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 7 | formPromise: Promise; 8 | masterPasswordScore: number; 9 | referenceData: ReferenceEventRequest; 10 | - showTerms = true; 11 | + showTerms = false; 12 | acceptPolicies = false; 13 | 14 | protected successRoute = "login"; 15 | @@ -47,7 +47,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 16 | protected logService: LogService 17 | ) { 18 | super(environmentService, i18nService, platformUtilsService); 19 | - this.showTerms = !platformUtilsService.isSelfHost(); 20 | + this.showTerms = false; 21 | } 22 | 23 | async ngOnInit() { 24 | @@ -85,6 +85,15 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn 25 | } 26 | 27 | async submit() { 28 | + if (typeof crypto.subtle === 'undefined') { 29 | + this.platformUtilsService.showToast( 30 | + "error", 31 | + "This browser requires HTTPS to use the web vault", 32 | + "Check the Vaultwarden wiki for details on how to enable it" 33 | + ); 34 | + return; 35 | + } 36 | + 37 | if (!this.acceptPolicies && this.showTerms) { 38 | this.platformUtilsService.showToast( 39 | "error", 40 | diff --git a/src/404.html b/src/404.html 41 | index 6cf5e363..54d11495 100644 42 | --- a/src/404.html 43 | +++ b/src/404.html 44 | @@ -42,11 +42,10 @@ 45 | 46 |

47 |

48 | - You can return to the web vault, check our 49 | - status page or 50 | - contact us. 51 | + You can return to the web vault, or 52 | + contact us. 53 |

54 |
55 | -
© Copyright 2022 Bitwarden, Inc.
56 | +
© Copyright 2022 Bitwarden, Inc. (Powered by Vaultwarden)
57 | 58 | 59 | diff --git a/src/app/app.component.ts b/src/app/app.component.ts 60 | index cd94408f..56bc4bdb 100644 61 | --- a/src/app/app.component.ts 62 | +++ b/src/app/app.component.ts 63 | @@ -159,6 +159,10 @@ export class AppComponent implements OnDestroy, OnInit { 64 | break; 65 | } 66 | case "showToast": 67 | + if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { 68 | + message.title="This browser requires HTTPS to use the web vault"; 69 | + message.text="Check the Vaultwarden wiki for details on how to enable it"; 70 | + } 71 | this.showToast(message); 72 | break; 73 | case "setFullWidth": 74 | diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html 75 | index 8601e123..22a0248b 100644 76 | --- a/src/app/layouts/footer.component.html 77 | +++ b/src/app/layouts/footer.component.html 78 | @@ -1,6 +1,6 @@ 79 |
80 |
81 | -
© {{ year }}, Bitwarden Inc.
82 | +
© {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
83 |
84 |
85 | {{ "versionNumber" | i18n: version }} 86 | diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html 87 | index 479302d3..84930683 100644 88 | --- a/src/app/layouts/frontend-layout.component.html 89 | +++ b/src/app/layouts/frontend-layout.component.html 90 | @@ -1,5 +1,5 @@ 91 | 92 |
93 | - © {{ year }}, Bitwarden Inc.
94 | + © {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
95 | {{ "versionNumber" | i18n: version }} 96 |
97 | diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html 98 | index c03c2bdf..a074e0c2 100644 99 | --- a/src/app/layouts/navbar.component.html 100 | +++ b/src/app/layouts/navbar.component.html 101 | @@ -65,7 +65,7 @@ 102 | 103 | 110 | diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts 111 | index ea7d683e..2b534e05 100644 112 | --- a/src/app/organizations/vault/vault.component.ts 113 | +++ b/src/app/organizations/vault/vault.component.ts 114 | @@ -68,11 +68,7 @@ export class VaultComponent implements OnInit, OnDestroy { 115 | ) {} 116 | 117 | ngOnInit() { 118 | - this.trashCleanupWarning = this.i18nService.t( 119 | - this.platformUtilsService.isSelfHost() 120 | - ? "trashCleanupWarningSelfHosted" 121 | - : "trashCleanupWarning" 122 | - ); 123 | + this.trashCleanupWarning = this.i18nService.t("trashCleanupWarningSelfHosted"); 124 | this.route.parent.params.pipe(first()).subscribe(async (params) => { 125 | this.organization = await this.organizationService.get(params.organizationId); 126 | this.groupingsComponent.organization = this.organization; 127 | diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html 128 | index 19bc107b..7e1dbcc7 100644 129 | --- a/src/app/send/access.component.html 130 | +++ b/src/app/send/access.component.html 131 | @@ -137,15 +137,6 @@ 132 |
133 |

134 | {{ "sendAccessTaglineProductDesc" | i18n }}
135 | - {{ "sendAccessTaglineLearnMore" | i18n }} 136 | - Bitwarden Send 139 | - {{ "sendAccessTaglineOr" | i18n }} 140 | - {{ 141 | - "sendAccessTaglineSignUp" | i18n 142 | - }} 143 | - {{ "sendAccessTaglineTryToday" | i18n }} 144 |

145 |
146 |
147 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 148 | index c8e95320..88f5240c 100644 149 | --- a/src/app/services/services.module.ts 150 | +++ b/src/app/services/services.module.ts 151 | @@ -65,11 +65,23 @@ export function initFactory( 152 | platformUtilsService: PlatformUtilsServiceAbstraction, 153 | cryptoService: CryptoServiceAbstraction 154 | ): () => void { 155 | + function getBaseUrl() { 156 | + // If the base URL is `https://vaultwarden.example.com/base/path/`, 157 | + // `window.location.href` should have one of the following forms: 158 | + // 159 | + // - `https://vaultwarden.example.com/base/path/` 160 | + // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]` 161 | + // 162 | + // We want to get to just `https://vaultwarden.example.com/base/path`. 163 | + let baseUrl = window.location.href; 164 | + baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. 165 | + baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. 166 | + return baseUrl; 167 | + } 168 | return async () => { 169 | await stateService.init(); 170 | 171 | - const urls = process.env.URLS as Urls; 172 | - urls.base ??= window.location.origin; 173 | + const urls = {base: getBaseUrl()}; 174 | environmentService.setUrls(urls); 175 | 176 | setTimeout(() => notificationsService.init(), 3000); 177 | diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts 178 | index c3730bfa..3fab9245 100644 179 | --- a/src/app/vault/vault.component.ts 180 | +++ b/src/app/vault/vault.component.ts 181 | @@ -91,11 +91,7 @@ export class VaultComponent implements OnInit, OnDestroy { 182 | async ngOnInit() { 183 | this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); 184 | this.showBrowserOutdated = window.navigator.userAgent.indexOf("MSIE") !== -1; 185 | - this.trashCleanupWarning = this.i18nService.t( 186 | - this.platformUtilsService.isSelfHost() 187 | - ? "trashCleanupWarningSelfHosted" 188 | - : "trashCleanupWarning" 189 | - ); 190 | + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); 191 | 192 | this.route.queryParams.pipe(first()).subscribe(async (params) => { 193 | await this.syncService.fullSync(false); 194 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 195 | index d2678ac8..fb467a7e 100644 196 | --- a/src/scss/styles.scss 197 | +++ b/src/scss/styles.scss 198 | @@ -56,3 +56,55 @@ 199 | @import "./plugins"; 200 | @import "./tables"; 201 | @import "./toasts"; 202 | + 203 | + 204 | +/**** START Vaultwarden CHANGES ****/ 205 | +/* This combines all selectors extending it into one */ 206 | +%vw-hide { display: none !important; } 207 | + 208 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 209 | +#vw-hide, head { @extend %vw-hide; } 210 | + 211 | +/* Hide any link pointing to billing */ 212 | +a[href$="/settings/billing"] { @extend %vw-hide; } 213 | + 214 | +/* Hide any link pointing to subscriptions */ 215 | +a[href$="/settings/subscription"] { @extend %vw-hide; } 216 | + 217 | +/* Hide any link pointing to Sponsored Families */ 218 | +a[href$="/settings/sponsored-families"] { @extend %vw-hide; } 219 | + 220 | +/* Hide the `Enterprise Single Sign-On` button on the login page */ 221 | +a[href$="/sso"] { @extend %vw-hide; } 222 | + 223 | +/* Hide the info box that advertises Bitwarden Send */ 224 | +app-send-info.d-block { @extend %vw-hide; } 225 | + 226 | +/* Hide Two-Factor menu in Organization settings */ 227 | +app-org-settings a[href$="/settings/two-factor"] { @extend %vw-hide; } 228 | + 229 | +/* Hide organization plans */ 230 | +app-organization-plans > form > div.form-check { @extend %vw-hide; } 231 | +app-organization-plans > form > h2.mt-5 { @extend %vw-hide; } 232 | + 233 | +/* Hide the `This account is owned by a business` checkbox and label */ 234 | +#ownedBusiness, label[for^=ownedBusiness] { @extend %vw-hide; } 235 | + 236 | +/* Hide External Id field for Collections */ 237 | +app-collection-add-edit form div.form-group:nth-child(2) { @extend %vw-hide; } 238 | + 239 | +/* Hide the radio button and label for the `Custom` org user type */ 240 | +#userTypeCustom, label[for^=userTypeCustom] { @extend %vw-hide; } 241 | + 242 | +/* Hide the warning that policy config is moving to Business Portal */ 243 | +app-org-policies > app-callout { @extend %vw-hide; } 244 | + 245 | +/* Hide Business Name and Identifier */ 246 | +app-org-account form div.form-group:nth-child(3) { display: none; } 247 | +app-org-account form div.form-group:nth-child(4) { display: none; } 248 | + 249 | +/* Hide Tax Info and Form in Organization settings */ 250 | +app-org-account > div.secondary-header:nth-child(3) { @extend %vw-hide; } 251 | +app-org-account > div.secondary-header:nth-child(3) + p { @extend %vw-hide; } 252 | +app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %vw-hide; } 253 | +/**** END Vaultwarden CHANGES ****/ 254 | diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts 255 | index 0c9b56fa..297d4bc5 100644 256 | --- a/src/services/webPlatformUtils.service.ts 257 | +++ b/src/services/webPlatformUtils.service.ts 258 | @@ -238,11 +238,11 @@ export class WebPlatformUtilsService implements PlatformUtilsService { 259 | } 260 | 261 | isDev(): boolean { 262 | - return process.env.NODE_ENV === "development"; 263 | + return false; 264 | } 265 | 266 | isSelfHost(): boolean { 267 | - return process.env.ENV.toString() === "selfhosted"; 268 | + return false; 269 | } 270 | 271 | copyToClipboard(text: string, options?: any): void | boolean { 272 | -------------------------------------------------------------------------------- /patches/legacy/v2.5.0.patch: -------------------------------------------------------------------------------- 1 | --- a/src/app/services/services.module.ts 2 | +++ b/src/app/services/services.module.ts 3 | @@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService, 4 | const environmentService = new EnvironmentService(apiService, storageService, notificationsService); 5 | const auditService = new AuditService(cryptoFunctionService, apiService); 6 | 7 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 8 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 9 | platformUtilsService, storageService, appIdService); 10 | containerService.attachToWindow(window); 11 | 12 | export function initFactory(): Function { 13 | return async () => { 14 | await (storageService as HtmlStorageService).init(); 15 | - const isDev = platformUtilsService.isDev(); 16 | - if (!isDev && platformUtilsService.isSelfHost()) { 17 | - environmentService.baseUrl = window.location.origin; 18 | - } else { 19 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 20 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 21 | - } 22 | + const isDev = false; 23 | + environmentService.baseUrl = window.location.origin; 24 | + environmentService.notificationsUrl = window.location.origin + '/notifications'; 25 | apiService.setUrls({ 26 | base: isDev ? null : window.location.origin, 27 | api: isDev ? 'http://localhost:4000' : null, 28 | -------------------------------------------------------------------------------- /patches/legacy/v2.8.0.patch: -------------------------------------------------------------------------------- 1 | diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts 2 | index f1b5b392..2bfc2f2e 100644 3 | --- a/src/app/services/services.module.ts 4 | +++ b/src/app/services/services.module.ts 5 | @@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService, 6 | const environmentService = new EnvironmentService(apiService, storageService, notificationsService); 7 | const auditService = new AuditService(cryptoFunctionService, apiService); 8 | 9 | -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), 10 | +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, 11 | platformUtilsService, storageService, appIdService); 12 | containerService.attachToWindow(window); 13 | 14 | export function initFactory(): Function { 15 | return async () => { 16 | await (storageService as HtmlStorageService).init(); 17 | - const isDev = platformUtilsService.isDev(); 18 | - if (!isDev && platformUtilsService.isSelfHost()) { 19 | - environmentService.baseUrl = window.location.origin; 20 | - } else { 21 | - environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : 22 | - 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; 23 | - } 24 | + const isDev = false; 25 | + environmentService.baseUrl = window.location.origin; 26 | + environmentService.notificationsUrl = window.location.origin + '/notifications'; 27 | apiService.setUrls({ 28 | base: isDev ? null : window.location.origin, 29 | api: isDev ? 'http://localhost:4000' : null, 30 | diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts 31 | index 5560c476..a9b954a8 100644 32 | --- a/src/app/settings/two-factor-u2f.component.ts 33 | +++ b/src/app/settings/two-factor-u2f.component.ts 34 | @@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI 35 | (window as any).u2f.register(u2fChallenge.appId, [{ 36 | version: u2fChallenge.version, 37 | challenge: u2fChallenge.challenge, 38 | + attestation: 'direct', 39 | }], [], (data: any) => { 40 | this.ngZone.run(() => { 41 | this.u2fListening = false; 42 | diff --git a/src/scss/styles.scss b/src/scss/styles.scss 43 | index 3df655fd..7e57cffe 100644 44 | --- a/src/scss/styles.scss 45 | +++ b/src/scss/styles.scss 46 | @@ -1,5 +1,34 @@ 47 | @import "../css/webfonts.css"; 48 | 49 | +/**** START Bitwarden_RS CHANGES ****/ 50 | +/* This combines all selectors extending it into one */ 51 | +%bwrs-hide { display: none !important; } 52 | + 53 | +/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ 54 | +#bwrs-hide, head { @extend %bwrs-hide; } 55 | + 56 | +/* Hide any link pointing to billing */ 57 | +a[href$="/settings/billing"] { @extend %bwrs-hide; } 58 | + 59 | +/* Hide any link pointing to subscriptions */ 60 | +a[href$="/settings/subscription"] { @extend %bwrs-hide; } 61 | + 62 | +/* Hide Two-Factor menu in Organization settings */ 63 | +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } 64 | + 65 | +/* Hide 2FA Email button */ 66 | +ul.list-group.list-group-2fa > li:nth-child(5) button { @extend %bwrs-hide; } 67 | + 68 | +/* Hide organization plans */ 69 | +app-create-organization > form > div.form-check { @extend %bwrs-hide; } 70 | +app-create-organization > form > h2.mt-5 { @extend %bwrs-hide; } 71 | + 72 | +/* Hide Tax Info in Organization settings */ 73 | +app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } 74 | +app-org-account > p { @extend %bwrs-hide; } 75 | +app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } 76 | +/**** END Bitwarden_RS CHANGES ****/ 77 | + 78 | $primary: #3c8dbc; 79 | $primary-accent: #286090; 80 | $secondary: #ced4da; 81 | -------------------------------------------------------------------------------- /resources/src/favicon.ico: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/favicon.ico -------------------------------------------------------------------------------- /resources/src/images/icon-dark.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icon-dark.png -------------------------------------------------------------------------------- /resources/src/images/icon-white.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icon-white.png -------------------------------------------------------------------------------- /resources/src/images/icon-white.svg: -------------------------------------------------------------------------------- 1 | 2 | Vaultwarden Icon - White 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | -------------------------------------------------------------------------------- /resources/src/images/icons/android-chrome-192x192.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icons/android-chrome-192x192.png -------------------------------------------------------------------------------- /resources/src/images/icons/android-chrome-512x512.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icons/android-chrome-512x512.png -------------------------------------------------------------------------------- /resources/src/images/icons/apple-touch-icon.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icons/apple-touch-icon.png -------------------------------------------------------------------------------- /resources/src/images/icons/favicon-16x16.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icons/favicon-16x16.png -------------------------------------------------------------------------------- /resources/src/images/icons/favicon-32x32.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icons/favicon-32x32.png -------------------------------------------------------------------------------- /resources/src/images/icons/mstile-150x150.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/icons/mstile-150x150.png -------------------------------------------------------------------------------- /resources/src/images/icons/safari-pinned-tab.svg: -------------------------------------------------------------------------------- 1 | 2 | 5 | 7 | 91 | 92 | 93 | -------------------------------------------------------------------------------- /resources/src/images/logo-dark@2x.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/logo-dark@2x.png -------------------------------------------------------------------------------- /resources/src/images/logo-white.svg: -------------------------------------------------------------------------------- 1 | 2 | Vaultwarden 3 | 4 | 5 | 6 | 7 | 8 | -------------------------------------------------------------------------------- /resources/src/images/logo-white@2x.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/dani-garcia/bw_web_builds/f5dbf839e4afa191aba7cefbeafd4b6489aa7502/resources/src/images/logo-white@2x.png -------------------------------------------------------------------------------- /resources/src/images/logo.svg: -------------------------------------------------------------------------------- 1 | 2 | Vaultwarden 3 | 4 | 5 | 6 | 7 | 8 | -------------------------------------------------------------------------------- /resources/vaultwarden-admin-console-logo.svg: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | -------------------------------------------------------------------------------- /resources/vaultwarden-icon.svg: -------------------------------------------------------------------------------- 1 | 2 | Vaultwarden 3 | 4 | 5 | 6 | -------------------------------------------------------------------------------- /scripts/.script_env: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | # shellcheck disable=SC2034 3 | set -o pipefail -o errexit 4 | ENV_BASEDIR=$(RL=$(readlink -n "$0"); SP="${RL:-$0}"; dirname "$(cd "$(dirname "${SP}")"; pwd)/$(basename "${SP}")") 5 | 6 | VAULT_FOLDER=${VAULT_FOLDER:=web-vault} 7 | CHECKOUT_TAGS=${CHECKOUT_TAGS:=true} 8 | OUTPUT_FOLDER=builds 9 | 10 | function get_web_vault_version { 11 | # First check if we are able to get a tag or branch 12 | VAULT_VERSION=$(git describe --abbrev=0 --tags --exact-match 2>/dev/null || git branch --show-current) 13 | # Else we will use the current commit hash 14 | if [[ -z "${VAULT_VERSION}" ]]; then 15 | VAULT_VERSION=$(git rev-parse HEAD) 16 | fi 17 | # Remove everything up to the first occurrence of "-" 18 | # The extracted tag could start with either `web-`, `desktop-`, `cli-` or `browser-` 19 | echo "${VAULT_VERSION#*-}" 20 | } 21 | 22 | # Load build environment variables if it exists 23 | if [ -f "${ENV_BASEDIR}/../.build_env" ]; then 24 | # shellcheck source=../.build_env 25 | . "${ENV_BASEDIR}/../.build_env" 26 | fi 27 | 28 | unset ENV_BASEDIR 29 | -------------------------------------------------------------------------------- /scripts/build_web_vault.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | set -o pipefail -o errexit 3 | BASEDIR=$(RL=$(readlink -n "$0"); SP="${RL:-$0}"; dirname "$(cd "$(dirname "${SP}")"; pwd)/$(basename "${SP}")") 4 | 5 | # Error handling 6 | handle_error() { 7 | read -n1 -r -p "FAILED: line $1, exit code $2. Press any key to exit..." _ 8 | exit 1 9 | } 10 | trap 'handle_error $LINENO $?' ERR 11 | 12 | # Load default script environment variables 13 | # shellcheck source=.script_env 14 | . "${BASEDIR}/.script_env" 15 | 16 | # Show used versions 17 | node --version 18 | npm --version 19 | 20 | # Build 21 | pushd "${VAULT_FOLDER}" 22 | npm ci 23 | 24 | pushd apps/web 25 | npm run dist:oss:selfhost 26 | 27 | # Delete debugging map files, optional 28 | #find build -name "*.map" -delete 29 | 30 | # Create vw-version.json with the latest tag from the remote repo. 31 | printf '{"version":"%s"}' \ 32 | "$(git -c 'versionsort.suffix=-' ls-remote --tags --refs --sort='v:refname' https://github.com/dani-garcia/bw_web_builds.git 'v*' | tail -n1 | grep -Eo '[^\/v]*$')" \ 33 | > build/vw-version.json 34 | 35 | popd 36 | popd 37 | -------------------------------------------------------------------------------- /scripts/checkout_web_vault.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | set -o pipefail -o errexit 3 | BASEDIR=$(RL=$(readlink -n "$0"); SP="${RL:-$0}"; dirname "$(cd "$(dirname "${SP}")"; pwd)/$(basename "${SP}")") 4 | 5 | # Error handling 6 | handle_error() { 7 | read -n1 -r -p "FAILED: line $1, exit code $2. Press any key to exit..." _ 8 | exit 1 9 | } 10 | trap 'handle_error $LINENO $?' ERR 11 | 12 | # Load default script environment variables 13 | # shellcheck source=.script_env 14 | . "${BASEDIR}/.script_env" 15 | 16 | # Ask for ref if not provided 17 | if [[ -z "$VAULT_VERSION" ]]; then 18 | read -rp "Input a git ref (commit hash, branch name, tag name, 'main'): " input 19 | VAULT_VERSION="${input:-main}" 20 | fi 21 | 22 | # Check the format of the provided vault version 23 | # If this is vYYYY.M.B or YYYY.M.B then fix this automatically to prepend `v` 24 | if [[ "${VAULT_VERSION}" =~ ^20[0-9]{2}\.[0-9]{1,2}.[0-9]{1} ]]; then 25 | VAULT_VERSION="v${VAULT_VERSION}" 26 | fi 27 | 28 | echo "Using: '${VAULT_VERSION}' to checkout bitwarden/client." 29 | 30 | if [ ! -d "${VAULT_FOLDER}" ]; then 31 | mkdir -pv "${VAULT_FOLDER}" 32 | pushd "${VAULT_FOLDER}" 33 | # If this is the first time, init the repo and checkout the requested branch/tag/hash 34 | git -c init.defaultBranch=main init 35 | git remote add vaultwarden https://github.com/vaultwarden/vw_web_builds.git 36 | popd 37 | else 38 | # If there already is a checked-out repo, lets clean it up first. 39 | pushd "${VAULT_FOLDER}" 40 | # Stash current changes if there are any, we don't want to lose our work if we had some 41 | echo "Stashing all custom changes" 42 | git stash --include-untracked --quiet &> /dev/null || true 43 | 44 | # Reset hard to make sure no changes are left 45 | git reset --hard 46 | popd 47 | fi 48 | 49 | if [[ "$CHECKOUT_TAGS" == "true" ]]; then 50 | CHECKOUT_ARGS="${CHECKOUT_ARGS:-} --tags" 51 | fi 52 | 53 | # Checkout the request 54 | pushd "${VAULT_FOLDER}" 55 | # Update branch and tag metadata 56 | git fetch --depth 1 ${CHECKOUT_ARGS:-} vaultwarden "${VAULT_VERSION}" 57 | # Checkout the branch we want 58 | git -c advice.detachedHead=false checkout "${VAULT_VERSION}" 59 | popd 60 | -------------------------------------------------------------------------------- /scripts/gh_prepare.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | set -o pipefail -o errexit 3 | 4 | # Error handling 5 | handle_error() { 6 | read -n1 -r -p "FAILED: line $1, exit code $2. Press any key to exit..." _ 7 | exit 1 8 | } 9 | trap 'handle_error $LINENO $?' ERR 10 | 11 | if ! command -v gh >/dev/null 2>&1; then 12 | echo "gh command not found, unable te prepare a release." 13 | exit 1 14 | fi 15 | 16 | current_branch=$(git branch --show-current 2>/dev/null || git symbolic-ref --short HEAD 2>/dev/null) 17 | if [[ -n "$current_branch" && "${current_branch}" != "master" ]]; then 18 | echo "Current branch '$current_branch' is not the 'master' branch." 19 | echo "Please checkout and pull the master branch before you continue." 20 | exit 1 21 | fi 22 | 23 | # Ask for release tag if not provided 24 | if [[ -z "$RELEASE_TAG" ]]; then 25 | read -rp "Provide git release tag (example: v2023.12.0): " input 26 | RELEASE_TAG="${input}" 27 | fi 28 | 29 | # Check if the RELEASE_TAG starts with vYYYY.M.B and patch letters are allowed like vYYYY.M.Ba 30 | if [[ ! "${RELEASE_TAG}" =~ ^v20[0-9]{2}\.[0-9]{1,2}.[0-9]{1}[a-z]?$ ]]; then 31 | echo "The provided release tag does not meet our standards!" 32 | echo "'${RELEASE_TAG}' does not match the vYYYY.M.B format." 33 | exit 1 34 | fi 35 | 36 | # Verify if the input is correct 37 | while true; do 38 | read -rp "Using: '${RELEASE_TAG}' as tag, continue? (y/n): " yn 39 | case $yn in 40 | [Yy] ) 41 | # Continue with the release 42 | break 43 | ;; 44 | [Nn] ) 45 | echo "Aborting release" 46 | exit 1 47 | ;; 48 | * ) echo "Please answer y or n" 49 | ;; 50 | esac 51 | done 52 | 53 | git tag -s "${RELEASE_TAG}" 54 | git push origin "${RELEASE_TAG}" 55 | echo "Wait a few seconds before using gh to create a draft release" 56 | sleep 5 57 | gh release create "${RELEASE_TAG}" --generate-notes --draft 58 | 59 | echo "Now wait for the container to be build and pushed before running 'make gh-release'" 60 | -------------------------------------------------------------------------------- /scripts/gh_release.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | set -o pipefail -o errexit 3 | 4 | # Error handling 5 | handle_error() { 6 | read -n1 -r -p "FAILED: line $1, exit code $2. Press any key to exit..." _ 7 | exit 1 8 | } 9 | trap 'handle_error $LINENO $?' ERR 10 | 11 | if ! command -v gh >/dev/null 2>&1; then 12 | echo "gh command not found, unable te prepare a release." 13 | exit 1 14 | fi 15 | 16 | current_branch=$(git branch --show-current 2>/dev/null || git symbolic-ref --short HEAD 2>/dev/null) 17 | if [[ -n "$current_branch" && "${current_branch}" != "master" ]]; then 18 | echo "Current branch '$current_branch' is not the 'master' branch." 19 | echo "Please checkout and pull the master branch before you continue." 20 | exit 1 21 | fi 22 | 23 | if [[ -z "$GPG_SIGNING_USER" ]]; then 24 | read -rp "Provide the GPG user or key which will sign the tar.gz file: " input 25 | GPG_SIGNING_USER="${input}" 26 | fi 27 | 28 | if [[ -n "$GPG_SIGNING_USER" ]]; then 29 | if ! gpg --list-keys "$GPG_SIGNING_USER" >/dev/null 2>&1; then 30 | echo "GPG Key for '${GPG_SIGNING_USER}' not found." 31 | exit 1 32 | fi 33 | fi 34 | 35 | # Get the latest release tag, this should match the tag created with `gh-prepare` 36 | LATEST_REMOTE_TAG="v$(git -c 'versionsort.suffix=-' ls-remote --tags --refs --sort='v:refname' https://github.com/dani-garcia/bw_web_builds.git 'v*' | tail -n1 | grep -Eo '[^\/v]*$')" 37 | 38 | # Ask for release tag if not provided, or validate the `$LATEST_REMOTE_TAG` 39 | if [[ -z "$RELEASE_TAG" ]]; then 40 | read -rp "Provide git release tag (default: '${LATEST_REMOTE_TAG}'): " input 41 | RELEASE_TAG="${input:-${LATEST_REMOTE_TAG}}" 42 | fi 43 | 44 | # Check if the RELEASE_TAG starts with vYYYY.M.B and patch letters are allowed like vYYYY.M.Ba 45 | if [[ ! "${RELEASE_TAG}" =~ ^v20[0-9]{2}\.[0-9]{1,2}.[0-9]{1}[a-z]?$ ]]; then 46 | echo "The provided release tag does not meet our standards!" 47 | echo "'${RELEASE_TAG}' does not match the vYYYY.M.B format." 48 | exit 1 49 | fi 50 | 51 | while true; do 52 | read -rp "Using: '${RELEASE_TAG}' as tag, continue? (y/n): " yn 53 | case $yn in 54 | [Yy] ) 55 | # Continue with the release 56 | break 57 | ;; 58 | [Nn] ) 59 | echo "Aborting prepare" 60 | exit 1 61 | ;; 62 | * ) echo "Please answer y or n" 63 | ;; 64 | esac 65 | done 66 | 67 | echo "Extracting tar.gz file from GitHub Container Registry" 68 | ${CONTAINER_CMD} create --name "bw_web_${RELEASE_TAG}" "ghcr.io/dani-garcia/bw_web_builds:${RELEASE_TAG}" 69 | ${CONTAINER_CMD} cp "bw_web_${RELEASE_TAG}:/bw_web_vault.tar.gz" "bw_web_${RELEASE_TAG}.tar.gz" 70 | ${CONTAINER_CMD} rm "bw_web_${RELEASE_TAG}" 71 | 72 | if [[ -f "bw_web_${RELEASE_TAG}.tar.gz" ]]; then 73 | gpg --yes --detach-sign --armor --local-user "$GPG_SIGNING_USER" --output "bw_web_${RELEASE_TAG}.tar.gz.asc" "bw_web_${RELEASE_TAG}.tar.gz" 74 | sha256sum "bw_web_${RELEASE_TAG}.tar.gz"* | tee sha256sums.txt 75 | 76 | gh release upload "${RELEASE_TAG}" "bw_web_${RELEASE_TAG}.tar.gz" "bw_web_${RELEASE_TAG}.tar.gz.asc" sha256sums.txt 77 | gh release edit "${RELEASE_TAG}" --draft=false 78 | fi 79 | -------------------------------------------------------------------------------- /scripts/package_web_vault.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | set -o pipefail -o errexit 3 | BASEDIR=$(RL=$(readlink -n "$0"); SP="${RL:-$0}"; dirname "$(cd "$(dirname "${SP}")"; pwd)/$(basename "${SP}")") 4 | 5 | # Error handling 6 | handle_error() { 7 | read -n1 -r -p "FAILED: line $1, exit code $2. Press any key to exit..." _ 8 | exit 1 9 | } 10 | trap 'handle_error $LINENO $?' ERR 11 | 12 | # This script now calls all other scripts and will do the exact same as it did before. 13 | # The only change is that all parts are split-up so they can run separately 14 | 15 | # Load default script environment variables 16 | # shellcheck source=.script_env 17 | . "${BASEDIR}/.script_env" 18 | 19 | # Checkout the web-vault from github 20 | # shellcheck source=checkout_web_vault.sh 21 | . "${BASEDIR}/checkout_web_vault.sh" 22 | 23 | # Build the web-vault using node and npm 24 | # shellcheck source=build_web_vault.sh 25 | . "${BASEDIR}/build_web_vault.sh" 26 | 27 | # Generate an archive from the build 28 | # shellcheck source=tar_web_vault.sh 29 | . "${BASEDIR}/tar_web_vault.sh" 30 | -------------------------------------------------------------------------------- /scripts/tar_web_vault.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | set -o pipefail -o errexit 3 | BASEDIR=$(RL=$(readlink -n "$0"); SP="${RL:-$0}"; dirname "$(cd "$(dirname "${SP}")"; pwd)/$(basename "${SP}")") 4 | 5 | # Error handling 6 | handle_error() { 7 | read -n1 -r -p "FAILED: line $1, exit code $2. Press any key to exit..." _ 8 | exit 1 9 | } 10 | trap 'handle_error $LINENO $?' ERR 11 | 12 | # Load default script environment variables 13 | # shellcheck source=.script_env 14 | . "${BASEDIR}/.script_env" 15 | 16 | mkdir -pv "${BASEDIR}/../${OUTPUT_FOLDER}" 17 | 18 | pushd "${VAULT_FOLDER}/apps/web" 19 | 20 | VAULT_VERSION=$(get_web_vault_version) 21 | OUTPUT_NAME="${BASEDIR}/../${OUTPUT_FOLDER}/bw_web_${VAULT_VERSION}" 22 | DATE_FORMAT="${DATE_FORMAT:-%Y-%m-%dT%H:%M:%S%z}" 23 | 24 | # Preserve previous output 25 | if [[ -f "${OUTPUT_NAME}.tar.gz" ]]; 26 | then 27 | DATE_SUFFIX=$(date -r "${OUTPUT_NAME}.tar.gz" +"${DATE_FORMAT}") 28 | mv "${OUTPUT_NAME}.tar.gz" "${OUTPUT_NAME}_${DATE_SUFFIX}.tar.gz" 29 | fi 30 | 31 | # Cleanup previous output directory 32 | if [[ -d "${OUTPUT_NAME}" ]]; 33 | then 34 | rm -rf "${OUTPUT_NAME}" 35 | fi 36 | 37 | mv build web-vault 38 | # Tar the web-vault 39 | # Check if we are using bsdtar or gnu-tar, bsdtar does not support --owner/--group 40 | if [[ "$(tar --version)" =~ .*bsdtar.* ]]; 41 | then 42 | tar -czvf "${OUTPUT_NAME}.tar.gz" web-vault 43 | else 44 | tar -czvf "${OUTPUT_NAME}.tar.gz" web-vault --owner=0 --group=0 45 | fi 46 | 47 | # Copy the web-vault 48 | cp -pR web-vault "${OUTPUT_NAME}" 49 | mv web-vault build 50 | 51 | popd 52 | --------------------------------------------------------------------------------