other/BitBetter
1
0
Fork 0
mirror of https://github.com/jakeswenson/BitBetter.git synced 2025-10-16 21:43:27 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: other:f3e36ab404e859587db7e677d248531522f91ad0
Branches Tags
other:master
other:unified
...
compare: other:df9e74bb7a028256b5a908770087714d36f0edca
Branches Tags
other:master
other:unified

2 Commits
f3e36ab404 ... df9e74bb7a

Author SHA1 Message Date
h44z
df9e74bb7a
Fix license generator according to upstream changes (#245) (#249) 2025-07-29 21:08:44 +00:00
Joseph Gigantino
ac01b0c7ec
Update build.sh (#246) 
Match change in upstream location of LicensingService.cs

Signed-off-by: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
 2025-07-29 19:45:55 +02:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
build.sh
View File

@ -16,7 +16,7 @@ git clone --branch "v${BW_VERSION}" --depth 1 https://github.com/bitwarden/serve
# Replace certificate file and thumbprint # Replace certificate file and thumbprint
old_thumbprint=$(openssl x509 -inform DER -fingerprint -noout -in $DIR/server/src/Core/licensing.cer | cut -d= -f2 | tr -d ':') old_thumbprint=$(openssl x509 -inform DER -fingerprint -noout -in $DIR/server/src/Core/licensing.cer | cut -d= -f2 | tr -d ':')
new_thumbprint=$(openssl x509 -inform DER -fingerprint -noout -in $DIR/.keys/cert.cert | cut -d= -f2 | tr -d ':') 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/Services/Implementations/LicensingService.cs 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 cp $DIR/.keys/cert.cert $DIR/server/src/Core/licensing.cer
docker build --no-cache --label com.bitwarden.product="bitbetter" $DIR/server -f $DIR/server/src/Api/Dockerfile -t bitbetter/api docker build --no-cache --label com.bitwarden.product="bitbetter" $DIR/server -f $DIR/server/src/Api/Dockerfile -t bitbetter/api

4
src/licenseGen/Program.cs
View File

@ -350,7 +350,7 @@ namespace BitwardenSelfLicensor
{ {
var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath);
var type = core.GetType("Bit.Core.Models.Business.UserLicense"); var type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense");
var licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType"); var licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
var license = Activator.CreateInstance(type); var license = Activator.CreateInstance(type);
@ -383,7 +383,7 @@ namespace BitwardenSelfLicensor
{ {
var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath);
var type = core.GetType("Bit.Core.Models.Business.OrganizationLicense"); var type = core.GetType("Bit.Core.Billing.Models.Business.OrganizationLicense");
var licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType"); var licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
var planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType"); var planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");