nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

[PM-2196] Improvements to the Swagger generator (#2914)

Browse Source 
* Swagger fixes

Co-Authored-By: Oscar Hinton <Hinton@users.noreply.github.com>

* Make Response Models return Guids instead of strings

* Change strings into guids in ScimApplicationFactory

---------

Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
This commit is contained in:
Daniel García
2023-07-14 17:18:26 +02:00
committed by GitHub
parent 966614c7e2
commit 4f87e4e1a4
41 changed files with 209 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Auth/Models/Response/AuthRequestResponseModel.cs
View File

@ -15,7 +15,7 @@ public class AuthRequestResponseModel : ResponseModel
throw new ArgumentNullException(nameof(authRequest));
}
Id = authRequest.Id.ToString();
Id = authRequest.Id;
PublicKey = authRequest.PublicKey;
RequestDeviceType = authRequest.RequestDeviceType.GetType().GetMember(authRequest.RequestDeviceType.ToString())
.FirstOrDefault()?.GetCustomAttribute<DisplayAttribute>()?.GetName();
@ -28,7 +28,7 @@ public class AuthRequestResponseModel : ResponseModel
ResponseDate = authRequest.ResponseDate;
}
public string Id { get; set; }
public Guid Id { get; set; }
public string PublicKey { get; set; }
public string RequestDeviceType { get; set; }
public string RequestIpAddress { get; set; }

14
src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs
View File

@ -19,7 +19,7 @@ public class EmergencyAccessResponseModel : ResponseModel
throw new ArgumentNullException(nameof(emergencyAccess));
}
Id = emergencyAccess.Id.ToString();
Id = emergencyAccess.Id;
Status = emergencyAccess.Status;
Type = emergencyAccess.Type;
WaitTimeDays = emergencyAccess.WaitTimeDays;
@ -32,13 +32,13 @@ public class EmergencyAccessResponseModel : ResponseModel
throw new ArgumentNullException(nameof(emergencyAccess));
}
Id = emergencyAccess.Id.ToString();
Id = emergencyAccess.Id;
Status = emergencyAccess.Status;
Type = emergencyAccess.Type;
WaitTimeDays = emergencyAccess.WaitTimeDays;
}
public string Id { get; private set; }
public Guid Id { get; private set; }
public EmergencyAccessStatusType Status { get; private set; }
public EmergencyAccessType Type { get; private set; }
public int WaitTimeDays { get; private set; }
@ -54,13 +54,13 @@ public class EmergencyAccessGranteeDetailsResponseModel : EmergencyAccessRespons
throw new ArgumentNullException(nameof(emergencyAccess));
}
GranteeId = emergencyAccess.GranteeId.ToString();
GranteeId = emergencyAccess.GranteeId;
Email = emergencyAccess.GranteeEmail;
Name = emergencyAccess.GranteeName;
AvatarColor = emergencyAccess.GranteeAvatarColor;
}
public string GranteeId { get; private set; }
public Guid? GranteeId { get; private set; }
public string Name { get; private set; }
public string Email { get; private set; }
public string AvatarColor { get; private set; }
@ -76,13 +76,13 @@ public class EmergencyAccessGrantorDetailsResponseModel : EmergencyAccessRespons
throw new ArgumentNullException(nameof(emergencyAccess));
}
GrantorId = emergencyAccess.GrantorId.ToString();
GrantorId = emergencyAccess.GrantorId;
Email = emergencyAccess.GrantorEmail;
Name = emergencyAccess.GrantorName;
AvatarColor = emergencyAccess.GrantorAvatarColor;
}
public string GrantorId { get; private set; }
public Guid GrantorId { get; private set; }
public string Name { get; private set; }
public string Email { get; private set; }
public string AvatarColor { get; private set; }

8
src/Api/Models/Response/CollectionResponseModel.cs
View File

