From 2f41f260ec05fa299b11ca39d5bb0a9376c10e5c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 3 Mar 2017 21:53:27 -0500
Subject: [PATCH] org apis

---
 src/Api/Controllers/OrganizationsController.cs    | 15 ++++++++++++++-
 .../SqlServer/OrganizationUserRepository.cs       |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs
index e514c2a942..073792fbae 100644
--- a/src/Api/Controllers/OrganizationsController.cs
+++ b/src/Api/Controllers/OrganizationsController.cs
@@ -32,7 +32,20 @@ namespace Bit.Api.Controllers
         }
 
         [HttpGet("{id}")]
-        public async Task<OrganizationExtendedResponseModel> Get(string id)
+        public async Task<OrganizationResponseModel> Get(string id)
+        {
+            var userId = _userService.GetProperUserId(User).Value;
+            var organization = await _organizationRepository.GetByIdAsync(new Guid(id), userId);
+            if(organization == null)
+            {
+                throw new NotFoundException();
+            }
+
+            return new OrganizationResponseModel(organization);
+        }
+
+        [HttpGet("{id}/extended")]
+        public async Task<OrganizationExtendedResponseModel> GetExtended(string id)
         {
             var userId = _userService.GetProperUserId(User).Value;
             var organization = await _organizationRepository.GetByIdAsync(new Guid(id), userId);
diff --git a/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs b/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs
index 5c1864631b..3bf78cde27 100644
--- a/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs
+++ b/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs
@@ -23,7 +23,7 @@ namespace Bit.Core.Repositories.SqlServer
             using(var connection = new SqlConnection(ConnectionString))
             {
                 var results = await connection.QueryAsync<OrganizationUser>(
-                    "[dbo].[OrganizationUser_ReadByIdUserId]",
+                    "[dbo].[OrganizationUser_ReadByOrganizationIdUserId]",
                     new { OrganizationId = organizationId, UserId = userId },
                     commandType: CommandType.StoredProcedure);