mirror of
https://github.com/bitwarden/server.git
synced 2025-05-20 11:04:31 -05:00
added user email verification bit
This commit is contained in:
parent
5d7a0216bf
commit
f3e3474746
@ -8,6 +8,7 @@ namespace Bit.Core.Domains
|
|||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public string Email { get; set; }
|
public string Email { get; set; }
|
||||||
|
public bool EmailVerified { get; set; }
|
||||||
public string MasterPassword { get; set; }
|
public string MasterPassword { get; set; }
|
||||||
public string MasterPasswordHint { get; set; }
|
public string MasterPasswordHint { get; set; }
|
||||||
public string Culture { get; set; } = "en-US";
|
public string Culture { get; set; } = "en-US";
|
||||||
|
@ -39,6 +39,7 @@ namespace Bit.Core.Repositories.SqlServer
|
|||||||
cmd.CommandType = CommandType.StoredProcedure;
|
cmd.CommandType = CommandType.StoredProcedure;
|
||||||
cmd.Parameters.Add("@Id", SqlDbType.UniqueIdentifier).Value = new Guid(user.Id);
|
cmd.Parameters.Add("@Id", SqlDbType.UniqueIdentifier).Value = new Guid(user.Id);
|
||||||
cmd.Parameters.Add("@Email", SqlDbType.NVarChar).Value = user.Email;
|
cmd.Parameters.Add("@Email", SqlDbType.NVarChar).Value = user.Email;
|
||||||
|
cmd.Parameters.Add("@EmailVerified", SqlDbType.NVarChar).Value = user.EmailVerified;
|
||||||
cmd.Parameters.Add("@MasterPassword", SqlDbType.NVarChar).Value = user.MasterPassword;
|
cmd.Parameters.Add("@MasterPassword", SqlDbType.NVarChar).Value = user.MasterPassword;
|
||||||
cmd.Parameters.Add("@SecurityStamp", SqlDbType.NVarChar).Value = user.SecurityStamp;
|
cmd.Parameters.Add("@SecurityStamp", SqlDbType.NVarChar).Value = user.SecurityStamp;
|
||||||
cmd.Parameters.Add("@RevisionDate", SqlDbType.DateTime2).Value = user.RevisionDate;
|
cmd.Parameters.Add("@RevisionDate", SqlDbType.DateTime2).Value = user.RevisionDate;
|
||||||
|
@ -13,6 +13,7 @@ namespace Bit.Core.Repositories.SqlServer.Models
|
|||||||
Id = new Guid(user.Id);
|
Id = new Guid(user.Id);
|
||||||
Name = user.Name;
|
Name = user.Name;
|
||||||
Email = user.Email;
|
Email = user.Email;
|
||||||
|
EmailVerified = user.EmailVerified;
|
||||||
MasterPassword = user.MasterPassword;
|
MasterPassword = user.MasterPassword;
|
||||||
MasterPasswordHint = user.MasterPasswordHint;
|
MasterPasswordHint = user.MasterPasswordHint;
|
||||||
Culture = user.Culture;
|
Culture = user.Culture;
|
||||||
@ -27,6 +28,7 @@ namespace Bit.Core.Repositories.SqlServer.Models
|
|||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public string Email { get; set; }
|
public string Email { get; set; }
|
||||||
|
public bool EmailVerified { get; set; }
|
||||||
public string MasterPassword { get; set; }
|
public string MasterPassword { get; set; }
|
||||||
public string MasterPasswordHint { get; set; }
|
public string MasterPasswordHint { get; set; }
|
||||||
public string Culture { get; set; }
|
public string Culture { get; set; }
|
||||||
@ -44,6 +46,7 @@ namespace Bit.Core.Repositories.SqlServer.Models
|
|||||||
Id = Id.ToString(),
|
Id = Id.ToString(),
|
||||||
Name = Name,
|
Name = Name,
|
||||||
Email = Email,
|
Email = Email,
|
||||||
|
EmailVerified = EmailVerified,
|
||||||
MasterPassword = MasterPassword,
|
MasterPassword = MasterPassword,
|
||||||
MasterPasswordHint = MasterPasswordHint,
|
MasterPasswordHint = MasterPasswordHint,
|
||||||
Culture = Culture,
|
Culture = Culture,
|
||||||
|
@ -140,6 +140,7 @@ namespace Bit.Core.Services
|
|||||||
}
|
}
|
||||||
|
|
||||||
user.Email = newEmail;
|
user.Email = newEmail;
|
||||||
|
user.EmailVerified = true;
|
||||||
await _cipherRepository.UpdateUserEmailPasswordAndCiphersAsync(user, ciphers);
|
await _cipherRepository.UpdateUserEmailPasswordAndCiphersAsync(user, ciphers);
|
||||||
return IdentityResult.Success;
|
return IdentityResult.Success;
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
@Id UNIQUEIDENTIFIER,
|
@Id UNIQUEIDENTIFIER,
|
||||||
@Name NVARCHAR(50),
|
@Name NVARCHAR(50),
|
||||||
@Email NVARCHAR(50),
|
@Email NVARCHAR(50),
|
||||||
|
@EmailVerified BIT,
|
||||||
@MasterPassword NVARCHAR(300),
|
@MasterPassword NVARCHAR(300),
|
||||||
@MasterPasswordHint NVARCHAR(50),
|
@MasterPasswordHint NVARCHAR(50),
|
||||||
@Culture NVARCHAR(10),
|
@Culture NVARCHAR(10),
|
||||||
@ -18,6 +19,7 @@ BEGIN
|
|||||||
[Id],
|
[Id],
|
||||||
[Name],
|
[Name],
|
||||||
[Email],
|
[Email],
|
||||||
|
[EmailVerified],
|
||||||
[MasterPassword],
|
[MasterPassword],
|
||||||
[MasterPasswordHint],
|
[MasterPasswordHint],
|
||||||
[Culture],
|
[Culture],
|
||||||
@ -33,6 +35,7 @@ BEGIN
|
|||||||
@Id,
|
@Id,
|
||||||
@Name,
|
@Name,
|
||||||
@Email,
|
@Email,
|
||||||
|
@EmailVerified,
|
||||||
@MasterPassword,
|
@MasterPassword,
|
||||||
@MasterPasswordHint,
|
@MasterPasswordHint,
|
||||||
@Culture,
|
@Culture,
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
@Id UNIQUEIDENTIFIER,
|
@Id UNIQUEIDENTIFIER,
|
||||||
@Name NVARCHAR(50),
|
@Name NVARCHAR(50),
|
||||||
@Email NVARCHAR(50),
|
@Email NVARCHAR(50),
|
||||||
|
@EmailVerified BIT,
|
||||||
@MasterPassword NVARCHAR(300),
|
@MasterPassword NVARCHAR(300),
|
||||||
@MasterPasswordHint NVARCHAR(50),
|
@MasterPasswordHint NVARCHAR(50),
|
||||||
@Culture NVARCHAR(10),
|
@Culture NVARCHAR(10),
|
||||||
@ -18,6 +19,7 @@ BEGIN
|
|||||||
SET
|
SET
|
||||||
[Name] = @Name,
|
[Name] = @Name,
|
||||||
[Email] = @Email,
|
[Email] = @Email,
|
||||||
|
[EmailVerified] = @EmailVerified,
|
||||||
[MasterPassword] = @MasterPassword,
|
[MasterPassword] = @MasterPassword,
|
||||||
[MasterPasswordHint] = @MasterPasswordHint,
|
[MasterPasswordHint] = @MasterPasswordHint,
|
||||||
[Culture] = @Culture,
|
[Culture] = @Culture,
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
CREATE PROCEDURE [dbo].[User_UpdateEmailPassword]
|
CREATE PROCEDURE [dbo].[User_UpdateEmailPassword]
|
||||||
@Id UNIQUEIDENTIFIER,
|
@Id UNIQUEIDENTIFIER,
|
||||||
@Email NVARCHAR(50),
|
@Email NVARCHAR(50),
|
||||||
|
@EmailVerified BIT,
|
||||||
@MasterPassword NVARCHAR(300),
|
@MasterPassword NVARCHAR(300),
|
||||||
@SecurityStamp NVARCHAR(50),
|
@SecurityStamp NVARCHAR(50),
|
||||||
@RevisionDate DATETIME2(7)
|
@RevisionDate DATETIME2(7)
|
||||||
@ -10,6 +11,7 @@ BEGIN
|
|||||||
[dbo].[User]
|
[dbo].[User]
|
||||||
SET
|
SET
|
||||||
[Email] = @Email,
|
[Email] = @Email,
|
||||||
|
[EmailVerified] = @EmailVerified,
|
||||||
[MasterPassword] = @MasterPassword,
|
[MasterPassword] = @MasterPassword,
|
||||||
[SecurityStamp] = @SecurityStamp,
|
[SecurityStamp] = @SecurityStamp,
|
||||||
[RevisionDate] = @RevisionDate
|
[RevisionDate] = @RevisionDate
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
[Id] UNIQUEIDENTIFIER NOT NULL,
|
[Id] UNIQUEIDENTIFIER NOT NULL,
|
||||||
[Name] NVARCHAR (50) NULL,
|
[Name] NVARCHAR (50) NULL,
|
||||||
[Email] NVARCHAR (50) NOT NULL,
|
[Email] NVARCHAR (50) NOT NULL,
|
||||||
|
[EmailVerified] BIT NOT NULL,
|
||||||
[MasterPassword] NVARCHAR (300) NOT NULL,
|
[MasterPassword] NVARCHAR (300) NOT NULL,
|
||||||
[MasterPasswordHint] NVARCHAR (50) NULL,
|
[MasterPasswordHint] NVARCHAR (50) NULL,
|
||||||
[Culture] NVARCHAR (10) NOT NULL,
|
[Culture] NVARCHAR (10) NOT NULL,
|
||||||
@ -16,6 +17,6 @@
|
|||||||
|
|
||||||
|
|
||||||
GO
|
GO
|
||||||
CREATE NONCLUSTERED INDEX [IX_User_Email]
|
CREATE UNIQUE NONCLUSTERED INDEX [IX_User_Email]
|
||||||
ON [dbo].[User]([Email] ASC);
|
ON [dbo].[User]([Email] ASC);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user