1
0
mirror of https://github.com/bitwarden/mobile synced 2026-01-06 18:43:43 +00:00
This commit is contained in:
Kyle Spearrin
2016-05-03 02:08:50 -04:00
parent c6222c8ed3
commit 92e74274e0
24 changed files with 574 additions and 214 deletions

View File

@@ -2,6 +2,11 @@
{
public class FolderRequest
{
public FolderRequest(Folder folder)
{
Name = folder.Name?.EncryptedString;
}
public string Name { get; set; }
}
}

View File

@@ -2,6 +2,16 @@
{
public class SiteRequest
{
public SiteRequest(Site site)
{
FolderId = site.FolderId;
Name = site.Name?.EncryptedString;
Uri = site.Uri?.EncryptedString;
Username = site.Username?.EncryptedString;
Password = site.Password?.EncryptedString;
Notes = site.Notes?.EncryptedString;
}
public string FolderId { get; set; }
public string Name { get; set; }
public string Uri { get; set; }

View File

@@ -4,8 +4,7 @@ namespace Bit.App.Models
{
public abstract class Cipher
{
public int Id { get; set; }
public string ServerId { get; set; }
public string Id { get; set; }
public CipherString Name { get; set; }
}
}

View File

@@ -1,11 +1,12 @@
using System;
using SQLite;
using Bit.App.Abstractions;
using Bit.App.Models.Api;
namespace Bit.App.Models.Data
{
[Table("Folder")]
public class FolderData : IDataObject<int>
public class FolderData : IDataObject<string>
{
public FolderData()
{ }
@@ -13,15 +14,19 @@ namespace Bit.App.Models.Data
public FolderData(Folder folder, string userId)
{
Id = folder.Id;
ServerId = folder.ServerId;
UserId = userId;
Name = folder.Name?.EncryptedString;
}
public FolderData(FolderResponse folder, string userId)
{
Id = folder.Id;
UserId = userId;
Name = folder.Name;
}
[PrimaryKey]
[AutoIncrement]
public int Id { get; set; }
public string ServerId { get; set; }
public string Id { get; set; }
public string UserId { get; set; }
public string Name { get; set; }
public DateTime RevisionDateTime { get; set; } = DateTime.UtcNow;

View File

@@ -1,11 +1,12 @@
using System;
using SQLite;
using Bit.App.Abstractions;
using Bit.App.Models.Api;
namespace Bit.App.Models.Data
{
[Table("Site")]
public class SiteData : IDataObject<int>
public class SiteData : IDataObject<string>
{
public SiteData()
{ }
@@ -13,9 +14,7 @@ namespace Bit.App.Models.Data
public SiteData(Site site, string userId)
{
Id = site.Id;
ServerId = site.ServerId;
FolderId = site.FolderId;
ServerFolderId = site.ServerFolderId;
UserId = userId;
Name = site.Name?.EncryptedString;
Uri = site.Uri?.EncryptedString;
@@ -24,12 +23,21 @@ namespace Bit.App.Models.Data
Notes = site.Notes?.EncryptedString;
}
public SiteData(SiteResponse site, string userId)
{
Id = site.Id;
FolderId = site.FolderId;
UserId = userId;
Name = site.Name;
Uri = site.Uri;
Username = site.Username;
Password = site.Password;
Notes = site.Notes;
}
[PrimaryKey]
[AutoIncrement]
public int Id { get; set; }
public string ServerId { get; set; }
public int? FolderId { get; set; }
public string ServerFolderId { get; set; }
public string Id { get; set; }
public string FolderId { get; set; }
public string UserId { get; set; }
public string Name { get; set; }
public string Uri { get; set; }

View File

@@ -11,16 +11,20 @@ namespace Bit.App.Models
public Folder(FolderData data)
{
Id = data.Id;
ServerId = data.ServerId;
Name = data.Name != null ? new CipherString(data.Name) : null;
}
public Folder(FolderResponse response)
{
ServerId = response.Id;
Id = response.Id;
Name = response.Name != null ? new CipherString(response.Name) : null;
}
public FolderRequest ToFolderRequest()
{
return new FolderRequest(this);
}
public FolderData ToFolderData(string userId)
{
return new FolderData(this, userId);

View File

@@ -11,9 +11,7 @@ namespace Bit.App.Models
public Site(SiteData data)
{
Id = data.Id;
ServerId = data.ServerId;
FolderId = data.FolderId;
ServerFolderId = data.ServerFolderId;
Name = data.Name != null ? new CipherString(data.Name) : null;
Uri = data.Uri != null ? new CipherString(data.Uri) : null;
Username = data.Username != null ? new CipherString(data.Username) : null;
@@ -23,8 +21,8 @@ namespace Bit.App.Models
public Site(SiteResponse response)
{
ServerId = response.Id;
ServerFolderId = response.FolderId;
Id = response.Id;
FolderId = response.FolderId;
Name = response.Name != null ? new CipherString(response.Name) : null;
Uri = response.Uri != null ? new CipherString(response.Uri) : null;
Username = response.Username != null ? new CipherString(response.Username) : null;
@@ -32,13 +30,17 @@ namespace Bit.App.Models
Notes = response.Notes != null ? new CipherString(response.Notes) : null;
}
public int? FolderId { get; set; }
public string ServerFolderId { get; set; }
public string FolderId { get; set; }
public CipherString Uri { get; set; }
public CipherString Username { get; set; }
public CipherString Password { get; set; }
public CipherString Notes { get; set; }
public SiteRequest ToSiteRequest()
{
return new SiteRequest(this);
}
public SiteData ToSiteData(string userId)
{
return new SiteData(this, userId);

View File

@@ -15,7 +15,7 @@ namespace Bit.App.Models.View
Username = site.Username?.Decrypt();
}
public int Id { get; set; }
public string Id { get; set; }
public string Name { get; set; }
public string Username { get; set; }
}
@@ -40,7 +40,7 @@ namespace Bit.App.Models.View
Name = folder.Name?.Decrypt();
}
public int? Id { get; set; }
public string Id { get; set; }
public string Name { get; set; }
public string FirstLetter { get { return Name.Substring(0, 1); } }
}