bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-20 02:03:46 +00:00
Code Issues Releases Wiki Activity

remove deprecated code

Browse Source
This commit is contained in:
Kyle Spearrin
2017-10-06 15:29:36 -04:00
parent 78f18cac17
commit 91e1c5878c
6 changed files with 4 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,23 +32,6 @@ namespace Bit.Core.Models.Api
public CardType Card { get; set; }
public SecureNoteType SecureNote { get; set; }
[Obsolete("Use Login property")]
[EncryptedString]
[StringLength(10000)]
public string Uri { get; set; }
[Obsolete("Use Login property")]
[EncryptedString]
[StringLength(1000)]
public string Username { get; set; }
[Obsolete("Use Login property")]
[EncryptedString]
[StringLength(1000)]
public string Password { get; set; }
[Obsolete("Use Login property")]
[EncryptedString]
[StringLength(1000)]
public string Totp { get; set; }
public CipherDetails ToCipherDetails(Guid userId)
{
var cipher = new CipherDetails

92
src/Core/Models/Api/Request/LoginRequestModel.cs
View File

@@ -1,92 +0,0 @@
using System;
using System.ComponentModel.DataAnnotations;
using Bit.Core.Utilities;
using Newtonsoft.Json;
using Core.Models.Data;
using Bit.Core.Models.Table;
using System.Collections.Generic;
namespace Bit.Core.Models.Api
{
public class LoginRequestModel
{
[StringLength(36)]
public string OrganizationId { get; set; }
[StringLength(36)]
public string FolderId { get; set; }
public bool Favorite { get; set; }
[Required]
[EncryptedString]
[StringLength(1000)]
public string Name { get; set; }
[EncryptedString]
[StringLength(10000)]
public string Uri { get; set; }
[EncryptedString]
[StringLength(1000)]
public string Username { get; set; }
[EncryptedString]
[StringLength(1000)]
public string Password { get; set; }
[EncryptedString]
[StringLength(10000)]
public string Notes { get; set; }
[EncryptedString]
[StringLength(1000)]
public string Totp { get; set; }
public IEnumerable<FieldDataModel> Fields { get; set; }
public CipherDetails ToCipherDetails(Guid userId)
{
return ToCipherDetails(new CipherDetails
{
UserId = string.IsNullOrWhiteSpace(OrganizationId) ? (Guid?)userId : null,
OrganizationId = string.IsNullOrWhiteSpace(OrganizationId) ? (Guid?)null : new Guid(OrganizationId),
Edit = true
});
}
public CipherDetails ToOrganizationCipherDetails(Guid orgId)
{
return ToCipherDetails(new CipherDetails
{
OrganizationId = orgId,
Edit = true
});
}
public Cipher ToOrganizationCipher()
{
if(string.IsNullOrWhiteSpace(OrganizationId))
{
throw new ArgumentNullException(nameof(OrganizationId));
}
return ToCipher(new Cipher
{
OrganizationId = new Guid(OrganizationId)
});
}
public CipherDetails ToCipherDetails(CipherDetails existingLogin)
{
existingLogin.FolderId = string.IsNullOrWhiteSpace(FolderId) ? null : (Guid?)new Guid(FolderId);
existingLogin.Favorite = Favorite;
existingLogin.Data = JsonConvert.SerializeObject(new LoginDataModel(this),
new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
existingLogin.Type = Enums.CipherType.Login;
return existingLogin;
}
public Cipher ToCipher(Cipher existingLogin)
{
existingLogin.Data = JsonConvert.SerializeObject(new LoginDataModel(this),
new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
existingLogin.Type = Enums.CipherType.Login;
return existingLogin;
}
}
}