@ -14,14 +14,14 @@ public class CollectionResponseModel : ResponseModel
throw new ArgumentNullException(nameof(collection));
}
Id = collection.Id.ToString();
OrganizationId = collection.OrganizationId.ToString();
Id = collection.Id;
OrganizationId = collection.OrganizationId;
Name = collection.Name;
ExternalId = collection.ExternalId;
}
public string Id { get; set; }
public string OrganizationId { get; set; }
public Guid Id { get; set; }
public Guid OrganizationId { get; set; }
public string Name { get; set; }
public string ExternalId { get; set; }
}

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

@ -14,7 +14,7 @@ public class DeviceResponseModel : ResponseModel
throw new ArgumentNullException(nameof(device));
}
Id = device.Id.ToString();
Id = device.Id;
Name = device.Name;
Type = device.Type;
Identifier = device.Identifier;
@ -24,7 +24,7 @@ public class DeviceResponseModel : ResponseModel
EncryptedPrivateKey = device.EncryptedPrivateKey;
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Name { get; set; }
public DeviceType Type { get; set; }
public string Identifier { get; set; }

8
src/Api/Models/Response/GroupResponseModel.cs
View File

@ -14,15 +14,15 @@ public class GroupResponseModel : ResponseModel
throw new ArgumentNullException(nameof(group));
}
Id = group.Id.ToString();
OrganizationId = group.OrganizationId.ToString();
Id = group.Id;
OrganizationId = group.OrganizationId;
Name = group.Name;
AccessAll = group.AccessAll;
ExternalId = group.ExternalId;
}
public string Id { get; set; }
public string OrganizationId { get; set; }
public Guid Id { get; set; }
public Guid OrganizationId { get; set; }
public string Name { get; set; }
public bool AccessAll { get; set; }
public string ExternalId { get; set; }

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

@ -8,12 +8,12 @@ public class InstallationResponseModel : ResponseModel
public InstallationResponseModel(Installation installation, bool withKey)
: base("installation")
{
Id = installation.Id.ToString();
Id = installation.Id;
Key = withKey ? installation.Key : null;
Enabled = installation.Enabled;
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Key { get; set; }
public bool Enabled { get; set; }
}

4
src/Api/Models/Response/Organizations/OrganizationAutoEnrollStatusResponseModel.cs
View File

@ -6,10 +6,10 @@ public class OrganizationAutoEnrollStatusResponseModel : ResponseModel
{
public OrganizationAutoEnrollStatusResponseModel(Guid orgId, bool resetPasswordEnabled) : base("organizationAutoEnrollStatus")
{
Id = orgId.ToString();
Id = orgId;
ResetPasswordEnabled = resetPasswordEnabled;
}
public string Id { get; set; }
public Guid Id { get; set; }
public bool ResetPasswordEnabled { get; set; }
}

8
src/Api/Models/Response/Organizations/OrganizationDomainResponseModel.cs
View File

@ -13,8 +13,8 @@ public class OrganizationDomainResponseModel : ResponseModel
throw new ArgumentNullException(nameof(organizationDomain));
}
Id = organizationDomain.Id.ToString();
OrganizationId = organizationDomain.OrganizationId.ToString();
Id = organizationDomain.Id;
OrganizationId = organizationDomain.OrganizationId;
Txt = organizationDomain.Txt;
DomainName = organizationDomain.DomainName;
CreationDate = organizationDomain.CreationDate;
@ -24,8 +24,8 @@ public class OrganizationDomainResponseModel : ResponseModel
LastCheckedDate = organizationDomain.LastCheckedDate;
}
public string Id { get; set; }
public string OrganizationId { get; set; }
public Guid Id { get; set; }
public Guid OrganizationId { get; set; }
public string Txt { get; set; }
public string DomainName { get; set; }
public DateTime CreationDate { get; set; }

4
src/Api/Models/Response/Organizations/OrganizationResponseModel.cs
View File

@ -17,7 +17,7 @@ public class OrganizationResponseModel : ResponseModel
throw new ArgumentNullException(nameof(organization));
}
Id = organization.Id.ToString();
Id = organization.Id;
Name = organization.Name;
BusinessName = organization.BusinessName;
BusinessAddress1 = organization.BusinessAddress1;
@ -55,7 +55,7 @@ public class OrganizationResponseModel : ResponseModel
MaxAutoscaleSmServiceAccounts = organization.MaxAutoscaleSmServiceAccounts;
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Name { get; set; }
public string BusinessName { get; set; }
public string BusinessAddress1 { get; set; }

