nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

Refactor naming: Sites => Logins

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-02 21:52:13 -05:00
parent 7e56797847
commit 9cde513026
11 changed files with 86 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Api/Models/SiteDataModel.cs → src/Api/Models/LoginDataModel.cs
View File

@ -4,20 +4,20 @@ using Newtonsoft.Json;
namespace Bit.Api.Models
{
public class SiteDataModel
public class LoginDataModel
{
public SiteDataModel() { }
public LoginDataModel() { }
public SiteDataModel(SiteRequestModel site)
public LoginDataModel(LoginRequestModel login)
{
Name = site.Name;
Uri = site.Uri;
Username = site.Username;
Password = site.Password;
Notes = site.Notes;
Name = login.Name;
Uri = login.Uri;
Username = login.Username;
Password = login.Password;
Notes = login.Notes;
}
public SiteDataModel(CipherRequestModel cipher)
public LoginDataModel(CipherRequestModel cipher)
{
Name = cipher.Name;
Uri = cipher.Uri;
@ -26,14 +26,14 @@ namespace Bit.Api.Models
Notes = cipher.Notes;
}
public SiteDataModel(Cipher cipher)
public LoginDataModel(Cipher cipher)
{
if(cipher.Type != Core.Enums.CipherType.Site)
if(cipher.Type != Core.Enums.CipherType.Login)
{
throw new ArgumentException("Cipher is not correct type.");
}
var data = JsonConvert.DeserializeObject<SiteDataModel>(cipher.Data);
var data = JsonConvert.DeserializeObject<LoginDataModel>(cipher.Data);
Name = data.Name;
Uri = data.Uri;

14
src/Api/Models/Request/Accounts/ImportRequestModel.cs
View File

@ -5,8 +5,20 @@ namespace Bit.Api.Models
{
public class ImportRequestModel
{
private LoginRequestModel[] _logins;
public FolderRequestModel[] Folders { get; set; }
public SiteRequestModel[] Sites { get; set; }
[Obsolete]
public LoginRequestModel[] Sites
{
get { return _logins; }
set { _logins = value; }
}
public LoginRequestModel[] Logins
{
get { return _logins; }
set { _logins = value; }
}
public KeyValuePair<int, int>[] FolderRelationships { get; set; }
}
}

4
src/Api/Models/Request/CipherRequestModel.cs
View File

@ -48,8 +48,8 @@ namespace Bit.Api.Models
case CipherType.Folder:
cipher.Data = JsonConvert.SerializeObject(new FolderDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
break;
case CipherType.Site:
cipher.Data = JsonConvert.SerializeObject(new SiteDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
case CipherType.Login:
cipher.Data = JsonConvert.SerializeObject(new LoginDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
break;
default:
throw new ArgumentException("Unsupported " + nameof(Type) + ".");

15
src/Api/Models/Request/SiteRequestModel.cs → src/Api/Models/Request/LoginRequestModel.cs
View File

@ -6,7 +6,7 @@ using Newtonsoft.Json;
namespace Bit.Api.Models
{
public class SiteRequestModel
public class LoginRequestModel
{
[StringLength(36)]
public string FolderId { get; set; }
@ -36,14 +36,15 @@ namespace Bit.Api.Models
});
}
public Cipher ToCipher(Cipher existingSite)
public Cipher ToCipher(Cipher existingLogin)
{
existingSite.FolderId = string.IsNullOrWhiteSpace(FolderId) ? null : (Guid?)new Guid(FolderId);
existingSite.Favorite = Favorite;
existingSite.Data = JsonConvert.SerializeObject(new SiteDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
existingSite.Type = Core.Enums.CipherType.Site;
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 = Core.Enums.CipherType.Login;
return existingSite;
return existingLogin;
}
}
}

4
src/Api/Models/Response/CipherResponseModel.cs
View File

@ -24,8 +24,8 @@ namespace Bit.Api.Models
case Core.Enums.CipherType.Folder:
Data = new FolderDataModel(cipher);
break;
case Core.Enums.CipherType.Site:
Data = new SiteDataModel(cipher);
case Core.Enums.CipherType.Login:
Data = new LoginDataModel(cipher);
break;
default:
throw new ArgumentException("Unsupported " + nameof(Type) + ".");

10
src/Api/Models/Response/SiteResponseModel.cs → src/Api/Models/Response/LoginResponseModel.cs
View File

@ -3,22 +3,22 @@ using Bit.Core.Domains;
namespace Bit.Api.Models
{
public class SiteResponseModel : ResponseModel
public class LoginResponseModel : ResponseModel
{
public SiteResponseModel(Cipher cipher)
: base("site")
public LoginResponseModel(Cipher cipher)
: base("login")
{
if(cipher == null)
{
throw new ArgumentNullException(nameof(cipher));
}
if(cipher.Type != Core.Enums.CipherType.Site)
if(cipher.Type != Core.Enums.CipherType.Login)
{
throw new ArgumentException(nameof(cipher.Type));
}
var data = new SiteDataModel(cipher);
var data = new LoginDataModel(cipher);
Id = cipher.Id.ToString();
FolderId = cipher.FolderId?.ToString();