mirrors/vaultwarden-web
1
0
Fork 0
mirror of https://github.com/dani-garcia/bw_web_builds.git synced 2025-04-21 16:13:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update to v2024.11.2

Browse source 
A security patch has just been released, update to this version.
Add some other modifications like removing stripe, braintree and paypal keys.

Signed-off-by: BlackDex <black.dex@gmail.com>
This commit is contained in:
BlackDex 2024-11-25 20:37:28 +01:00
parent dd2c664712
commit 34de48e83d
No known key found for this signature in database
GPG key ID: 58C80A2AA6C765E1
4 changed files with 22 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -23,8 +23,8 @@ RUN node --version && npm --version
# Can be a tag, release, but prefer a commit hash because it's not changeable
# https://github.com/bitwarden/clients/commit/${VAULT_VERSION}
#
# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.11.1
ARG VAULT_VERSION=2dd6ac276c197fcaf36934931cf431de95345832
# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.11.2
ARG VAULT_VERSION=3b71950c55f9524fbf6e6801b2a1daf9ac71a792
ENV VAULT_VERSION=$VAULT_VERSION
ENV VAULT_FOLDER=bw_clients
ENV CHECKOUT_TAGS=false

47
patches/v2024.11.1.patch → patches/v2024.11.2.patch
View file

@ -1,34 +1,19 @@
diff --git a/apps/web/package.json b/apps/web/package.json
index 02ee6babe9..c232adfa25 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -3,26 +3,11 @@
"version": "2024.11.1",
"scripts": {
"build:oss": "webpack",
- "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
"build:oss:watch": "webpack serve",
- "build:bit:watch": "webpack serve -c ../../bitwarden_license/bit-web/webpack.config.js",
- "build:bit:dev": "cross-env ENV=development npm run build:bit",
- "build:bit:dev:analyze": "cross-env LOGGING=false webpack -c ../../bitwarden_license/bit-web/webpack.config.js --profile --json > stats.json && npx webpack-bundle-analyzer stats.json build/",
- "build:bit:dev:watch": "cross-env ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" npm run build:bit:watch",
- "build:bit:qa": "cross-env NODE_ENV=production ENV=qa npm run build:bit",
- "build:bit:euprd": "cross-env NODE_ENV=production ENV=euprd npm run build:bit",
- "build:bit:euqa": "cross-env NODE_ENV=production ENV=euqa npm run build:bit",
- "build:bit:usdev": "cross-env NODE_ENV=production ENV=usdev npm run build:bit",
- "build:bit:cloud": "cross-env NODE_ENV=production ENV=cloud npm run build:bit",
"build:oss:selfhost:watch": "cross-env ENV=selfhosted npm run build:oss:watch",
- "build:bit:selfhost:watch": "cross-env ENV=selfhosted npm run build:bit:watch",
"build:oss:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:oss",
- "build:bit:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:bit",
- "build:bit:ee": "cross-env NODE_ENV=production ENV=ee npm run build:bit",
"clean:l10n": "git push origin --delete l10n_master",
- "dist:bit:cloud": "npm run build:bit:cloud",
"dist:oss:selfhost": "npm run build:oss:selfhost:prod",
- "dist:bit:selfhost": "npm run build:bit:selfhost:prod",
"test": "jest",
"test:watch": "jest --watch",
"test:watch:all": "jest --watchAll"
diff --git a/apps/web/config/base.json b/apps/web/config/base.json
index cfaf604fb0..804252469a 100644
--- a/apps/web/config/base.json
+++ b/apps/web/config/base.json
@@ -1,11 +1,5 @@
{
"urls": {},
- "stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
- "braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2",
- "paypal": {
- "businessId": "AD3LAUZSNVPJY",
- "buttonAction": "https://www.sandbox.paypal.com/cgi-bin/webscr"
- },
"dev": {
"port": 8080,
"allowedHosts": "auto"
diff --git a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html
index e0a8006081..789efd9264 100644
--- a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html

4
scripts/apply_patches.sh
View file

@ -57,7 +57,9 @@ replace_embedded_svg_icon \
echo "Remove non-free bitwarden_license/ code"
rm -rf ./bitwarden_license/
rm -rf ./apps/web/src/app/tools/access-intelligence/
if [ -d "./apps/web/src/app/tools/access-intelligence/" ]; then
rm -rf ./apps/web/src/app/tools/access-intelligence/
fi
echo "Using patch: ${PATCH_NAME}"
git apply "../patches/${PATCH_NAME}" --reject

1
scripts/generate_patch_file.sh
View file

@ -32,6 +32,7 @@ if [ "$(git status --porcelain | wc -l)" -ge 1 ]; then
':!apps/web/src/images/logo-dark@2x.png' \
':!apps/web/src/images/logo-white@2x.png' \
':!apps/web/src/images/icon-white.png' \
':!apps/web/src/images/icon-white.svg' \
':!apps/web/src/images/icon-dark.png' \
':!apps/web/src/images/icons/android-chrome-192x192.png' \
':!apps/web/src/images/icons/android-chrome-512x512.png' \