nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

Reference id storage and signup

Browse Source
This commit is contained in:
Chad Scharf
2020-06-25 12:28:22 -04:00
parent f23a8edc45
commit fca7b162bf
11 changed files with 472 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs
View File

@ -25,6 +25,7 @@ namespace Bit.Core.Models.Api
public Guid? OrganizationUserId { get; set; }
public KdfType? Kdf { get; set; }
public int? KdfIterations { get; set; }
public string ReferenceId { get; set; }
public User ToUser()
{
@ -34,7 +35,8 @@ namespace Bit.Core.Models.Api
Email = Email,
MasterPasswordHint = MasterPasswordHint,
Kdf = Kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256),
KdfIterations = KdfIterations.GetValueOrDefault(5000)
KdfIterations = KdfIterations.GetValueOrDefault(5000),
ReferenceId = ReferenceId,
};
if (Key != null)

1
src/Core/Models/Table/Organization.cs
View File

@ -38,6 +38,7 @@ namespace Bit.Core.Models.Table
public GatewayType? Gateway { get; set; }
public string GatewayCustomerId { get; set; }
public string GatewaySubscriptionId { get; set; }
public string ReferenceId { get; set; }
public bool Enabled { get; set; } = true;
public string LicenseKey { get; set; }
public string ApiKey { get; set; }

1
src/Core/Models/Table/User.cs
View File

@ -37,6 +37,7 @@ namespace Bit.Core.Models.Table
public GatewayType? Gateway { get; set; }
public string GatewayCustomerId { get; set; }
public string GatewaySubscriptionId { get; set; }
public string ReferenceId { get; set; }
public string LicenseKey { get; set; }
public KdfType Kdf { get; set; } = KdfType.PBKDF2_SHA256;
public int KdfIterations { get; set; } = 5000;

4
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -467,11 +467,12 @@ namespace Bit.Core.Services
UsersGetPremium = plan.UsersGetPremium || signup.PremiumAccessAddon,
Plan = plan.Name,
Gateway = null,
ReferenceId = signup.Owner.ReferenceId,
Enabled = true,
LicenseKey = CoreHelpers.SecureRandomString(20),
ApiKey = CoreHelpers.SecureRandomString(30),
CreationDate = DateTime.UtcNow,
RevisionDate = DateTime.UtcNow
RevisionDate = DateTime.UtcNow,
};
if (plan.Type == PlanType.Free)
@ -541,6 +542,7 @@ namespace Bit.Core.Services
Gateway = null,
GatewayCustomerId = null,
GatewaySubscriptionId = null,
ReferenceId = owner.ReferenceId,
Enabled = license.Enabled,
ExpirationDate = license.Expires,
LicenseKey = license.LicenseKey,

5
src/Sql/dbo/Stored Procedures/Organization_Create.sql
View File

@ -26,6 +26,7 @@
@Gateway TINYINT,
@GatewayCustomerId VARCHAR(50),
@GatewaySubscriptionId VARCHAR(50),
@ReferenceId VARCHAR(50),
@Enabled BIT,
@LicenseKey VARCHAR(100),
@ApiKey VARCHAR(30),
@ -66,6 +67,7 @@ BEGIN
[Gateway],
[GatewayCustomerId],
[GatewaySubscriptionId],
[ReferenceId],
[Enabled],
[LicenseKey],
[ApiKey],
@ -103,6 +105,7 @@ BEGIN
@Gateway,
@GatewayCustomerId,
@GatewaySubscriptionId,
@ReferenceId,
@Enabled,
@LicenseKey,
@ApiKey,
@ -111,4 +114,4 @@ BEGIN
@CreationDate,
@RevisionDate
)
END
END

4
src/Sql/dbo/Stored Procedures/Organization_Update.sql
View File

@ -26,6 +26,7 @@
@Gateway TINYINT,
@GatewayCustomerId VARCHAR(50),
@GatewaySubscriptionId VARCHAR(50),
@ReferenceId VARCHAR(50),
@Enabled BIT,
@LicenseKey VARCHAR(100),
@ApiKey VARCHAR(30),
@ -66,6 +67,7 @@ BEGIN
[Gateway] = @Gateway,
[GatewayCustomerId] = @GatewayCustomerId,
[GatewaySubscriptionId] = @GatewaySubscriptionId,
[ReferenceId] = @ReferenceId,
[Enabled] = @Enabled,
[LicenseKey] = @LicenseKey,
[ApiKey] = @ApiKey,
@ -75,4 +77,4 @@ BEGIN
[RevisionDate] = @RevisionDate
WHERE
[Id] = @Id
END
END

5
src/Sql/dbo/Stored Procedures/User_Create.sql
View File

@ -23,6 +23,7 @@
@Gateway TINYINT,
@GatewayCustomerId VARCHAR(50),
@GatewaySubscriptionId VARCHAR(50),
@ReferenceId VARCHAR(50),
@LicenseKey VARCHAR(100),
@Kdf TINYINT,
@KdfIterations INT,
@ -58,6 +59,7 @@ BEGIN
[Gateway],
[GatewayCustomerId],
[GatewaySubscriptionId],
[ReferenceId],
[LicenseKey],
[Kdf],
[KdfIterations],
@ -90,10 +92,11 @@ BEGIN
@Gateway,
@GatewayCustomerId,
@GatewaySubscriptionId,
@ReferenceId,
@LicenseKey,
@Kdf,
@KdfIterations,
@CreationDate,
@RevisionDate
)
END
END

4
src/Sql/dbo/Stored Procedures/User_Update.sql
View File

@ -23,6 +23,7 @@
@Gateway TINYINT,
@GatewayCustomerId VARCHAR(50),
@GatewaySubscriptionId VARCHAR(50),
@ReferenceId VARCHAR(50),
@LicenseKey VARCHAR(100),
@Kdf TINYINT,
@KdfIterations INT,
@ -58,6 +59,7 @@ BEGIN
[Gateway] = @Gateway,
[GatewayCustomerId] = @GatewayCustomerId,
[GatewaySubscriptionId] = @GatewaySubscriptionId,
[ReferenceId] = @ReferenceId,
[LicenseKey] = @LicenseKey,
[Kdf] = @Kdf,
[KdfIterations] = @KdfIterations,
@ -65,4 +67,4 @@ BEGIN
[RevisionDate] = @RevisionDate
WHERE
[Id] = @Id
END
END

1
src/Sql/dbo/Tables/Organization.sql
View File

@ -27,6 +27,7 @@
[Gateway] TINYINT NULL,
[GatewayCustomerId] VARCHAR (50) NULL,
[GatewaySubscriptionId] VARCHAR (50) NULL,
[ReferenceId] NVARCHAR (50) NULL,
[Enabled] BIT NOT NULL,
[LicenseKey] VARCHAR (100) NULL,
[ApiKey] VARCHAR (30) NOT NULL,

1
src/Sql/dbo/Tables/User.sql
View File

@ -23,6 +23,7 @@
[Gateway] TINYINT NULL,
[GatewayCustomerId] VARCHAR (50) NULL,
[GatewaySubscriptionId] VARCHAR (50) NULL,
[ReferenceId] NVARCHAR (50) NULL,
[LicenseKey] VARCHAR (100) NULL,
[Kdf] TINYINT NOT NULL,
[KdfIterations] INT NOT NULL,