12
src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs
View File

@ -18,8 +18,8 @@ public class OrganizationUserResponseModel : ResponseModel
throw new ArgumentNullException(nameof(organizationUser));
}
Id = organizationUser.Id.ToString();
UserId = organizationUser.UserId?.ToString();
Id = organizationUser.Id;
UserId = organizationUser.UserId;
Type = organizationUser.Type;
Status = organizationUser.Status;
AccessAll = organizationUser.AccessAll;
@ -37,8 +37,8 @@ public class OrganizationUserResponseModel : ResponseModel
throw new ArgumentNullException(nameof(organizationUser));
}
Id = organizationUser.Id.ToString();
UserId = organizationUser.UserId?.ToString();
Id = organizationUser.Id;
UserId = organizationUser.UserId;
Type = organizationUser.Type;
Status = organizationUser.Status;
AccessAll = organizationUser.AccessAll;
@ -50,8 +50,8 @@ public class OrganizationUserResponseModel : ResponseModel
HasMasterPassword = organizationUser.HasMasterPassword;
}
public string Id { get; set; }
public string UserId { get; set; }
public Guid Id { get; set; }
public Guid? UserId { get; set; }
public OrganizationUserType Type { get; set; }
public OrganizationUserStatusType Status { get; set; }
public bool AccessAll { get; set; }

12
src/Api/Models/Response/ProfileOrganizationResponseModel.cs
View File

@ -15,7 +15,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
public ProfileOrganizationResponseModel(OrganizationUserOrganizationDetails organization) : this("profileOrganization")
{
Id = organization.OrganizationId.ToString();
Id = organization.OrganizationId;
Name = organization.Name;
UsePolicies = organization.UsePolicies;
UseSso = organization.UseSso;
@ -46,8 +46,8 @@ public class ProfileOrganizationResponseModel : ResponseModel
Identifier = organization.Identifier;
Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(organization.Permissions);
ResetPasswordEnrolled = organization.ResetPasswordKey != null;
UserId = organization.UserId?.ToString();
ProviderId = organization.ProviderId?.ToString();
UserId = organization.UserId;
ProviderId = organization.ProviderId;
ProviderName = organization.ProviderName;
ProviderType = organization.ProviderType;
FamilySponsorshipFriendlyName = organization.FamilySponsorshipFriendlyName;
@ -68,7 +68,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
}
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Name { get; set; }
public bool UsePolicies { get; set; }
public bool UseSso { get; set; }
@ -97,9 +97,9 @@ public class ProfileOrganizationResponseModel : ResponseModel
public string Identifier { get; set; }
public Permissions Permissions { get; set; }
public bool ResetPasswordEnrolled { get; set; }
public string UserId { get; set; }
public Guid? UserId { get; set; }
public bool HasPublicAndPrivateKeys { get; set; }
public string ProviderId { get; set; }
public Guid? ProviderId { get; set; }
public string ProviderName { get; set; }
public ProviderType? ProviderType { get; set; }
public string FamilySponsorshipFriendlyName { get; set; }

6
src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs
View File

@ -9,7 +9,7 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
public ProfileProviderOrganizationResponseModel(ProviderUserOrganizationDetails organization)
: base("profileProviderOrganization")
{
Id = organization.OrganizationId.ToString();
Id = organization.OrganizationId;
Name = organization.Name;
UsePolicies = organization.UsePolicies;
UseSso = organization.UseSso;
@ -39,8 +39,8 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
Identifier = organization.Identifier;
Permissions = new Permissions();
ResetPasswordEnrolled = false;
UserId = organization.UserId?.ToString();
ProviderId = organization.ProviderId?.ToString();
UserId = organization.UserId;
ProviderId = organization.ProviderId;
ProviderName = organization.ProviderName;
PlanProductType = StaticStore.GetPasswordManagerPlan(organization.PlanType).Product;
}

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

