Fr8org · jokerosky · Aug 6, 2016 · Aug 5, 2016 · Aug 5, 2016 · Aug 5, 2016
diff --git a/CategoryPages/basecamp2.html b/CategoryPages/basecamp2.html
diff --git a/CategoryPages/built-in services-slack.html b/CategoryPages/built-in services-slack.html
diff --git a/CategoryPages/built-in services.html b/CategoryPages/built-in services.html
diff --git a/CategoryPages/slack.html b/CategoryPages/slack.html
diff --git a/Content/css/plan-directory.css b/Content/css/plan-directory.css
@@ -108,6 +108,7 @@ header#site-header:after {
 
 /*Search Bar Container*/
 .search-bar-container {
+    width: 100%;
     text-align: center;
     display: inline-block;
     padding: 0 1em;
@@ -138,6 +139,7 @@ header#site-header:after {
     text-align: center;
     padding: 0 1em;
     display: inline-block;
+    width: 100%;
 }
 
 .result-container .base-block-white {

diff --git a/Controllers/Api/AuthenticationController.cs b/Controllers/Api/AuthenticationController.cs
@@ -21,6 +21,7 @@
 using HubWeb.Infrastructure_HubWeb;
 using System.Web.Http.Description;
 using Fr8.Infrastructure;
+using Fr8.Infrastructure.Utilities.Logging;
 using Hub.Services;
 using Newtonsoft.Json;
 using Swashbuckle.Swagger.Annotations;
@@ -127,6 +128,7 @@ public IHttpActionResult Login([FromUri]string username, [FromUri]string passwor
         {
             if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))
             {
+                Logger.GetLogger().Warn($"Username or password is not specified");
                 return BadRequest("Username or password is not specified");
             }
 
@@ -151,6 +153,7 @@ public IHttpActionResult Login([FromUri]string username, [FromUri]string passwor
                     }
                 }
             }
+            Logger.GetLogger().Warn($"Loging failed for {username}");
             return StatusCode(HttpStatusCode.Forbidden);
         }
 

diff --git a/Controllers/Api/PageGenerationController.cs b/Controllers/Api/PageGenerationController.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using System.Web.Http;
-using HubWeb.Infrastructure_PD.Interfaces;
+using Hub.Enums;
+using Hub.Interfaces;
 using StructureMap;
 
 namespace HubWeb.Controllers.Api

diff --git a/Controllers/Api/PlanTemplatesController.cs b/Controllers/Api/PlanTemplatesController.cs
@@ -4,10 +4,10 @@
 using System.Threading.Tasks;
 using System.Web.Http;
 using Fr8.Infrastructure.Data.DataTransferObjects;
+using Fr8.Infrastructure.Data.DataTransferObjects.PlanDirectory;
 using Fr8.Infrastructure.Utilities.Configuration;
 using Hub.Infrastructure;
 using Hub.Interfaces;
-using HubWeb.Infrastructure_PD.Interfaces;
 using log4net;
 using Microsoft.AspNet.Identity;
 using PlanDirectory.Infrastructure;
@@ -37,7 +37,6 @@ public PlanTemplatesController()
 
         [HttpPost]
         [Fr8ApiAuthorize]
