nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-08 22:58:11 -05:00
Code

Added user type to organization APIs

Browse Source
This commit is contained in:
Kyle Spearrin 2017-03-25 16:34:30 -04:00
parent b144f8a686
commit 5b7c683c57
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs
View File

@ -12,11 +12,13 @@ namespace Bit.Core.Models.Api
Name = organization.Name; Name = organization.Name;
Key = organization.Key; Key = organization.Key;
Status = organization.Status; Status = organization.Status;
Type = organization;
} }
public string Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string Key { get; set; } public string Key { get; set; }
public OrganizationUserStatusType Status { get; set; } public OrganizationUserStatusType Status { get; set; }
public OrganizationUserType Type { get; set; }
} }
} }

1
src/Core/Models/Data/OrganizationUserOrganizationDetails.cs
View File

@ -9,5 +9,6 @@ namespace Bit.Core.Models.Data
public string Name { get; set; } public string Name { get; set; }
public string Key { get; set; } public string Key { get; set; }
public Enums.OrganizationUserStatusType Status { get; set; } public Enums.OrganizationUserStatusType Status { get; set; }
public Enums.OrganizationUserType Type { get; set; }
} }
} }

3
src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql
View File

@ -5,7 +5,8 @@ SELECT
OU.[OrganizationId], OU.[OrganizationId],
O.[Name], O.[Name],
OU.[Key], OU.[Key],
OU.[Status] OU.[Status],
OU.[Type]
FROM FROM
[dbo].[OrganizationUser] OU [dbo].[OrganizationUser] OU
INNER JOIN INNER JOIN