@ -20,7 +20,7 @@ public class ProfileResponseModel : ResponseModel
throw new ArgumentNullException(nameof(user));
}
Id = user.Id.ToString();
Id = user.Id;
Name = user.Name;
Email = user.Email;
EmailVerified = user.EmailVerified;
@ -45,7 +45,7 @@ public class ProfileResponseModel : ResponseModel
{
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Name { get; set; }
public string Email { get; set; }
public bool EmailVerified { get; set; }

8
src/Api/Models/Response/Providers/ProfileProviderResponseModel.cs
View File

@ -10,24 +10,24 @@ public class ProfileProviderResponseModel : ResponseModel
public ProfileProviderResponseModel(ProviderUserProviderDetails provider)
: base("profileProvider")
{
Id = provider.ProviderId.ToString();
Id = provider.ProviderId;
Name = provider.Name;
Key = provider.Key;
Status = provider.Status;
Type = provider.Type;
Enabled = provider.Enabled;
Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(provider.Permissions);
UserId = provider.UserId?.ToString();
UserId = provider.UserId;
UseEvents = provider.UseEvents;
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Name { get; set; }
public string Key { get; set; }
public ProviderUserStatusType Status { get; set; }
public ProviderUserType Type { get; set; }
public bool Enabled { get; set; }
public Permissions Permissions { get; set; }
public string UserId { get; set; }
public Guid? UserId { get; set; }
public bool UseEvents { get; set; }
}

12
src/Api/Models/Response/Providers/ProviderUserResponseModel.cs
View File

@ -16,8 +16,8 @@ public class ProviderUserResponseModel : ResponseModel
throw new ArgumentNullException(nameof(providerUser));
}
Id = providerUser.Id.ToString();
UserId = providerUser.UserId?.ToString();
Id = providerUser.Id;
UserId = providerUser.UserId;
Type = providerUser.Type;
Status = providerUser.Status;
Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(providerUser.Permissions);
@ -31,15 +31,15 @@ public class ProviderUserResponseModel : ResponseModel
throw new ArgumentNullException(nameof(providerUser));
}
Id = providerUser.Id.ToString();
UserId = providerUser.UserId?.ToString();
Id = providerUser.Id;
UserId = providerUser.UserId;
Type = providerUser.Type;
Status = providerUser.Status;
Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(providerUser.Permissions);
}
public string Id { get; set; }
public string UserId { get; set; }
public Guid Id { get; set; }
public Guid? UserId { get; set; }
public ProviderUserType Type { get; set; }
public ProviderUserStatusType Status { get; set; }
public Permissions Permissions { get; set; }

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

@ -11,12 +11,12 @@ public class SelectionReadOnlyResponseModel
throw new ArgumentNullException(nameof(selection));
}
Id = selection.Id.ToString();
Id = selection.Id;
ReadOnly = selection.ReadOnly;
HidePasswords = selection.HidePasswords;
}
public string Id { get; set; }
public Guid Id { get; set; }
public bool ReadOnly { get; set; }
public bool HidePasswords { get; set; }
}

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

@ -7,10 +7,10 @@ public class UserKeyResponseModel : ResponseModel
public UserKeyResponseModel(Guid id, string key)
: base("userKey")
{
UserId = id.ToString();
UserId = id;
PublicKey = key;
}
public string UserId { get; set; }
public Guid UserId { get; set; }
public string PublicKey { get; set; }
}

2
src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs
View File

