nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-13 21:57:30 -05:00
Code Activity

backwards compat issues with change email/password

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-28 16:49:40 -04:00
parent 8d37f1c946
commit 23467b7771
5 changed files with 95 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Core/Models/Api/Request/Accounts/EmailRequestModel.cs
View File

@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel.DataAnnotations;
namespace Bit.Core.Models.Api
{
@ -19,4 +20,23 @@ namespace Bit.Core.Models.Api
[Required]
public DataReloadRequestModel Data { get; set; }
}
[Obsolete]
public class EmailRequestModel_Old
{
[Required]
[EmailAddress]
[StringLength(50)]
public string NewEmail { get; set; }
[Required]
[StringLength(300)]
public string MasterPasswordHash { get; set; }
[Required]
[StringLength(300)]
public string NewMasterPasswordHash { get; set; }
[Required]
public string Token { get; set; }
[Required]
public CipherRequestModel[] Ciphers { get; set; }
}
}

16
src/Core/Models/Api/Request/Accounts/PasswordRequestModel.cs
View File

@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel.DataAnnotations;
namespace Bit.Core.Models.Api
{
@ -13,4 +14,17 @@ namespace Bit.Core.Models.Api
[Required]
public DataReloadRequestModel Data { get; set; }
}
[Obsolete]
public class PasswordRequestModel_Old
{
[Required]
[StringLength(300)]
public string MasterPasswordHash { get; set; }
[Required]
[StringLength(300)]
public string NewMasterPasswordHash { get; set; }
[Required]
public CipherRequestModel[] Ciphers { get; set; }
}
}

11
src/Core/Models/Api/Request/CipherRequestModel.cs
View File

@ -59,6 +59,17 @@ namespace Bit.Core.Models.Api
return existingCipher;
}
[Obsolete]
public Folder ToFolder(Guid userId)
{
return new Folder
{
Id = new Guid(Id),
UserId = userId,
Name = Name
};
}
}
public class CipherShareRequestModel : IValidatableObject

9
src/Core/Repositories/SqlServer/CipherRepository.cs
View File

@ -192,7 +192,14 @@ namespace Bit.Core.Repositories.SqlServer
cmd.Parameters.Add("@EmailVerified", SqlDbType.NVarChar).Value = user.EmailVerified;
cmd.Parameters.Add("@MasterPassword", SqlDbType.NVarChar).Value = user.MasterPassword;
cmd.Parameters.Add("@SecurityStamp", SqlDbType.NVarChar).Value = user.SecurityStamp;
cmd.Parameters.Add("@PrivateKey", SqlDbType.VarChar).Value = user.PrivateKey;
if(string.IsNullOrWhiteSpace(user.PrivateKey))
{
cmd.Parameters.Add("@PrivateKey", SqlDbType.VarChar).Value = DBNull.Value;
}
else
{
cmd.Parameters.Add("@PrivateKey", SqlDbType.VarChar).Value = user.PrivateKey;
}
cmd.Parameters.Add("@RevisionDate", SqlDbType.DateTime2).Value = user.RevisionDate;
cmd.ExecuteNonQuery();
}