fix error message after build (#263), improve readme (#266)

Not sure about the correct url

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2.1
+version: 2
 jobs:
   build:
     machine: true
@@ -9,13 +9,16 @@ jobs:
           command: date
       - run:
           name: Generate Keys
-          command: ./generateKeys.sh
+          command: ./.keys/generate-keys.sh
       - run:
           name: Build script
-          command: ./build.sh update
+          command: ./build.sh
+      - run:
+          name: Build licenseGen
+          command: ./src/licenseGen/build.sh
       - run:
           name: Test generating user license
-          command: ./licenseGen.sh user TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23
+          command: ./src/licenseGen/run.sh ./.keys/cert.pfx user TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23
       - run:
           name: Test generating organization license
-          command: ./licenseGen.sh org TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23
+          command: ./src/licenseGen/run.sh ./.keys/cert.pfx org TestName TestEmail@example.com 4a619d4a-522d-4c70-8596-affb5b607c23

.editorconfig

@@ -1,19 +0,0 @@
-root=true
-
-############################### 
-# Core EditorConfig Options   # 
-############################### 
-# All files 
-[*]
-indent_style=tab
-indent_size=4
-trim_trailing_whitespace=true
-end_of_line=lf
-charset=utf-8
-
-[*.{cs}]
-insert_final_newline=false
-
-[*.{md,mkdn}]
-trim_trailing_whitespace = true
-indent_style = space

.gitattributes

@@ -1 +0,0 @@
-* text eol=lf

.gitignore

@@ -1,12 +1,8 @@
 .idea/
 bin/
 obj/
-src/licenseGen/.vs/*
-src/bitBetter/.vs/*
 *.dll
 *.pem
 .vscode/
 *.pfx
-*.cer
+*.cert
-*.vsidx
-.DS_Store

.keys/generate-keys.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Check for openssl
+command -v openssl >/dev/null 2>&1 || { echo >&2 "openssl required but not found.  Aborting."; exit 1; }
+
+DIR=`dirname "$0"`
+DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd`
+
+# Remove any existing key files
+[ ! -e "$DIR/cert.pem" ]  || rm "$DIR/cert.pem"
+[ ! -e "$DIR/key.pem" ]   || rm "$DIR/key.pem"
+[ ! -e "$DIR/cert.cert" ] || rm "$DIR/cert.cert"
+[ ! -e "$DIR/cert.pfx" ]  || rm "$DIR/cert.pfx"
+
+# Generate new keys
+openssl	req -x509 -newkey rsa:4096 -keyout "$DIR/key.pem" -out "$DIR/cert.cert" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US'  -outform DER -passout pass:test
+openssl x509 -inform DER -in "$DIR/cert.cert" -out "$DIR/cert.pem"
+openssl pkcs12 -export -out "$DIR/cert.pfx" -inkey "$DIR/key.pem" -in "$DIR/cert.pem" -passin pass:test -passout pass:test
+
+ls

.servers/serverlist.txt

@@ -1,4 +0,0 @@
-# Uncomment a line below and fill in the missing values or add your own. Every line in this file will be called by build.[sh|ps1] once the patched image is built.
-# docker run -d --name bitwarden --restart=always -v <full-local-path>\logs:/var/log/bitwarden -v <full-local-path>\bwdata:/etc/bitwarden -p 80:8080 --env-file <full-local-path>\settings.env bitwarden-patched
-# <OR>
-# docker-compose -f <full-local-path>/docker-compose.yml up -d

README.md

@@ -1,14 +1,14 @@
-# BitBetter lite
+# BitBetter
 
-BitBetter is is a tool to modify Bitwarden's core dll to allow you to generate your own individual and organisation licenses.
+BitBetter is is a tool to modify Bitwarden's core dll to allow you to generate your own individual and organisation licenses. **You must have an existing installation of Bitwarden for BitBetter to modify.**
 
 Please see the FAQ below for details on why this software was created.
 
-Be aware that this branch is **only** for the lite (formerly unified) version of bitwarden. It has been rewritten and works in different ways than the master branch.
+Looking for a solution to the Lite (formerly unified) version of bitwarden, [go to the Lite branch](../../tree/lite).
 
-_Beware! BitBetter is a solution that generates a personal certificate and uses that to generate custom licences. This requires (automated) modifying of libraries. Use at your own risk!_
+_Beware! BitBetter does janky stuff to rewrite the bitwarden core dll and allow the installation of a self signed certificate. Use at your own risk!_
 
-Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter and https://github.com/GieltjE/BitBetter
+Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter
 
 # Table of Contents
 - [BitBetter](#bitbetter)
@@ -27,18 +27,18 @@ Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/B
 - [Footnotes](#footnotes)
 
 # Getting Started
-The following instructions are for unix-based systems (Linux, BSD, macOS) and Windows, just choose the correct script extension (.sh or .ps1 respectively).
+The following instructions are for unix-based systems (Linux, BSD, macOS), it is possible to use a Windows systems assuming you are able to enable and install [WSL](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
 
 ## Dependencies
 Aside from docker, which you also need for Bitwarden, BitBetter requires the following:
 
-* Bitwarden (tested with 2025.11.1 might work on lower versions), for safety always stay up to date
+* Bitwarden (tested with 1.47.1, might work on lower versions)
-* openssl (probably already installed on most Linux or WSL systems, any version should work, on Windows it will be auto installed using winget)
+* openssl (probably already installed on most Linux or WSL systems, any version should work)
 
 ## Setting up BitBetter
 With your dependencies installed, begin the installation of BitBetter by downloading it through Github or using the git command:
 
-```
+```bash
 git clone https://github.com/jakeswenson/BitBetter.git
 ```
 
@@ -48,90 +48,106 @@ If you wish to generate your self-signed cert & key manually, you can run the fo
 
 ```bash
 cd .keys
-openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cer -days 36500 -outform DER -passout pass:test
+openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cert -days 36500 -outform DER -passout pass:test
-openssl x509 -inform DER -in cert.cer -out cert.pem
+openssl x509 -inform DER -in cert.cert -out cert.pem
 openssl pkcs12 -export -out cert.pfx -inkey key.pem -in cert.pem -passin pass:test -passout pass:test
 ```
 
 > Note that the password here must be `test`.<sup>[1](#f1)</sup>
----
 
+---
 
 ## Building BitBetter
 
-Now that you've set up your build environment, we need to specify which servers to start after the work is done.
+Now that you've set up your build environment, you can **run the main build script** to generate a modified version of the `bitwarden/api` and `bitwarden/identity` docker images.
-The scripts supports running and patching multi instances.
-
-Edit the .servers/serverlist.txt file and fill in the missing values, they can be replaced with existing installation values.
-This file may be empty, but there will be no containers will be spun up automatically.
-
-Now it is time to **run the main build script** to generate a modified version of the `ghcr.io/bitwarden/lite` docker image and the license generator.
 
 From the BitBetter directory, simply run:
-```
+```bash
-./build.[sh|ps1]
+./build.sh
 ```
 
-This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `ghcr.io/bitwarden/lite` image called `bitwarden-patched`.
+This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `bitwarden/api` called `bitbetter/api` and a modified version of the `bitwarden/identity` called `bitbetter/identity`.
 
-Afterwards it will automatically generate the license generator and start all previously specified containers which are **now ready to accept self-issued licenses.**
+You may now simply create the file `/path/to/bwdata/docker/docker-compose.override.yml` with the following contents to utilize the modified images.
 
+```yaml
+services:
+  api:
+    image: bitbetter/api
+    pull_policy: never
+
+  identity:
+    image: bitbetter/identity
+    pull_policy: never
+```
+
+You'll also want to edit the `/path/to/bwdata/scripts/run.sh` file. In the `function restart()` block, comment out the call to `dockerComposePull`.
+
+> Replace `dockerComposePull`<br>with `#dockerComposePull`
+
+You can now start or restart Bitwarden as normal and the modified api will be used. **It is now ready to accept self-issued licenses.**
 
 ---
 
 ## Updating Bitwarden and BitBetter
 
-To update Bitwarden, the same `build.[sh|ps1]` script can be used. It will rebuild the BitBetter image and automatically update Bitwarden before doing so.
+To update Bitwarden, the provided `update-bitwarden.sh` script can be used. It will rebuild the BitBetter images and automatically update Bitwarden afterwards. Docker pull errors can be ignored for api and identity images.
+
+You can either run this script without providing any parameters in interactive mode (`./update-bitwarden.sh`) or by setting the parameters as follows, to run the script in non-interactive mode:
+```bash
+./update-bitwarden.sh param1 param2 param3
+```
+`param1`: The path to the directory containing your bwdata directory
+
+`param2`: If you want the docker-compose file to be overwritten (either `y` or `n`)
+
+`param3`: If you want the bitbetter images to be rebuild (either `y` or `n`)
+
+If you are updating from versions <= 1.46.2, you may need to run `update-bitwarden.sh` twice to complete the update process.
 
 ## Generating Signed Licenses
 
-There is a tool included in the directory `licenseGen/` that will generate new individual and organization licenses. These licenses will be accepted by the modified Bitwarden because they will be signed by the certificate you generated in earlier steps.
+There is a tool included in the directory `src/licenseGen/` that will generate new individual and organization licenses. These licenses will be accepted by the modified Bitwarden because they will be signed by the certificate you generated in earlier steps.
+
+
+First, from the `BitBetter/src/licenseGen` directory, **build the license generator**.<sup>[2](#f2)</sup>
+
+```bash
+./build.sh
+```
 
 In order to run the tool and generate a license you'll need to get a **user's GUID** in order to generate an **invididual license** or the server's **install ID** to generate an **Organization license**. These can be retrieved most easily through the Bitwarden [Admin Portal](https://help.bitwarden.com/article/admin-portal/).
 
 **The user must have a verified email address at the time of license import, otherwise Bitwarden will reject the license key. Nevertheless, the license key can be generated even before the user's email is verified.**
 
-If you ran the build script, you can **simply run the license gen in interactive mode** from the `Bitbetter` directory and **follow the prompts to generate your license**.
+If you generated your keys in the default `BitBetter/.keys` directory, you can **simply run the license gen in interactive mode** from the `Bitbetter` directory and **follow the prompts to generate your license**.
 
-```
+```bash
-./licenseGen.[sh|ps1] interactive
+./src/licenseGen/run.sh interactive
 ```
 
 **The license generator will spit out a JSON-formatted license which can then be used within the Bitwarden web front-end to license your user or org!**
 
+---
 
-## Migrating from mssql to a real database
+### Note: Alternative Ways to Generate License
 
-Prepare a new database and bwdata directory, download and prepare the new settings.env (https://raw.githubusercontent.com/bitwarden/self-host/refs/heads/main/bitwarden-lite/settings.env)
+If you wish to run the license gen from a directory aside from the root `BitBetter` one, you'll have to provide the absolute path to your cert.pfx.
 
-Make sure you can get the data from either the backup file or by connecting directly to the mssql database (navicat has a trial).
+```bash
-
+./src/licenseGen/run.sh /Absolute/Path/To/BitBetter/.keys/cert.pfx interactive
-If required (e.g. you cannot connect to your docker mssql server directly) download Microsoft SQL Server 2022 and SQL Server Management Studio (the latter can be used to import the .bak file)
-
-After cloning this repo and modifying .servers/serverlist.txt to suit your new environment do the following:
-
-```
-docker exec -i bitwarden-mssql /backup-db.sh
-./bitwarden.sh stop
 ```
 
-Run build.sh and ensure your new instance serves a webpage AND has populated the new database with the tables (should be empty now)
+Additional, instead of interactive mode, you can also pass the parameters directly to the command as follows.
 
-Proceed to stop the new container for now.
+```bash
-
+./src/licenseGen/run.sh /Absolute/Path/To/BitBetter/.keys/cert.pfx user "Name" "E-Mail" "User-GUID" ["Storage Space in GB"] ["Custom LicenseKey"]
-Copy from the old to the new bwdata directory (do not copy/overwrite identity.pfx!):
+./src/licenseGen/run.sh /Absolute/Path/To/BitBetter/.keys/cert.pfx org "Name" "E-Mail" "Install-ID used to install the server" ["Storage Space in GB"] ["Custom LicenseKey"]
- - bwdata/core/licenses to bwdata-new/licenses
+```
- - bwdata/core/aspnet-dataprotection to bwdata-new/data-protection
- - bwdata/core/attachments to bwdata-new/attachments
-
-Export data only from the old sql server database, if needed import the .bak file to a local mssql instance.
-
-Only export tables that have rows, makes it much quicker, .json is the easiest with navicat.
-
-Import the rows to the real database, start the new docker container.
 
 ---
 
+
 # FAQ: Questions you might have.
 
 ## Why build a license generator for open source software?
@@ -146,29 +162,10 @@ In the past we have done so but they were not focused on the type of customer th
 
 UPDATE: Bitwarden now offers a cheap license called [Families Organization](https://bitwarden.com/pricing/) that provides premium features and the ability to self-host Bitwarden for six persons.
 
-## 2fa doesn't work
-
-Unfortunately the new BitWarden container doesn't set the timezone and ignores TZ= from the environment, can be fixed by:
-
-```
-docker exec bitwarden ln -s /usr/share/zoneinfo/Europe/Amsterdam /etc/localtime
-```
-
-## Changes in settings.env
-
-Require a recreation of the docker container, build.sh will suffice too.
-
-## Migrating from the old unified branch
-
-```
-git branch -m unified lite
-git fetch origin
-git branch -u origin/lite lite
-git remote set-head origin -a
-```
 
 # Footnotes
 
-<a name="#f1"><sup>1</sup></a>This tool builds on top of the `bitbetter/api` container image so make sure you've built that above using the root `./build.sh` script.
+<a name="#f1"><sup>1</sup></a> If you wish to change this you'll need to change the value that `src/licenseGen/Program.cs` uses for its `GenerateUserLicense` and `GenerateOrgLicense` calls. Remember, this is really unnecessary as this certificate does not represent any type of security-related certificate.
+
+<a name="#f2"><sup>2</sup></a>This tool builds on top of the `bitbetter/api` container image so make sure you've built that above using the root `./build.sh` script.
 
-<a name="#f2"><sup>2</sup></a> If you wish to change this you'll need to change the value that `licenseGen/Program.cs` uses for its `GenerateUserLicense` and `GenerateOrgLicense` calls. Remember, this is really unnecessary as this certificate does not represent any type of security-related certificate.

build.ps1

@@ -1,132 +0,0 @@
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
-# detect buildx, ErrorActionPreference will ensure the script stops execution if not found
-docker buildx version
-
-# Enable BuildKit for better build experience and to ensure platform args are populated
-$env:DOCKER_BUILDKIT=1
-$env:COMPOSE_DOCKER_CLI_BUILD=1
-
-# define temporary directory
-$tempdirectory = "$pwd\temp"
-# define services to patch
-$components = "Api","Identity"
-
-# delete old directories / files if applicable
-if (Test-Path "$tempdirectory" -PathType Container) {
-	Remove-Item "$tempdirectory" -Recurse -Force
-}
-
-if (Test-Path -Path "$pwd\src\licenseGen\Core.dll" -PathType Leaf) {
-	Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
-}
-
-if (Test-Path -Path "$pwd\src\licenseGen\cert.pfx" -PathType Leaf) {
-	Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
-}
-
-if (Test-Path -Path "$pwd\src\bitBetter\cert.cer" -PathType Leaf) {
-	Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
-}
-
-if (Test-Path "$pwd\.keys\cert.cert" -PathType Leaf) {
-	Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer"
-}
-
-# generate keys if none are available
-if (!(Test-Path "$pwd\.keys" -PathType Container)) {
-	.\generateKeys.ps1
-}
-
-# copy the key to bitBetter
-Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter"
-
-# build bitBetter and clean the source directory after
-docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
-Remove-Item "$pwd\src\bitBetter\cert.cer" -Force
-
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
-$oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
-
-# stop and remove all running instances
-foreach ($instance in $oldinstances) {
-	docker stop $instance
-	docker rm $instance
-}
-
-# update bitwarden itself
-if ($args[0] -eq 'update') {
-	docker pull ghcr.io/bitwarden/lite:latest
-} else {
-	$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
-	if ($confirmation -eq 'y') {
-		docker pull ghcr.io/bitwarden/lite:latest
-	}
-}
-
-# stop and remove previous existing patch(ed) container
-$oldinstances = docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}'
-foreach ($instance in $oldinstances) {
-	docker stop $instance
-	docker rm $instance
-}
-$oldinstances = docker image ls bitwarden-patched --format '{{.ID}}'
-foreach ($instance in $oldinstances) {
-	docker image rm $instance
-}
-
-# remove old extract containers
-$oldinstances = docker container ps --all -f Name=bitwarden-extract --format '{{.ID}}'
-foreach ($instance in $oldinstances) {
-	docker stop $instance
-	docker rm $instance
-}
-
-# start a new bitwarden instance so we can patch it
-$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest
-
-# create our temporary directory
-New-item -ItemType Directory -Path $tempdirectory
-
-# extract the files that need to be patched from the services that need to be patched into our temporary directory
-foreach ($component in $components) {
-	New-item -itemtype Directory -path "$tempdirectory\$component"
-	docker cp $patchinstance`:/app/$component/Core.dll "$tempdirectory\$component\Core.dll"
-}
-
-# stop and remove our temporary container
-docker stop bitwarden-extract
-docker rm bitwarden-extract
-
-# run bitBetter, this applies our patches to the required files
-docker run -v "$tempdirectory`:/app/mount" --rm bitbetter/bitbetter
-
-# create a new image with the patched files
-docker build . --tag bitwarden-patched --file "$pwd\src\bitBetter\Dockerfile-bitwarden-patch"
-
-# start all user requested instances
-if (Test-Path -Path "$pwd\.servers\serverlist.txt" -PathType Leaf) {
-	foreach($line in Get-Content "$pwd\.servers\serverlist.txt") {
-		if (!($line.StartsWith("#"))) {
-			Invoke-Expression "& $line"
-		}
-	}
-}
-
-# remove our bitBetter image
-docker image rm bitbetter/bitbetter
-
-# copy our patched library to the licenseGen source directory
-Copy-Item "$tempdirectory\Identity\Core.dll" -Destination "$pwd\src\licenseGen"
-Copy-Item "$pwd\.keys\cert.pfx" -Destination "$pwd\src\licenseGen"
-
-# build the licenseGen
-docker build -t bitbetter/licensegen "$pwd\src\licenseGen"
-
-# clean the licenseGen source directory
-Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
-Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
-
-# remove our temporary directory
-Remove-Item "$tempdirectory" -Recurse -Force

build.sh

@@ -1,135 +1,68 @@
-#!/bin/bash
+#!/bin/sh
 set -e
+DIR=`dirname "$0"`
+DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd`
+BW_VERSION=$(curl -sL https://go.btwrdn.co/bw-sh-versions | grep '^ *"'coreVersion'":' | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//')
 
-# detect buildx, set -e will ensure the script stops execution if not found
+echo "Building BitBetter for BitWarden version $BW_VERSION"
-docker buildx version
 
 # Enable BuildKit for better build experience and to ensure platform args are populated
 export DOCKER_BUILDKIT=1
 export COMPOSE_DOCKER_CLI_BUILD=1
 
-# define temporary directory
+# Determine host architecture to use as default BUILDPLATFORM / TARGETPLATFORM if not supplied.
-TEMPDIRECTORY="$PWD/temp"
+# Allow override via environment variables when invoking the script.
+HOST_UNAME_ARCH=$(uname -m 2>/dev/null || echo unknown)
+case "$HOST_UNAME_ARCH" in
+    x86_64|amd64)   DEFAULT_ARCH=amd64 ;;
+    aarch64|arm64)  DEFAULT_ARCH=arm64 ;;
+    armv7l|armv7)   DEFAULT_ARCH=arm/v7 ;;
+    *)              DEFAULT_ARCH=amd64 ;;
+esac
 
-# define services to patch
+: "${BUILDPLATFORM:=linux/${DEFAULT_ARCH}}"
-COMPONENTS=("Api" "Identity")
+: "${TARGETPLATFORM:=linux/${DEFAULT_ARCH}}"
 
-# delete old directories / files if applicable
+echo "Using BUILDPLATFORM=$BUILDPLATFORM TARGETPLATFORM=$TARGETPLATFORM"
-if [ -d "$TEMPDIRECTORY" ]; then
-	rm -rf "$TEMPDIRECTORY"
-fi
 
-if [ -f "$PWD/src/licenseGen/Core.dll" ]; then
+# If there aren't any keys, generate them first.
-	rm -f "$PWD/src/licenseGen/Core.dll"
+[ -e "$DIR/.keys/cert.cert" ] || "$DIR/.keys/generate-keys.sh"
-fi
 
-if [ -f "$PWD/src/licenseGen/cert.pfx" ]; then
+# Prepare Bitwarden server repository
-	rm -f "$PWD/src/licenseGen/cert.pfx"
+rm -rf $DIR/server
-fi
+git clone --branch "v${BW_VERSION}" --depth 1 https://github.com/bitwarden/server.git $DIR/server
 
-if [ -f "$PWD/src/bitBetter/cert.cer" ]; then
+# Replace certificate file and thumbprint
-	rm -f "$PWD/src/bitBetter/cert.cer"
+old_thumbprint=$(openssl x509 -inform DER -fingerprint -noout -in $DIR/server/src/Core/licensing.cer | cut -d= -f2 | tr -d ':')
-fi
+new_thumbprint=$(openssl x509 -inform DER -fingerprint -noout -in $DIR/.keys/cert.cert | cut -d= -f2 | tr -d ':')
+sed -i -e "s/$old_thumbprint/$new_thumbprint/g" $DIR/server/src/Core/Billing/Services/Implementations/LicensingService.cs
+cp $DIR/.keys/cert.cert $DIR/server/src/Core/licensing.cer
 
-if [ -f "$PWD/.keys/cert.cert" ]; then
+docker build \
-	mv "$PWD/.keys/cert.cert" "$PWD/.keys/cert.cer"
+	--no-cache \
-fi
+	--platform "$TARGETPLATFORM" \
+	--build-arg BUILDPLATFORM="$BUILDPLATFORM" \
+	--build-arg TARGETPLATFORM="$TARGETPLATFORM" \
+	--label com.bitwarden.product="bitbetter" \
+	-f $DIR/server/src/Api/Dockerfile \
+	-t bitbetter/api \
+	$DIR/server
 
-# generate keys if none are available
+docker build \
-if [ ! -d "$PWD/.keys" ]; then
+	--no-cache \
-	./generateKeys.sh
+	--platform "$TARGETPLATFORM" \
-fi
+	--build-arg BUILDPLATFORM="$BUILDPLATFORM" \
+	--build-arg TARGETPLATFORM="$TARGETPLATFORM" \
+	--label com.bitwarden.product="bitbetter" \
+	-f $DIR/server/src/Identity/Dockerfile \
+	-t bitbetter/identity \
+	$DIR/server
 
-# copy the key to bitBetter
+docker tag bitbetter/api bitbetter/api:latest
-cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter"
+docker tag bitbetter/identity bitbetter/identity:latest
+docker tag bitbetter/api bitbetter/api:$BW_VERSION
+docker tag bitbetter/identity bitbetter/identity:$BW_VERSION
 
-# build bitBetter and clean the source directory after
+# Remove old instances of the image after a successful build.
-docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter"
+ids=$( docker image ls --format="{{ .ID }} {{ .Tag }}" 'bitbetter/*' | grep -E -v -- "CREATED|latest|${BW_VERSION}" | awk '{ ids = (ids ? ids FS $1 : $1) } END { print ids }' )
-rm -f "$PWD/src/bitBetter/cert.cer"
+[ -n "$ids" ] && docker rmi $ids || true
-
-# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden*
-OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}')
-
-# stop and remove all running instances
-for INSTANCE in ${OLDINSTANCES[@]}; do
-	docker stop $INSTANCE
-	docker rm $INSTANCE
-done
-
-# update bitwarden itself
-if [ "$1" = "update" ]; then
-	docker pull ghcr.io/bitwarden/lite:latest
-else
-	read -p "Update (or get) bitwarden source container (y/n): "
-	if [[ $REPLY =~ ^[Yy]$ ]]; then
-		docker pull ghcr.io/bitwarden/lite:latest
-	fi
-fi
-
-# stop and remove previous existing patch(ed) container
-OLDINSTANCES=$(docker container ps --all -f Ancestor=bitwarden-patched --format '{{.ID}}')
-for INSTANCE in ${OLDINSTANCES[@]}; do
-	docker stop $INSTANCE
-	docker rm $INSTANCE
-done
-OLDINSTANCES=$(docker image ls bitwarden-patched --format '{{.ID}}')
-for INSTANCE in ${OLDINSTANCES[@]}; do
-	docker image rm $INSTANCE
-done
-
-# remove old extract containers
-OLDINSTANCES=$(docker container ps --all -f Name=bitwarden-extract --format '{{.ID}}')
-for INSTANCE in ${OLDINSTANCES[@]}; do
-	docker stop $INSTANCE
-	docker rm $INSTANCE
-done
-
-# start a new bitwarden instance so we can patch it
-PATCHINSTANCE=$(docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest)
-
-# create our temporary directory
-mkdir $TEMPDIRECTORY
-
-# extract the files that need to be patched from the services that need to be patched into our temporary directory
-for COMPONENT in ${COMPONENTS[@]}; do
-	mkdir "$TEMPDIRECTORY/$COMPONENT"
-	docker cp $PATCHINSTANCE:/app/$COMPONENT/Core.dll "$TEMPDIRECTORY/$COMPONENT/Core.dll"
-done
-
-# stop and remove our temporary container
-docker stop bitwarden-extract
-docker rm bitwarden-extract
-
-# run bitBetter, this applies our patches to the required files
-docker run -v "$TEMPDIRECTORY:/app/mount" --rm bitbetter/bitbetter
-
-# create a new image with the patched files
-docker build . --tag bitwarden-patched --file "$PWD/src/bitBetter/Dockerfile-bitwarden-patch"
-
-# start all user requested instances
-if [ -f "$PWD/.servers/serverlist.txt" ]; then
-	# convert line endings to unix
-	sed -i 's/\r$//' "$PWD/.servers/serverlist.txt"
-	cat "$PWD/.servers/serverlist.txt" | while read -r LINE; do
-		if [[ $LINE != "#"* ]]; then
-			bash -c "$LINE"
-		fi
-	done
-fi
-
-# remove our bitBetter image
-docker image rm bitbetter/bitbetter
-
-# copy our patched library to the licenseGen source directory
-cp -f "$TEMPDIRECTORY/Identity/Core.dll" "$PWD/src/licenseGen"
-cp -f "$PWD/.keys/cert.pfx" "$PWD/src/licenseGen"
-
-# build the licenseGen
-docker build -t bitbetter/licensegen "$PWD/src/licenseGen"
-
-# clean the licenseGen source directory
-rm -f "$PWD/src/licenseGen/Core.dll"
-rm -f "$PWD/src/licenseGen/cert.pfx"
-
-# remove our temporary directory
-rm -rf "$TEMPDIRECTORY"

generateKeys.ps1

@@ -1,25 +0,0 @@
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
-# get the basic openssl binary path
-$opensslbinary = "$Env:Programfiles\OpenSSL-Win64\bin\openssl.exe"
-
-# if openssl is not installed attempt to install it
-if (!(Get-Command $opensslbinary -errorAction SilentlyContinue))
-{
-	winget install openssl
-}
-
-# if previous keys exist, remove them
-if (Test-Path "$pwd\.keys")
-{
-	Remove-Item "$pwd\.keys" -Recurse -Force
-}
-
-# create new directory 
-New-item -ItemType Directory -Path "$pwd\.keys"
-
-# generate actual keys
-Invoke-Expression "& '$opensslbinary' req -x509 -newkey rsa:4096 -keyout `"$pwd\.keys\key.pem`" -out `"$pwd\.keys\cert.cer`" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US' -outform DER -passout pass:test"
-Invoke-Expression "& '$opensslbinary' x509 -inform DER -in `"$pwd\.keys\cert.cer`" -out `"$pwd\.keys\cert.pem`""
-Invoke-Expression "& '$opensslbinary' pkcs12 -export -out `"$pwd\.keys\cert.pfx`" -inkey `"$pwd\.keys\key.pem`" -in `"$pwd\.keys\cert.pem`" -passin pass:test -passout pass:test"

generateKeys.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-# Check for openssl
-command -v openssl >/dev/null 2>&1 || { echo >&2 "openssl required but not found.  Aborting."; exit 1; }
-
-DIR="$PWD/.keys"
-
-# if previous keys exist, remove them
-if [ -d "$DIR" ]; then
-	rm -rf "$DIR"
-fi
-
-# create new directory 
-mkdir "$DIR"
-
-# Generate new keys
-openssl	req -x509 -newkey rsa:4096 -keyout "$DIR/key.pem" -out "$DIR/cert.cer" -days 36500 -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US'  -outform DER -passout pass:test
-openssl x509 -inform DER -in "$DIR/cert.cer" -out "$DIR/cert.pem"
-openssl pkcs12 -export -out "$DIR/cert.pfx" -inkey "$DIR/key.pem" -in "$DIR/cert.pem" -passin pass:test -passout pass:test

licenseGen.ps1

@@ -1,17 +0,0 @@
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
-if ($($args.Count) -lt 1) {
-	echo "USAGE: <License Gen action> [License Gen args...]"
-	echo "ACTIONS:"
-	echo " interactive"
-	echo " user"
-	echo " org"
-	Exit 1
-}
-
-if ($args[0] -eq "interactive") {
-	docker run -it --rm bitbetter/licensegen interactive
-} else {
-	docker run bitbetter/licensegen $args
-}

licenseGen.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ $# -lt 1 ]; then
-	echo "USAGE: <License Gen action> [License Gen args...]"
-	echo "ACTIONS:"
-	echo " interactive"
-	echo " user"
-	echo " org"
-	exit 1
-fi
-
-if [ "$1" = "interactive" ]; then
-	docker run -it --rm bitbetter/licensegen interactive
-else
-	docker run --rm bitbetter/licensegen "$@"
-fi

src/bitBetter/Dockerfile

@@ -1,14 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /bitBetter
-
-COPY . /bitBetter
-COPY cert.cer /app/
-
-RUN dotnet restore
-RUN dotnet publish -c Release -o /app --no-restore
-
-FROM mcr.microsoft.com/dotnet/sdk:8.0
-WORKDIR /app
-COPY --from=build /app .
-
-ENTRYPOINT ["dotnet", "/app/bitBetter.dll"]

src/bitBetter/Dockerfile-bitwarden-patch

@@ -1,3 +0,0 @@
-FROM ghcr.io/bitwarden/lite:latest
-
-COPY ./temp/ /app/

src/bitBetter/Program.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using dnlib.DotNet;
-using dnlib.DotNet.Emit;
-using dnlib.DotNet.Writer;
-using dnlib.IO;
-
-namespace bitBetter;
-
-internal class Program
-{
-	private static Int32 Main()
-	{
-		const String certFile = "/app/cert.cer";
-		String[] files = Directory.GetFiles("/app/mount", "Core.dll", SearchOption.AllDirectories);
-
-		foreach (String file in files)
-		{
-			Console.WriteLine(file);
-			ModuleDefMD moduleDefMd = ModuleDefMD.Load(file);
-			Byte[] cert = File.ReadAllBytes(certFile);
-
-			EmbeddedResource embeddedResourceToRemove = moduleDefMd.Resources.OfType<EmbeddedResource>().First(r => r.Name.Equals("Bit.Core.licensing.cer"));
-			EmbeddedResource embeddedResourceToAdd = new("Bit.Core.licensing.cer", cert) { Attributes = embeddedResourceToRemove.Attributes };
-			moduleDefMd.Resources.Add(embeddedResourceToAdd);
-			moduleDefMd.Resources.Remove(embeddedResourceToRemove);
-
-			DataReader reader = embeddedResourceToRemove.CreateReader();
-			X509Certificate2 existingCert = new(reader.ReadRemainingBytes());
-			
-			Console.WriteLine($"Existing Cert Thumbprint: {existingCert.Thumbprint}");
-			X509Certificate2 certificate = new(cert);
-
-			Console.WriteLine($"New Cert Thumbprint: {certificate.Thumbprint}");
-
-			IEnumerable<TypeDef> services = moduleDefMd.Types.Where(t => t.Namespace == "Bit.Core.Billing.Services");
-			TypeDef type = services.First(t => t.Name == "LicensingService");
-			MethodDef constructor = type.FindConstructors().First();
-			
-			Instruction instructionToPatch = constructor.Body.Instructions.FirstOrDefault(i => i.OpCode == OpCodes.Ldstr && String.Equals((String)i.Operand, existingCert.Thumbprint, StringComparison.InvariantCultureIgnoreCase));
-			
-			if (instructionToPatch != null)
-			{
-				instructionToPatch.Operand = certificate.Thumbprint;
-			}
-			else
-			{
-				Console.WriteLine("Can't find constructor to patch");
-			}
-
-			ModuleWriterOptions moduleWriterOptions = new(moduleDefMd);
-			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.KeepOldMaxStack;
-			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveAll;
-			moduleWriterOptions.MetadataOptions.Flags |= MetadataFlags.PreserveRids;
-
-			moduleDefMd.Write(file + ".new");
-			moduleDefMd.Dispose();
-			File.Delete(file);
-			File.Move(file + ".new", file);
-		}
-
-		return 0;
-	}
-}

src/bitBetter/bitBetter.csproj

@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="dnlib" Version="4.5.0" />
-  </ItemGroup>
-</Project>

src/licenseGen/Dockerfile

@@ -1,15 +1,17 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+
 WORKDIR /licenseGen
 
 COPY . /licenseGen
-COPY Core.dll /app/
-COPY cert.pfx /app/
 
-RUN dotnet restore
+RUN set -e; set -x; \
-RUN dotnet publish -c Release -o /app --no-restore
+	dotnet add package Newtonsoft.Json --version 13.0.1 \
+	&& dotnet restore \
+	&& dotnet publish
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0
-WORKDIR /app
-COPY --from=build /app .
 
-ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"]
+FROM bitbetter/api
+
+COPY --from=build /licenseGen/bin/Release/net8.0/publish/* /app/
+
+ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--executable", "/app/Api", "--cert", "/cert.pfx" ]

src/licenseGen/Program.cs

@@ -1,485 +1,445 @@
-using System;
+namespace BitwardenSelfLicensor
-using System.IO;
+{
-using System.Text.Json;
+    using Microsoft.Extensions.CommandLineUtils;
-using System.Reflection;
+    using Newtonsoft.Json;
-using System.Runtime.Loader;
+    using SingleFileExtractor.Core;
-using System.Security.Cryptography.X509Certificates;
+    using System;
-using McMaster.Extensions.CommandLineUtils;
+    using System.IO;
-
+    using System.Runtime.Loader;
-namespace licenseGen;
+    using System.Security.Cryptography.X509Certificates;
-
+
-internal class Program
+    public static class Program
-{
+    {
-	private static readonly CommandLineApplication App = new();
+        public static int Main(string[] args)
-	private static readonly CommandOption Cert = App.Option("--cert", "Certificate file", CommandOptionType.SingleValue);
+        {
-	private static readonly CommandOption CoreDll = App.Option("--core", "Path to Core.dll", CommandOptionType.SingleValue);
+            var app = new CommandLineApplication();
-
+            var cert = app.Option("--cert", "cert file", CommandOptionType.SingleValue);
-	private static Int32 Main(String[] args)
+            var coreDll = app.Option("--core", "path to core dll", CommandOptionType.SingleValue);
-	{
+            var exec = app.Option("--executable", "path to Bitwarden single file executable", CommandOptionType.SingleValue);
-		App.Command("interactive", config =>
+
-		{
+            bool ExecExists() => File.Exists(exec.Value());
-			String buff, licenseType = "", name = "", email = "", businessName="";
+            bool CertExists() => File.Exists(cert.Value());
-			Int16 storage = 0;
+            bool CoreExists() => File.Exists(coreDll.Value());
-			Boolean validGuid = false, validInstallid = false;
+            bool VerifyTopOptions() => 
-			Guid guid = Guid.Empty, installid = Guid.Empty;
+                !string.IsNullOrWhiteSpace(cert.Value()) &&
-
+                (!string.IsNullOrWhiteSpace(coreDll.Value()) || !string.IsNullOrWhiteSpace(exec.Value())) &&
-			config.OnExecute(() =>
+                CertExists() &&
-			{
+                (CoreExists() || ExecExists());
-				Check();
+            string GetExtractedDll()
-				Console.WriteLine("Interactive license mode...");
+            {
-
+                var coreDllPath = Path.Combine("extract", "Core.dll");
-				while (licenseType == "")
+                var reader = new ExecutableReader(exec.Value());
-				{
+                reader.ExtractToDirectory("extract");
-					Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: ");
+                var fileInfo = new FileInfo(coreDllPath);
-					buff = Console.ReadLine();
+                return fileInfo.FullName;
-
+            }
-					switch (buff)
+            string GetCoreDllPath() => CoreExists() ? coreDll.Value() : GetExtractedDll();
-					{
+            
-						case "u":
+            app.Command("interactive", config =>
-						{
+            {
-							licenseType = "user";
+                string buff="", licensetype="", name="", email="", businessname="";
-							Console.WriteLine("Okay, we will generate a user license.");
+                short storage = 0;
-
+
-							while (!validGuid)
+                bool valid_guid = false, valid_installid = false;
-							{
+                Guid guid = new Guid(), installid = new Guid();
-								Console.WriteLine("Please provide the user's guid — refer to the Readme for details on how to retrieve this. [GUID]: ");
+
-								buff = Console.ReadLine();
+                config.OnExecute(() =>
-
+                {
-								if (Guid.TryParse(buff, out guid))validGuid = true;
+                    if (!VerifyTopOptions())
-								else Console.WriteLine("The user-guid provided does not appear to be valid!");
+                    {
-							}
+                        if (!ExecExists() && !string.IsNullOrWhiteSpace(exec.Value())) config.Error.WriteLine($"Cant find single file executable at: {exec.Value()}");
-							break;
+                        if (!CoreExists() && !string.IsNullOrWhiteSpace(coreDll.Value())) config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}");
-						}
+                        if (!CertExists()) config.Error.WriteLine($"Cant find certificate at: {cert.Value()}");
-						case "o":
+                        config.ShowHelp();
-						{
+                        return 1;
-							licenseType = "org";
+                    }
-							Console.WriteLine("Okay, we will generate an organization license.");
+
-
+                    WriteLine("Interactive license mode...");
-							while (!validInstallid)
+
-							{
+                    while (licensetype == "")
-								Console.WriteLine("Please provide your Bitwarden Install-ID — refer to the Readme for details on how to retrieve this. [Install-ID]: ");
+                    {
-								buff = Console.ReadLine();
+                        WriteLine("What would you like to generate, a [u]ser license or an [o]rg license?");
-
+                        buff = Console.ReadLine();
-								if (Guid.TryParse(buff, out installid)) validInstallid = true;
+
-								else Console.WriteLine("The install-id provided does not appear to be valid.");
+                        if(buff == "u")
-							}
+                        {
-
+                            licensetype = "user";
-							while (businessName == "")
+                            WriteLineOver("Okay, we will generate a user license.");
-							{
+
-								Console.WriteLine("Please enter a business name, default is BitBetter. [Business Name]: ");
+                            while (valid_guid == false)
-								buff = Console.ReadLine();
+                            {
-								if (buff == "")
+                                WriteLine("Please provide the user's guid — refer to the Readme for details on how to retrieve this. [GUID]:");
-								{
+                                buff = Console.ReadLine();
-									businessName = "BitBetter";
+
-								}
+                                if (Guid.TryParse(buff, out guid))valid_guid = true;
-								else if (CheckBusinessName(buff))
+                                else WriteLineOver("The user-guid provided does not appear to be valid.");
-								{
+                            }
-									businessName = buff;
+                        }
-								}
+                        else if (buff == "o")
-							}
+                        {
-							break;
+                            licensetype = "org";
-						}
+                            WriteLineOver("Okay, we will generate an organization license.");
-						default:
+
-							Console.WriteLine("Unrecognized option \'" + buff + "\'.");
+                            while (valid_installid == false)
-							break;
+                            {
-					}
+                                WriteLine("Please provide your Bitwarden Install-ID — refer to the Readme for details on how to retrieve this. [Install-ID]:");
-				}
+                                buff = Console.ReadLine();
-
+
-				while (name == "")
+                                if (Guid.TryParse(buff, out installid)) valid_installid = true;
-				{
+                                else WriteLineOver("The install-id provided does not appear to be valid.");
-					Console.WriteLine("Please provide the username this license will be registered to. [username]: ");
+                            }
-					buff = Console.ReadLine();
+
-					if (CheckUsername(buff))   name = buff;
+                            while (businessname == "")
-				}
+                            {
-
+                                WriteLineOver("Please enter a business name, default is BitBetter. [Business Name]:");
-				while (email == "")
+                                buff = Console.ReadLine();
-				{
+                                if (buff == "")                     businessname = "BitBetter";
-					Console.WriteLine("Please provide the email address for the user " + name + ". [email]: ");
+                                else if (CheckBusinessName(buff))   businessname = buff;
-					buff = Console.ReadLine();
+                            }
-					if (CheckEmail(buff))
+                        }
-					{
+                        else
-						email = buff;
+                        {
-					}
+                            WriteLineOver("Unrecognized option \'" + buff + "\'. ");
-				}
+                        }
-
+                    }
-				while (storage == 0)
+
-				{
+                    while (name == "")
-					Console.WriteLine("Extra storage space for the user " + name + ". (max.: " + Int16.MaxValue + "). Defaults to maximum value. [storage]");
+                    {
-					buff = Console.ReadLine();
+                        WriteLineOver("Please provide the username this license will be registered to. [username]:");
-					if (String.IsNullOrWhiteSpace(buff))
+                        buff = Console.ReadLine();
-					{
+                        if ( CheckUsername(buff) )   name = buff;
-						storage = Int16.MaxValue;
+                    }
-					}
+
-					else
+                    while (email == "")
-					{
+                    {
-						if (CheckStorage(buff))
+                        WriteLineOver("Please provide the email address for the user " + name + ". [email]");
-						{
+                        buff = Console.ReadLine();
-							storage = Int16.Parse(buff);
+                        if ( CheckEmail(buff) )   email = buff;
-						}
+                    }
-					}
+
-				}
+                    while (storage == 0)
-
+                    {
-				switch (licenseType)
+                        WriteLineOver("Extra storage space for the user " + name + ". (max.: " + short.MaxValue + "). Defaults to maximum value. [storage]");
-				{
+                        buff = Console.ReadLine();
-					case "user":
+                        if (string.IsNullOrWhiteSpace(buff))
-					{
+                        {
-						Console.WriteLine("Confirm creation of \"user\" license for username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", User-GUID: \"" + guid + "\"? Y/n");
+                            storage = short.MaxValue;
-						buff = Console.ReadLine();
+                        }
-						if (buff is "" or "y" or "Y")
+                        else
-						{
+                        {
-							GenerateUserLicense(new X509Certificate2(Cert.Value(), "test"), CoreDll.Value(), name, email, storage, guid, null);
+                            if (CheckStorage(buff)) storage = short.Parse(buff);
-						}
+                        }
-						else
+                    }
-						{
+
-							Console.WriteLine("Exiting...");
+                    if (licensetype == "user")
-							return 0;
+                    {
-						}
+                        WriteLineOver("Confirm creation of \"user\" license for username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", User-GUID: \"" + guid + "\"? Y/n");
-
+                        buff = Console.ReadLine();
-						break;
+                        if ( buff == "" || buff == "y" || buff == "Y" )
-					}
+                        {
-					case "org":
+                            GenerateUserLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name, email, storage, guid, null);
-					{
+                        }
-						Console.WriteLine("Confirm creation of \"organization\" license for business name: \"" + businessName + "\", username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", Install-ID: \"" + installid + "\"? Y/n");
+                        else
-						buff = Console.ReadLine();
+                        {
-						if (buff is "" or "y" or "Y")
+                            WriteLineOver("Exiting...");
-						{
+                            return 0;
-							GenerateOrgLicense(new X509Certificate2(Cert.Value(), "test"), CoreDll.Value(), name, email, storage, installid, businessName, null);
+                        }
-						}
+                    }
-						else
+                    else if (licensetype == "org")
-						{
+                    {
-							Console.WriteLine("Exiting...");
+                        WriteLineOver("Confirm creation of \"organization\" license for business name: \"" + businessname + "\", username: \"" + name + "\", email: \"" + email + "\", Storage: \"" + storage + " GB\", Install-ID: \"" + installid + "\"? Y/n");
-							return 0;
+                        buff = Console.ReadLine();
-						}
+                        if ( buff == "" || buff == "y" || buff == "Y" )
-
+                        {
-						break;
+                            GenerateOrgLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name, email, storage, installid, businessname, null);
-					}
+                        }
-				}
+                        else
-
+                        {
-				return 0;
+                            WriteLineOver("Exiting...");
-			});
+                            return 0;
-		});
+                        }
-		App.Command("user", config =>
+                    }
-		{
+
-			CommandArgument name = config.Argument("Name", "your name");
+                    return 0;
-			CommandArgument email = config.Argument("Email", "your email");
+                });
-			CommandArgument userIdArg = config.Argument("User ID", "your user id");
+            });
-			CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)");
+
-			CommandArgument key = config.Argument("Key", "your key id (optional)");
+            app.Command("user", config =>
-
+            {
-			config.OnExecute(() =>
+                var name = config.Argument("Name", "your name");
-			{
+                var email = config.Argument("Email", "your email");
-				Check();
+                var userIdArg = config.Argument("User ID", "your user id");
-
+                var storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + short.MaxValue + " (optional, default = max)");
-				if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value))
+                var key = config.Argument("Key", "your key id (optional)");
-				{
+                var help = config.HelpOption("--help | -h | -?");
-					config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}'");
+
-					config.ShowHelp(true);
+                config.OnExecute(() =>
-					return 1;
+                {
-				}
+                    if (!VerifyTopOptions())
-
+                    {
-				if (String.IsNullOrWhiteSpace(userIdArg.Value) || !Guid.TryParse(userIdArg.Value, out Guid userId))
+                        if (!ExecExists() && !string.IsNullOrWhiteSpace(exec.Value())) config.Error.WriteLine($"Cant find single file executable at: {exec.Value()}");
-				{
+                        if (!CoreExists() && !string.IsNullOrWhiteSpace(coreDll.Value())) config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}");
-					config.Error.WriteLine("User ID not provided");
+                        if (!CertExists()) config.Error.WriteLine($"Cant find certificate at: {cert.Value()}");
-					config.ShowHelp(true);
+                        config.ShowHelp();
-					return 1;
+                        return 1;
-				}
+                    }
-
+                    else if (string.IsNullOrWhiteSpace(name.Value) || string.IsNullOrWhiteSpace(email.Value))
-				Int16 storageShort = 0;
+                    {
-				if (!String.IsNullOrWhiteSpace(storage.Value))
+                        config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}'");
-				{
+                        config.ShowHelp("user");
-					Double parsedStorage = Double.Parse(storage.Value);
+                        return 1;
-					if (parsedStorage is > Int16.MaxValue or < 0)
+                    }
-					{
+
-						config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]");
+                    if (string.IsNullOrWhiteSpace(userIdArg.Value) || !Guid.TryParse(userIdArg.Value, out Guid userId))
-						config.ShowHelp(true);
+                    {
-						return 1;
+                        config.Error.WriteLine($"User ID not provided");
-					}
+                        config.ShowHelp("user");
-					storageShort = (Int16) parsedStorage;
+                        return 1;
-				}
+                    }
-
+
-				GenerateUserLicense(new X509Certificate2(Cert.Value()!, "test"), CoreDll.Value(), name.Value, email.Value, storageShort, userId, key.Value);
+                    short storageShort = 0;
-
+                    if (!string.IsNullOrWhiteSpace(storage.Value))
-				return 0;
+                    {
-			});
+                        var parsedStorage = double.Parse(storage.Value);
-		});
+                        if (parsedStorage > short.MaxValue || parsedStorage < 0)
-		App.Command("org", config =>
+                        {
-		{
+                            config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + short.MaxValue + "]");
-			CommandArgument name = config.Argument("Name", "your name");
+                            config.ShowHelp("org");
-			CommandArgument email = config.Argument("Email", "your email");
+                            return 1;
-			CommandArgument installId = config.Argument("InstallId", "your installation id (GUID)");
+                        }
-			CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)");
+                        storageShort = (short) parsedStorage;
-			CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)");
+                    }
-			CommandArgument key = config.Argument("Key", "your key id (optional)");
+
-
+                    GenerateUserLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name.Value, email.Value, storageShort, userId, key.Value);
-			config.OnExecute(() =>
+
-			{
+                    return 0;
-				Check();
+                });
-
+            });
-				if (String.IsNullOrWhiteSpace(name.Value) || String.IsNullOrWhiteSpace(email.Value) || String.IsNullOrWhiteSpace(installId.Value))
+            app.Command("org", config =>
-				{
+            {
-					config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}' InstallId='{installId.Value}'");
+                var name = config.Argument("Name", "your name");
-					config.ShowHelp(true);
+                var email = config.Argument("Email", "your email");
-					return 1;
+                var installId = config.Argument("InstallId", "your installation id (GUID)");
-				}
+                var storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + short.MaxValue + " (optional, default = max)");
-
+                var businessName = config.Argument("BusinessName", "name for the organization (optional)");
-				if (!Guid.TryParse(installId.Value, out Guid installationId))
+                var key = config.Argument("Key", "your key id (optional)");
-				{
+                var help = config.HelpOption("--help | -h | -?");
-					config.Error.WriteLine("Unable to parse your installation id as a GUID");
+
-					config.Error.WriteLine($"Here's a new guid: {Guid.NewGuid()}");
+                config.OnExecute(() =>
-					config.ShowHelp(true);
+                {
-					return 1;
+                    if (!VerifyTopOptions())
-				}
+                    {
-
+                        if (!ExecExists() && !string.IsNullOrWhiteSpace(exec.Value())) config.Error.WriteLine($"Cant find single file executable at: {exec.Value()}");
-				Int16 storageShort = 0;
+                        if (!CoreExists() && !string.IsNullOrWhiteSpace(coreDll.Value())) config.Error.WriteLine($"Cant find core dll at: {coreDll.Value()}");
-				if (!String.IsNullOrWhiteSpace(storage.Value))
+                        if (!CertExists()) config.Error.WriteLine($"Cant find certificate at: {cert.Value()}");
-				{
+                        config.ShowHelp();
-					Double parsedStorage = Double.Parse(storage.Value);
+                        return 1;
-					if (parsedStorage is > Int16.MaxValue or < 0)
+                    }
-					{
+                    else if (string.IsNullOrWhiteSpace(name.Value) ||
-						config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]");
+                            string.IsNullOrWhiteSpace(email.Value) ||
-						config.ShowHelp(true);
+                            string.IsNullOrWhiteSpace(installId.Value))
-						return 1;
+                    {
-					}
+                        config.Error.WriteLine($"Some arguments are missing: Name='{name.Value}' Email='{email.Value}' InstallId='{installId.Value}'");
-					storageShort = (Int16)parsedStorage;
+                        config.ShowHelp("org");
-				}
+                        return 1;
-
+                    }
-				GenerateOrgLicense(new X509Certificate2(Cert.Value()!, "test"), CoreDll.Value(), name.Value, email.Value, storageShort, installationId, businessName.Value, key.Value);
+
-
+                    if (!Guid.TryParse(installId.Value, out Guid installationId))
-				return 0;
+                    {
-			});
+                        config.Error.WriteLine("Unable to parse your installation id as a GUID");
-		});
+                        config.Error.WriteLine($"Here's a new guid: {Guid.NewGuid()}");
-
+                        config.ShowHelp("org");
-		App.OnExecute(() =>
+                        return 1;
-		{
+                    }
-			App.ShowHelp();
+
-			return 10;
+                    short storageShort = 0;
-		});
+                    if (!string.IsNullOrWhiteSpace(storage.Value))
-
+                    {
-		try
+                        var parsedStorage = double.Parse(storage.Value);
-		{
+                        if (parsedStorage > short.MaxValue || parsedStorage < 0)
-			App.HelpOption("-? | -h | --help");
+                        {
-			return App.Execute(args);
+                            config.Error.WriteLine("The storage value provided is outside the accepted range of [0-" + short.MaxValue + "]");
-		}
+                            config.ShowHelp("org");
-		catch (Exception exception)
+                            return 1;
-		{
+                        }
-			Console.Error.WriteLine("Oops: {0}", exception);
+                        storageShort = (short) parsedStorage;
-			return 100;
+                    }
-		}
+
-	}
+                    GenerateOrgLicense(new X509Certificate2(cert.Value(), "test"), GetCoreDllPath(), name.Value, email.Value, storageShort, installationId, businessName.Value, key.Value);
-
+
-	private static void Check()
+                    return 0;
-	{
+                });
-		if (Cert == null || String.IsNullOrWhiteSpace(Cert.Value()))
+            });
-		{
+
-			App.Error.WriteLine("No certificate specified");
+            app.OnExecute(() =>
-			App.ShowHelp();
+            {
-			Environment.Exit(1);
+                app.ShowHelp();
-		}
+                return 10;
-		else if (CoreDll == null || String.IsNullOrWhiteSpace(CoreDll.Value()))
+            });
-		{
+
-			App.Error.WriteLine("No core dll specified");
+            app.HelpOption("-? | -h | --help");
-			App.ShowHelp();
+
-			Environment.Exit(1);
+            try
-		}
+            {
-		else if (!File.Exists(Cert.Value()))
+                return app.Execute(args);
-		{
+            }
-			App.Error.WriteLine($"Can't find certificate at: {Cert.Value()}");
+            catch (Exception e)
-			App.ShowHelp();
+            {
-			Environment.Exit(1);
+                Console.Error.WriteLine("Oops: {0}", e);
-		}
+                return 100;
-		else if (!File.Exists(CoreDll.Value()))
+            }
-		{
+        }
-			App.Error.WriteLine($"Can't find core dll at: {CoreDll.Value()}");
+
-			App.ShowHelp();
+        // checkUsername Checks that the username is a valid username
-			Environment.Exit(1);
+        private static bool CheckUsername(string s)
-		}
+        {
-	}
+            if ( string.IsNullOrWhiteSpace(s) ) {
-
+                WriteLineOver("The username provided doesn't appear to be valid.\n");
-	// checkUsername Checks that the username is a valid username
+                return false;
-	private static Boolean CheckUsername(String s)
+            }
-	{
+            return true;    // TODO: Actually validate
-		// TODO: Actually validate
+        }
-		if (!String.IsNullOrWhiteSpace(s)) return true;
+
-
+        // checkBusinessName Checks that the Business Name is a valid username
-		Console.WriteLine("The username provided doesn't appear to be valid!");
+        private static bool CheckBusinessName(string s)
-		return false;
+        {
-	}
+            if ( string.IsNullOrWhiteSpace(s) ) {
-
+                WriteLineOver("The Business Name provided doesn't appear to be valid.\n");
-	// checkBusinessName Checks that the Business Name is a valid username
+                return false;
-	private static Boolean CheckBusinessName(String s)
+            }
-	{
+            return true;    // TODO: Actually validate
-		// TODO: Actually validate
+        }
-		if (!String.IsNullOrWhiteSpace(s)) return true;
+
-
+        // checkEmail Checks that the email address is a valid email address
-		Console.WriteLine("The Business Name provided doesn't appear to be valid!");
+        private static bool CheckEmail(string s)
-		return false;
+        {
-	}
+            if ( string.IsNullOrWhiteSpace(s) ) {
-
+                WriteLineOver("The email provided doesn't appear to be valid.\n");
-	// checkEmail Checks that the email address is a valid email address
+                return false;
-	private static Boolean CheckEmail(String s)
+            }
-	{
+            return true;    // TODO: Actually validate
-		// TODO: Actually validate
+        }
-		if (!String.IsNullOrWhiteSpace(s)) return true;
+
-
+        // checkStorage Checks that the storage is in a valid range
-		Console.WriteLine("The email provided doesn't appear to be valid!");
+        private static bool CheckStorage(string s)
-		return false;
+        {
-	}
+            if (string.IsNullOrWhiteSpace(s))
-
+            {
-	// checkStorage Checks that the storage is in a valid range
+                WriteLineOver("The storage provided doesn't appear to be valid.\n");
-	private static Boolean CheckStorage(String s)
+                return false;
-	{
+            }
-		if (String.IsNullOrWhiteSpace(s))
+            if (double.Parse(s) > short.MaxValue || double.Parse(s) < 0)
-		{
+            {
-			Console.WriteLine("The storage provided doesn't appear to be valid!");
+                WriteLineOver("The storage value provided is outside the accepted range of [0-" + short.MaxValue + "].\n");
-			return false;
+                return false;
-		}
+            }
-
+            return true;
-		if (!(Double.Parse(s) > Int16.MaxValue) && !(Double.Parse(s) < 0)) return true;
+        }
-
+
-		Console.WriteLine("The storage value provided is outside the accepted range of [0-" + Int16.MaxValue + "]!");
+        // WriteLineOver Writes a new line to console over last line.
-		return false;
+        private static void WriteLineOver(string s)
-	}
+        {
-
+            Console.SetCursorPosition(0, Console.CursorTop -1);
-	private static readonly JsonSerializerOptions JsonOptions = new() { WriteIndented = true };
+            Console.WriteLine(s);
-	private static void GenerateUserLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid userId, String key)
+        }
-	{
+
-		Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
+        // WriteLine This wrapper is just here so that console writes all look similar.
-
+        private static void WriteLine(string s) => Console.WriteLine(s);
-		Type type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense");
+
-		Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
+        private static void GenerateUserLicense(X509Certificate2 cert, string corePath, string userName, string email, short storage, Guid userId, string key)
-
+        {
-		if (type == null)
+            var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath);
-		{
+
-			Console.WriteLine("Could not find type!");
+            var type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense");
-			return;
+            var licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
-		}
+
-		if (licenseTypeEnum == null)
+            var license = Activator.CreateInstance(type);
-		{
+
-			Console.WriteLine("Could not find license licenseTypeEnum!");
+            void set(string name, object value)
-			return;
+            {
-		}
+                type.GetProperty(name).SetValue(license, value);
-
+            }
-		Object license = Activator.CreateInstance(type);
+
-
+            set("LicenseKey", string.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
-		MethodInfo computeHash = type.GetMethod("ComputeHash");
+            set("Id", userId);
-		if (computeHash == null)
+            set("Name", userName);
-		{
+            set("Email", email);
-			Console.WriteLine("Could not find ComputeHash!");
+            set("Premium", true);
-			return;
+            set("MaxStorageGb", storage == 0 ? short.MaxValue : storage);
-		}
+            set("Version", 1);
-
+            set("Issued", DateTime.UtcNow);
-		MethodInfo sign = type.GetMethod("Sign");
+            set("Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
-		if (sign == null)
+            set("Expires", DateTime.UtcNow.AddYears(100));
-		{
+            set("Trial", false);
-			Console.WriteLine("Could not find sign!");
+            set("LicenseType", Enum.Parse(licenseTypeEnum, "User"));
-			return;
+
-		}
+            set("Hash", Convert.ToBase64String((byte[])type.GetMethod("ComputeHash").Invoke(license, new object[0])));
-
+            set("Signature", Convert.ToBase64String((byte[])type.GetMethod("Sign").Invoke(license, new object[] { cert })));
-		Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
+
-		Set(type, license, "Id", userId);
+            Console.WriteLine(JsonConvert.SerializeObject(license, Formatting.Indented));
-		Set(type, license, "Name", userName);
+        }
-		Set(type, license, "Email", email);
+
-		Set(type, license, "Premium", true);
+        private static void GenerateOrgLicense(X509Certificate2 cert, string corePath, string userName, string email, short storage, Guid instalId, string businessName, string key)
-		Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
+        {
-		Set(type, license, "Version", 1);
+            var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath);
-		Set(type, license, "Issued", DateTime.UtcNow);
+
-		Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
+            var type = core.GetType("Bit.Core.Billing.Organizations.Models.OrganizationLicense");
-		Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
+            var licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
-		Set(type, license, "Trial", false);
+            var planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");
-		Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "User"));
+
-		Set(type, license, "Hash", Convert.ToBase64String(((Byte[])computeHash.Invoke(license, []))!));
+            var license = Activator.CreateInstance(type);
-		Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
+
-
+            void set(string name, object value)
-		Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
+            {
-	}
+                type.GetProperty(name).SetValue(license, value);
-	private static void GenerateOrgLicense(X509Certificate2 cert, String corePath, String userName, String email, Int16 storage, Guid instalId, String businessName, String key)
+            }
-	{
+
-		Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.GetFullPath(corePath));
+            set("LicenseKey", string.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
-		Type type = core.GetType("Bit.Core.Billing.Organizations.Models.OrganizationLicense");
+            set("InstallationId", instalId);
-		Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
+            set("Id", Guid.NewGuid());
-		Type planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");
+            set("Name", userName);
-
+            set("BillingEmail", email);
-		if (type == null)
+            set("BusinessName", string.IsNullOrWhiteSpace(businessName) ? "BitBetter" : businessName);
-		{
+            set("Enabled", true);
-			Console.WriteLine("Could not find type!");
+            set("Plan", "Enterprise (Annually)");
-			return;
+            set("PlanType", Enum.Parse(planTypeEnum, "EnterpriseAnnually"));
-		}
+            set("Seats", int.MaxValue);
-		if (licenseTypeEnum == null)
+            set("MaxCollections", short.MaxValue);
-		{
+            set("UsePolicies", true);
-			Console.WriteLine("Could not find licenseTypeEnum!");
+            set("UseSso", true);
-			return;
+            set("UseKeyConnector", true);
-		}
+            set("UseScim", true);
-		if (planTypeEnum == null)
+            set("UseGroups", true);
-		{
+            set("UseEvents", true);
-			Console.WriteLine("Could not find planTypeEnum!");
+            set("UseDirectory", true);
-			return;
+            set("UseTotp", true);
-		}
+            set("Use2fa", true);
-
+            set("UseApi", true);
-		Object license = Activator.CreateInstance(type);
+            set("UseResetPassword", true);
-
+            set("UseCustomPermissions", true);
-		MethodInfo computeHash = type.GetMethod("ComputeHash");
+            set("MaxStorageGb", storage == 0 ? short.MaxValue : storage);
-		if (computeHash == null)
+            set("SelfHost", true);
-		{
+            set("UsersGetPremium", true);
-			Console.WriteLine("Could not find ComputeHash!");
+            set("UsePasswordManager", true);
-			return;
+            set("UseSecretsManager", true);
-		}
+            set("SmSeats", int.MaxValue);
-
+            set("SmServiceAccounts", int.MaxValue);
-		MethodInfo sign = type.GetMethod("Sign");
+            set("Version", 15); //This is set to 15 to use AllowAdminAccessToAllCollectionItems can be changed to 13 to just use Secrets Manager
-		if (sign == null)
+            set("Issued", DateTime.UtcNow);
-		{
+            set("Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
-			Console.WriteLine("Could not find sign!");
+            set("Expires", DateTime.UtcNow.AddYears(100));
-			return;
+            set("Trial", false);
-		}
+            set("LicenseType", Enum.Parse(licenseTypeEnum, "Organization"));
-
+            set("LimitCollectionCreationDeletion", true); //This will be used in the new version of BitWarden but can be applied now
-		Set(type, license, "LicenseKey", String.IsNullOrWhiteSpace(key) ? Guid.NewGuid().ToString("n") : key);
+            set("AllowAdminAccessToAllCollectionItems", true);
-		Set(type, license, "InstallationId", instalId);
+            set("UseRiskInsights", true);
-		Set(type, license, "Id", Guid.NewGuid());
+            set("UseOrganizationDomains", true);
-		Set(type, license, "Name", userName);
+            set("UseAdminSponsoredFamilies", true);
-		Set(type, license, "BillingEmail", email);
+
-		Set(type, license, "BusinessName", String.IsNullOrWhiteSpace(businessName) ? "BitBetter" : businessName);
+            set("Hash", Convert.ToBase64String((byte[])type.GetMethod("ComputeHash").Invoke(license, new object[0])));
-		Set(type, license, "Enabled", true);
+            set("Signature", Convert.ToBase64String((byte[])type.GetMethod("Sign").Invoke(license, new object[] { cert })));
-		Set(type, license, "Plan", "Enterprise (Annually)");
+
-		Set(type, license, "PlanType", Enum.Parse(planTypeEnum, "EnterpriseAnnually"));
+            Console.WriteLine(JsonConvert.SerializeObject(license, Formatting.Indented));
-		Set(type, license, "Seats", Int32.MaxValue);
+        }
-		Set(type, license, "MaxCollections", Int16.MaxValue);
+    }
-		Set(type, license, "UsePolicies", true);
+}
-		Set(type, license, "UseSso", true);
-		Set(type, license, "UseKeyConnector", true);
-		Set(type, license, "UseScim", true);
-		Set(type, license, "UseGroups", true);
-		Set(type, license, "UseEvents", true);
-		Set(type, license, "UseDirectory", true);
-		Set(type, license, "UseTotp", true);
-		Set(type, license, "Use2fa", true);
-		Set(type, license, "UseApi", true);
-		Set(type, license, "UseResetPassword", true);
-		Set(type, license, "MaxStorageGb", storage == 0 ? Int16.MaxValue : storage);
-		Set(type, license, "SelfHost", true);
-		Set(type, license, "UsersGetPremium", true);		
-		Set(type, license, "UseCustomPermissions", true);
-		Set(type, license, "Version", 16);
-		Set(type, license, "Issued", DateTime.UtcNow);
-		Set(type, license, "Refresh", DateTime.UtcNow.AddYears(100).AddMonths(-1));
-		Set(type, license, "Expires", DateTime.UtcNow.AddYears(100));
-		Set(type, license, "ExpirationWithoutGracePeriod", DateTime.UtcNow.AddYears(100));
-		Set(type, license, "UsePasswordManager", true);
-		Set(type, license, "UseSecretsManager", true);
-		Set(type, license, "SmSeats", Int32.MaxValue);
-		Set(type, license, "SmServiceAccounts", Int32.MaxValue);
-		Set(type, license, "UseRiskInsights", true);
-		Set(type, license, "LimitCollectionCreationDeletion", true);
-		Set(type, license, "AllowAdminAccessToAllCollectionItems", true);
-		Set(type, license, "Trial", false);
-		Set(type, license, "LicenseType", Enum.Parse(licenseTypeEnum, "Organization"));
-		Set(type, license, "UseOrganizationDomains", true);
-		Set(type, license, "UseAdminSponsoredFamilies", true);
-		Set(type, license, "Hash", Convert.ToBase64String((Byte[])computeHash.Invoke(license, [])!));
-		Set(type, license, "Signature", Convert.ToBase64String((Byte[])sign.Invoke(license, [cert])!));
-
-		Console.WriteLine(JsonSerializer.Serialize(license, JsonOptions));
-	}
-	private static void Set(Type type, Object license, String name, Object value)
-	{
-		type.GetProperty(name)?.SetValue(license, value);
-	}
-}

src/licenseGen/build.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR=`dirname "$0"`
+DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd`
+
+docker build -t bitbetter/licensegen "$DIR" # --squash

src/licenseGen/licenseGen.csproj

@@ -1,10 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="SingleFileExtractor.Core" Version="2.3.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
-</Project>
+
+</Project>

src/licenseGen/run.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+DIR=`dirname "$0"`
+DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd`
+
+# Grab the absolute path to the default pfx location
+cert_path="$DIR/../../.keys/cert.pfx"
+
+if [ "$#" -lt "2" ]; then
+    echo "USAGE: $0 <ABSOLUTE PATH TO CERT.PFX> <License Gen action> [License Gen args...]"
+    echo "ACTIONS:"
+    echo " interactive"
+    echo " user"
+    echo " org"
+    exit 1
+fi
+
+cert_path="$1"
+action="$2"
+shift
+
+if [ $action = "interactive" ]; then
+    docker run -it --rm -v "$cert_path:/cert.pfx" bitbetter/licensegen "$@"
+else
+    docker run --rm -v "$cert_path:/cert.pfx" bitbetter/licensegen "$@"
+fi

update-bitwarden.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+ask () {
+  local __resultVar=$1
+  local __result="$2"
+  if [ -z "$2" ]; then
+    read -p "$3" __result
+  fi
+  eval $__resultVar="'$__result'"
+}
+
+SCRIPT_BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+BW_VERSION=$(curl -sL https://go.btwrdn.co/bw-sh-versions | grep '^ *"'coreVersion'":' | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//')
+
+echo "Starting Bitwarden update, newest server version: $BW_VERSION"
+
+# Default path is the parent directory of the BitBetter location
+BITWARDEN_BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )"
+
+# Get Bitwarden base from user (or keep default value) or use first argument
+ask tmpbase "$1" "Enter Bitwarden base directory [$BITWARDEN_BASE]: "
+BITWARDEN_BASE=${tmpbase:-$BITWARDEN_BASE}
+
+# Check if directory exists and is valid
+[ -d "$BITWARDEN_BASE" ] || { echo "Bitwarden base directory $BITWARDEN_BASE not found!"; exit 1; }
+[ -f "$BITWARDEN_BASE/bitwarden.sh" ] || { echo "Bitwarden base directory $BITWARDEN_BASE is not valid!"; exit 1; }
+
+# Check if user wants to recreate the docker-compose override file
+RECREATE_OV="y"
+ask tmprecreate "$2" "Rebuild docker-compose override? [Y/n]: "
+RECREATE_OV=${tmprecreate:-$RECREATE_OV}
+
+if [[ $RECREATE_OV =~ ^[Yy]$ ]]
+then
+    {
+        echo "services:"
+        echo "  api:"
+        echo "    image: bitbetter/api:$BW_VERSION"
+        echo "    pull_policy: never"
+        echo ""
+        echo "  identity:"
+        echo "    image: bitbetter/identity:$BW_VERSION"
+        echo "    pull_policy: never"        
+        echo ""
+    } > $BITWARDEN_BASE/bwdata/docker/docker-compose.override.yml
+    echo "BitBetter docker-compose override created!"
+else
+    echo "Make sure to check if the docker override contains the correct image version ($BW_VERSION) in $BITWARDEN_BASE/bwdata/docker/docker-compose.override.yml!"
+fi
+
+# Check if user wants to rebuild the bitbetter images
+docker images bitbetter/api --format="{{ .Tag }}" | grep -F -- "${BW_VERSION}" > /dev/null
+retval=$?
+REBUILD_BB="n"
+REBUILD_BB_DESCR="[y/N]"
+if [ $retval -ne 0 ]; then
+    REBUILD_BB="y"
+    REBUILD_BB_DESCR="[Y/n]"
+fi
+ask tmprebuild "$3" "Rebuild BitBetter images? $REBUILD_BB_DESCR: "
+REBUILD_BB=${tmprebuild:-$REBUILD_BB}
+
+if [[ $REBUILD_BB =~ ^[Yy]$ ]]
+then
+    $SCRIPT_BASE/build.sh
+    echo "BitBetter images updated to version: $BW_VERSION"
+fi
+
+# Now start the bitwarden update
+cd $BITWARDEN_BASE
+
+./bitwarden.sh updateself
+
+# Update the bitwarden.sh: automatically patch run.sh to fix docker-compose pull errors for private images
+sed -i 's/chmod u+x $SCRIPTS_DIR\/run.sh/chmod u+x $SCRIPTS_DIR\/run.sh\n        sed -i \x27s\/dccmd pull\/dccmd pull --ignore-pull-failures || true\/g\x27 $SCRIPTS_DIR\/run.sh/g' -i $BITWARDEN_BASE/bitwarden.sh
+chmod +x $BITWARDEN_BASE/bitwarden.sh
+echo "Patching bitwarden.sh completed..."
+
+./bitwarden.sh update
+
+# Prune Docker images without at least one container associated to them.
+echo "Pruning Docker images without at least one container associated to them..."
+docker image prune -a
+
+cd $SCRIPT_BASE
+echo "Bitwarden update completed!"