@ -32,7 +32,7 @@ public class SecretsManagerPortingController : Controller
}
[HttpGet("sm/{organizationId}/export")]
public async Task<SMExportResponseModel> Export([FromRoute] Guid organizationId, [FromRoute] string format = "json")
public async Task<SMExportResponseModel> Export([FromRoute] Guid organizationId)
{
if (!await _currentContext.OrganizationAdmin(organizationId) || !_currentContext.AccessSecretsManager(organizationId))
{

10
src/Api/SecretsManager/Models/Response/PotentialGranteeResponseModel.cs
View File

@ -17,7 +17,7 @@ public class PotentialGranteeResponseModel : ResponseModel
throw new ArgumentNullException(nameof(group));
}
Id = group.Id.ToString();
Id = group.Id;
Name = group.Name;
Type = "group";
}
@ -30,7 +30,7 @@ public class PotentialGranteeResponseModel : ResponseModel
throw new ArgumentNullException(nameof(user));
}
Id = user.Id.ToString();
Id = user.Id;
Name = user.Name;
Email = user.Email;
Type = "user";
@ -44,7 +44,7 @@ public class PotentialGranteeResponseModel : ResponseModel
throw new ArgumentNullException(nameof(serviceAccount));
}
Id = serviceAccount.Id.ToString();
Id = serviceAccount.Id;
Name = serviceAccount.Name;
Type = "serviceAccount";
}
@ -57,7 +57,7 @@ public class PotentialGranteeResponseModel : ResponseModel
throw new ArgumentNullException(nameof(project));
}
Id = project.Id.ToString();
Id = project.Id;
Name = project.Name;
Type = "project";
}
@ -66,7 +66,7 @@ public class PotentialGranteeResponseModel : ResponseModel
{
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Name { get; set; }

12
src/Api/SecretsManager/Models/Response/ProjectResponseModel.cs
View File

@ -16,8 +16,8 @@ public class ProjectResponseModel : ResponseModel
throw new ArgumentNullException(nameof(project));
}
Id = project.Id.ToString();
OrganizationId = project.OrganizationId.ToString();
Id = project.Id;
OrganizationId = project.OrganizationId;
Name = project.Name;
CreationDate = project.CreationDate;
RevisionDate = project.RevisionDate;
@ -33,8 +33,8 @@ public class ProjectResponseModel : ResponseModel
throw new ArgumentNullException(nameof(projectDetails));
}
Id = projectDetails.Project.Id.ToString();
OrganizationId = projectDetails.Project.OrganizationId.ToString();
Id = projectDetails.Project.Id;
OrganizationId = projectDetails.Project.OrganizationId;
Name = projectDetails.Project.Name;
CreationDate = projectDetails.Project.CreationDate;
RevisionDate = projectDetails.Project.RevisionDate;
@ -46,9 +46,9 @@ public class ProjectResponseModel : ResponseModel
{
}
public string Id { get; set; }
public Guid Id { get; set; }
public string OrganizationId { get; set; }
public Guid OrganizationId { get; set; }
public string Name { get; set; }

18
src/Api/SecretsManager/Models/Response/SecretResponseModel.cs
View File

