mirror of
https://github.com/bitwarden/server
synced 2026-01-09 20:13:24 +00:00
Merge branch 'master' into feature/billing-obfuscation
# Conflicts: # src/Core/Enums/ReferenceEventType.cs # src/Core/Services/IMailService.cs # src/Core/Services/Implementations/HandlebarsMailService.cs # src/Core/Services/Implementations/OrganizationService.cs # src/Core/Services/NoopImplementations/NoopMailService.cs
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
@RequestDeviceIdentifier NVARCHAR(50),
|
||||
@RequestDeviceType TINYINT,
|
||||
@RequestIpAddress VARCHAR(50),
|
||||
@RequestFingerprint VARCHAR(MAX),
|
||||
@ResponseDeviceId UNIQUEIDENTIFIER,
|
||||
@AccessCode VARCHAR(25),
|
||||
@PublicKey VARCHAR(MAX),
|
||||
@@ -27,7 +26,6 @@ BEGIN
|
||||
[RequestDeviceIdentifier],
|
||||
[RequestDeviceType],
|
||||
[RequestIpAddress],
|
||||
[RequestFingerprint],
|
||||
[ResponseDeviceId],
|
||||
[AccessCode],
|
||||
[PublicKey],
|
||||
@@ -46,7 +44,6 @@ BEGIN
|
||||
@RequestDeviceIdentifier,
|
||||
@RequestDeviceType,
|
||||
@RequestIpAddress,
|
||||
@RequestFingerprint,
|
||||
@ResponseDeviceId,
|
||||
@AccessCode,
|
||||
@PublicKey,
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
@RequestDeviceIdentifier NVARCHAR(50),
|
||||
@RequestDeviceType SMALLINT,
|
||||
@RequestIpAddress VARCHAR(50),
|
||||
@RequestFingerprint VARCHAR(MAX),
|
||||
@ResponseDeviceId UNIQUEIDENTIFIER,
|
||||
@AccessCode VARCHAR(25),
|
||||
@PublicKey VARCHAR(MAX),
|
||||
@@ -27,7 +26,6 @@ BEGIN
|
||||
[RequestDeviceIdentifier] = @RequestDeviceIdentifier,
|
||||
[RequestDeviceType] = @RequestDeviceType,
|
||||
[RequestIpAddress] = @RequestIpAddress,
|
||||
[RequestFingerprint] = @RequestFingerprint,
|
||||
[ResponseDeviceId] = @ResponseDeviceId,
|
||||
[AccessCode] = @AccessCode,
|
||||
[PublicKey] = @PublicKey,
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
[RequestDeviceIdentifier] NVARCHAR(50) NOT NULL,
|
||||
[RequestDeviceType] SMALLINT NOT NULL,
|
||||
[RequestIpAddress] VARCHAR(50) NOT NULL,
|
||||
[RequestFingerprint] VARCHAR(MAX) NOT NULL,
|
||||
[ResponseDeviceId] UNIQUEIDENTIFIER NULL,
|
||||
[AccessCode] VARCHAR(25) NOT NULL,
|
||||
[PublicKey] VARCHAR(MAX) NOT NULL,
|
||||
|
||||
Reference in New Issue
Block a user