-        [PlanDirectoryHMACAuthenticate]
         public async Task<IHttpActionResult> Post(PublishPlanTemplateDTO dto)
         {
             var fr8AccountId = User.Identity.GetUserId();
@@ -49,7 +48,6 @@ public async Task<IHttpActionResult> Post(PublishPlanTemplateDTO dto)
 
         [HttpDelete]
         [Fr8ApiAuthorize]
-        [PlanDirectoryHMACAuthenticate]
         public async Task<IHttpActionResult> Delete(Guid id)
         {
             var identity = User.Identity as ClaimsIdentity;
@@ -73,7 +71,6 @@ public async Task<IHttpActionResult> Delete(Guid id)
 
         [HttpGet]
         [Fr8ApiAuthorize]
-        [PlanDirectoryHMACAuthenticate]
         public async Task<IHttpActionResult> Get(Guid id)
         {
             var fr8AccountId = User.Identity.GetUserId();
@@ -100,7 +97,6 @@ public async Task<IHttpActionResult> Search(
 
         [HttpPost]
         [Fr8ApiAuthorize]
-        [PlanDirectoryHMACAuthenticate]
         public async Task<IHttpActionResult> CreatePlan(Guid id)
         {
             try

diff --git a/Controllers/Api/PlansController.cs b/Controllers/Api/PlansController.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Security.Claims;
 using System.Web.Http;
 using System.Web.Http.Description;
 using AutoMapper;
@@ -448,7 +449,10 @@ public async Task<IHttpActionResult> Share(Guid planId)
         [SwaggerResponseRemoveDefaults]
         public async Task<IHttpActionResult> Unpublish(Guid planId)
         {
-            await _planDirectoryService.Unpublish(planId, User.Identity.GetUserId());
+            var identity = User.Identity as ClaimsIdentity;
+            var privileged = identity.HasClaim(ClaimsIdentity.DefaultRoleClaimType, "Admin");
+
+            await _planDirectoryService.Unpublish(planId, User.Identity.GetUserId(), privileged);
             return Ok();
         }
         /// <summary>

diff --git a/...astructure_PD/Interfaces/CreatePlanDTO.cs → ...ferObjects/PlanDirectory/CreatePlanDTO.cs b/...astructure_PD/Interfaces/CreatePlanDTO.cs → ...ferObjects/PlanDirectory/CreatePlanDTO.cs
@@ -1,4 +1,4 @@
-namespace HubWeb.Infrastructure_PD.Interfaces
+namespace Fr8.Infrastructure.Data.DataTransferObjects.PlanDirectory
 {
     public class CreatePlanDTO
     {

diff --git a/...astructure_PD/Interfaces/SearchItemDTO.cs → ...ferObjects/PlanDirectory/SearchItemDTO.cs b/...astructure_PD/Interfaces/SearchItemDTO.cs → ...ferObjects/PlanDirectory/SearchItemDTO.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace HubWeb.Infrastructure_PD.Interfaces
+namespace Fr8.Infrastructure.Data.DataTransferObjects.PlanDirectory
 {
     public class SearchItemDTO
     {

diff --git a/...ructure_PD/Interfaces/SearchRequestDTO.cs → ...Objects/PlanDirectory/SearchRequestDTO.cs b/...ructure_PD/Interfaces/SearchRequestDTO.cs → ...Objects/PlanDirectory/SearchRequestDTO.cs
@@ -1,4 +1,4 @@
-namespace HubWeb.Infrastructure_PD.Interfaces
+namespace Fr8.Infrastructure.Data.DataTransferObjects.PlanDirectory
 {
     public class SearchRequestDTO
     {

diff --git a/...tructure_PD/Interfaces/SearchResultDTO.cs → ...rObjects/PlanDirectory/SearchResultDTO.cs b/...tructure_PD/Interfaces/SearchResultDTO.cs → ...rObjects/PlanDirectory/SearchResultDTO.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace HubWeb.Infrastructure_PD.Interfaces
+namespace Fr8.Infrastructure.Data.DataTransferObjects.PlanDirectory
 {
     public class SearchResultDTO
     {

diff --git a/Fr8Infrastructure.NET/Fr8Infrastructure.NET.csproj b/Fr8Infrastructure.NET/Fr8Infrastructure.NET.csproj
@@ -210,6 +210,10 @@
     <Compile Include="Data\DataTransferObjects\PayloadDTO.cs" />
     <Compile Include="Data\DataTransferObjects\PermissionDTO.cs" />
     <Compile Include="Data\DataTransferObjects\PhoneNumberCredentialsDTO.cs" />
+    <Compile Include="Data\DataTransferObjects\PlanDirectory\CreatePlanDTO.cs" />
+    <Compile Include="Data\DataTransferObjects\PlanDirectory\SearchItemDTO.cs" />
+    <Compile Include="Data\DataTransferObjects\PlanDirectory\SearchRequestDTO.cs" />
+    <Compile Include="Data\DataTransferObjects\PlanDirectory\SearchResultDTO.cs" />
     <Compile Include="Data\DataTransferObjects\PlanDTO.cs" />
     <Compile Include="Data\DataTransferObjects\PlanNoChildrenDTO.cs" />
     <Compile Include="Data\DataTransferObjects\PlanFullDTO.cs" />

diff --git a/Infrastructure_PD/Interfaces/GenerateMode.cs → Hub/Enums/GenerateMode.cs b/Infrastructure_PD/Interfaces/GenerateMode.cs → Hub/Enums/GenerateMode.cs
@@ -1,4 +1,4 @@
-namespace HubWeb.Infrastructure_PD.Interfaces
+namespace Hub.Enums
 {
     public enum GenerateMode
     {

diff --git a/...Exceptions/ManifestGenerationException.cs → ...Exceptions/ManifestGenerationException.cs b/...Exceptions/ManifestGenerationException.cs → ...Exceptions/ManifestGenerationException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace HubWeb.Infrastructure_PD.Exceptions
+namespace Hub.Exceptions
 {
     public class ManifestGenerationException : Exception
     {

diff --git a/...D/Exceptions/ManifestNotFoundException.cs → Hub/Exceptions/ManifestNotFoundException.cs b/...D/Exceptions/ManifestNotFoundException.cs → Hub/Exceptions/ManifestNotFoundException.cs
@@ -1,4 +1,4 @@
-namespace HubWeb.Infrastructure_PD.Exceptions
+namespace Hub.Exceptions
 {
     public class ManifestNotFoundException : ManifestGenerationException
     {

diff --git a/...ceptions/ManifestPageNotFoundException.cs → ...ceptions/ManifestPageNotFoundException.cs b/...ceptions/ManifestPageNotFoundException.cs → ...ceptions/ManifestPageNotFoundException.cs
@@ -1,4 +1,4 @@
-namespace HubWeb.Infrastructure_PD.Exceptions
+namespace Hub.Exceptions
 {
     public class ManifestPageNotFoundException : ManifestGenerationException
     {