@ -14,14 +14,14 @@ public class SecretResponseModel : ResponseModel
throw new ArgumentNullException(nameof(secret));
}
Id = secret.Id.ToString();
OrganizationId = secret.OrganizationId.ToString();
Id = secret.Id;
OrganizationId = secret.OrganizationId;
Key = secret.Key;
Value = secret.Value;
Note = secret.Note;
CreationDate = secret.CreationDate;
RevisionDate = secret.RevisionDate;
Projects = secret.Projects?.Select(p => new InnerProject(p));
Projects = secret.Projects?.Select(p => new SecretResponseInnerProject(p));
Read = read;
Write = write;
@ -31,9 +31,9 @@ public class SecretResponseModel : ResponseModel
{
}
public string Id { get; set; }
public Guid Id { get; set; }
public string OrganizationId { get; set; }
public Guid OrganizationId { get; set; }
public string Key { get; set; }
@ -45,21 +45,21 @@ public class SecretResponseModel : ResponseModel
public DateTime RevisionDate { get; set; }
public IEnumerable<InnerProject> Projects { get; set; }
public IEnumerable<SecretResponseInnerProject> Projects { get; set; }
public bool Read { get; set; }
public bool Write { get; set; }
public class InnerProject
public class SecretResponseInnerProject
{
public InnerProject(Project project)
public SecretResponseInnerProject(Project project)
{
Id = project.Id;
Name = project.Name;
}
public InnerProject()
public SecretResponseInnerProject()
{
}

32
src/Api/SecretsManager/Models/Response/SecretWithProjectsListResponseModel.cs
View File

@ -10,26 +10,26 @@ public class SecretWithProjectsListResponseModel : ResponseModel
public SecretWithProjectsListResponseModel(IEnumerable<SecretPermissionDetails> secrets) : base(_objectName)
{
Secrets = secrets.Select(s => new InnerSecret(s));
Projects = secrets.SelectMany(s => s.Secret.Projects).DistinctBy(p => p.Id).Select(p => new InnerProject(p));
Secrets = secrets.Select(s => new SecretsWithProjectsInnerSecret(s));
Projects = secrets.SelectMany(s => s.Secret.Projects).DistinctBy(p => p.Id).Select(p => new SecretWithProjectsInnerProject(p));
}
public SecretWithProjectsListResponseModel() : base(_objectName)
{
}
public IEnumerable<InnerSecret> Secrets { get; set; }
public IEnumerable<InnerProject> Projects { get; set; }
public IEnumerable<SecretsWithProjectsInnerSecret> Secrets { get; set; }
public IEnumerable<SecretWithProjectsInnerProject> Projects { get; set; }
public class InnerProject
public class SecretWithProjectsInnerProject
{
public InnerProject(Project project)
public SecretWithProjectsInnerProject(Project project)
{
Id = project.Id;
Name = project.Name;
}
public InnerProject()
public SecretWithProjectsInnerProject()
{
}
@ -37,27 +37,27 @@ public class SecretWithProjectsListResponseModel : ResponseModel
public string Name { get; set; }
}
public class InnerSecret
public class SecretsWithProjectsInnerSecret
{
public InnerSecret(SecretPermissionDetails secret)
public SecretsWithProjectsInnerSecret(SecretPermissionDetails secret)
{
Id = secret.Secret.Id.ToString();
OrganizationId = secret.Secret.OrganizationId.ToString();
Id = secret.Secret.Id;
OrganizationId = secret.Secret.OrganizationId;
Key = secret.Secret.Key;
CreationDate = secret.Secret.CreationDate;
RevisionDate = secret.Secret.RevisionDate;
Projects = secret.Secret.Projects?.Select(p => new InnerProject(p));
Projects = secret.Secret.Projects?.Select(p => new SecretWithProjectsInnerProject(p));
Read = secret.Read;
Write = secret.Write;
}
public InnerSecret()
public SecretsWithProjectsInnerSecret()
{
}
public string Id { get; set; }
public Guid Id { get; set; }
public string OrganizationId { get; set; }
public Guid OrganizationId { get; set; }
public string Key { get; set; }
@ -65,7 +65,7 @@ public class SecretWithProjectsListResponseModel : ResponseModel
public DateTime RevisionDate { get; set; }
public IEnumerable<InnerProject> Projects { get; set; }
public IEnumerable<SecretWithProjectsInnerProject> Projects { get; set; }
public bool Read { get; set; }
public bool Write { get; set; }
}

8
src/Api/SecretsManager/Models/Response/ServiceAccountResponseModel.cs
View File

@ -14,8 +14,8 @@ public class ServiceAccountResponseModel : ResponseModel
throw new ArgumentNullException(nameof(serviceAccount));
}
Id = serviceAccount.Id.ToString();
OrganizationId = serviceAccount.OrganizationId.ToString();
Id = serviceAccount.Id;
OrganizationId = serviceAccount.OrganizationId;
Name = serviceAccount.Name;
CreationDate = serviceAccount.CreationDate;
RevisionDate = serviceAccount.RevisionDate;
@ -25,9 +25,9 @@ public class ServiceAccountResponseModel : ResponseModel
{
}
public string Id { get; set; }
public Guid Id { get; set; }
public string OrganizationId { get; set; }
public Guid OrganizationId { get; set; }
public string Name { get; set; }

4
src/Api/Tools/Models/Response/SendResponseModel.cs
View File

@ -18,7 +18,7 @@ public class SendResponseModel : ResponseModel
throw new ArgumentNullException(nameof(send));
}
Id = send.Id.ToString();
Id = send.Id;
AccessId = CoreHelpers.Base64UrlEncode(send.Id.ToByteArray());
Type = send.Type;
Key = send.Key;
@ -52,7 +52,7 @@ public class SendResponseModel : ResponseModel
Notes = sendData.Notes;
}
public string Id { get; set; }
public Guid Id { get; set; }
public string AccessId { get; set; }
public SendType Type { get; set; }
public string Name { get; set; }

12
src/Api/Vault/Models/Response/CipherResponseModel.cs
View File

@ -18,7 +18,7 @@ public class CipherMiniResponseModel : ResponseModel
throw new ArgumentNullException(nameof(cipher));
}
Id = cipher.Id.ToString();
Id = cipher.Id;
Type = cipher.Type;
CipherData cipherData;
@ -57,7 +57,7 @@ public class CipherMiniResponseModel : ResponseModel
Fields = cipherData.Fields?.Select(f => new CipherFieldModel(f));
PasswordHistory = cipherData.PasswordHistory?.Select(ph => new CipherPasswordHistoryModel(ph));
RevisionDate = cipher.RevisionDate;
OrganizationId = cipher.OrganizationId?.ToString();
OrganizationId = cipher.OrganizationId;
Attachments = AttachmentResponseModel.FromCipher(cipher, globalSettings);
OrganizationUseTotp = orgUseTotp;
CreationDate = cipher.CreationDate;
@ -65,8 +65,8 @@ public class CipherMiniResponseModel : ResponseModel
Reprompt = cipher.Reprompt.GetValueOrDefault(CipherRepromptType.None);
}
public string Id { get; set; }
public string OrganizationId { get; set; }
public Guid Id { get; set; }
public Guid? OrganizationId { get; set; }
public CipherType Type { get; set; }
public dynamic Data { get; set; }
public string Name { get; set; }
@ -90,13 +90,13 @@ public class CipherResponseModel : CipherMiniResponseModel
public CipherResponseModel(CipherDetails cipher, IGlobalSettings globalSettings, string obj = "cipher")
: base(cipher, globalSettings, cipher.OrganizationUseTotp, obj)
{
FolderId = cipher.FolderId?.ToString();
FolderId = cipher.FolderId;
Favorite = cipher.Favorite;
Edit = cipher.Edit;
ViewPassword = cipher.ViewPassword;
}
public string FolderId { get; set; }
public Guid? FolderId { get; set; }
public bool Favorite { get; set; }
public bool Edit { get; set; }
public bool ViewPassword { get; set; }

4
src/Api/Vault/Models/Response/FolderResponseModel.cs
View File

@ -13,12 +13,12 @@ public class FolderResponseModel : ResponseModel
throw new ArgumentNullException(nameof(folder));
}
Id = folder.Id.ToString();
Id = folder.Id;
Name = folder.Name;
RevisionDate = folder.RevisionDate;
}
public string Id { get; set; }
public Guid Id { get; set; }
public string Name { get; set; }
public DateTime RevisionDate { get; set; }
}

8
src/Core/Models/Api/Response/PolicyResponseModel.cs
View File

@ -14,8 +14,8 @@ public class PolicyResponseModel : ResponseModel
throw new ArgumentNullException(nameof(policy));
}
Id = policy.Id.ToString();
OrganizationId = policy.OrganizationId.ToString();
Id = policy.Id;
OrganizationId = policy.OrganizationId;
Type = policy.Type;
Enabled = policy.Enabled;
if (!string.IsNullOrWhiteSpace(policy.Data))
@ -24,8 +24,8 @@ public class PolicyResponseModel : ResponseModel
}
}
public string Id { get; set; }
public string OrganizationId { get; set; }
public Guid Id { get; set; }
public Guid OrganizationId { get; set; }
public PolicyType Type { get; set; }
public Dictionary<string, object> Data { get; set; }
public bool Enabled { get; set; }