webdav portal Dependency resolver added

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constraints/OrganizationRouteConstraint.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
+using System.Web.Mvc;
 using System.Web.Routing;
 using WebsitePanel.WebDavPortal.Config;
 using WebsitePanel.WebDavPortal.DependencyInjection;
@@ -16,6 +17,8 @@ namespace WebsitePanel.WebDavPortal.Constraints
 
         public bool Match(HttpContextBase httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection)
         {
+            var webdavManager = DependencyResolver.Current.GetService<IWebDavManager>();
+
             object value;
             if (!values.TryGetValue(parameterName, out value)) 
                 return false;
@@ -30,9 +33,7 @@ namespace WebsitePanel.WebDavPortal.Constraints
             if (httpContext.Session == null)
                 return false;
 
-            IKernel kernel = new StandardKernel(new WebDavExplorerAppModule());
+            if (webdavManager != null && str == webdavManager.OrganizationName)
-            var webDavManager = kernel.Get<IWebDavManager>();
-            if (webDavManager != null && str == webDavManager.OrganizationName)
             {
                 actualOrgName = str;
                 return true;

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs

@@ -28,13 +28,21 @@ namespace WebsitePanel.WebDavPortal.Controllers
 {
     public class AccountController : Controller
     {
-        private readonly IKernel _kernel = new StandardKernel(new NinjectSettings {AllowNullInjection = true}, new WebDavExplorerAppModule());
+        private readonly AccountModel _accountModel;
+        private readonly IWebDavManager _webdavManager;
+        private readonly ICryptography _cryptography;
+
+        public AccountController(AccountModel accountModel, IWebDavManager webdavManager, ICryptography cryptography)
+        {
+            _accountModel = accountModel;
+            _webdavManager = webdavManager;
+            _cryptography = cryptography;
+        }
         
         [HttpGet]
         public ActionResult Login()
         {
-            object isAuthentication = _kernel.Get<AccountModel>();
+            if (_accountModel != null)
-            if (isAuthentication != null)
                 return RedirectToAction("ShowContent", "FileSystem");
             return View();
         }
@@ -54,16 +62,22 @@ namespace WebsitePanel.WebDavPortal.Controllers
 
                 model.Groups = ES.Services.Organizations.GetSecurityGroupsByMember(exchangeAccount.ItemId, exchangeAccount.AccountId);
 
+                WebDavManager manager = null;
+
                 try
                 {
                     Session[WebDavAppConfigManager.Instance.SessionKeys.AccountInfo] = model;
-                    Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = new WebDavManager(new NetworkCredential(model.Login, model.Password, WebDavAppConfigManager.Instance.UserDomain), exchangeAccount.ItemId);
+
+                    manager = new WebDavManager(new NetworkCredential(model.Login, model.Password, WebDavAppConfigManager.Instance.UserDomain), exchangeAccount.ItemId);
+
+                    Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = manager;
                 }
                 catch (ConnectToWebDavServerException exception)
                 {
                     return View(new AccountModel { LdapError = exception.Message });
                 }
-                return RedirectToAction("ShowContent", "FileSystem", new { org = _kernel.Get<IWebDavManager>().OrganizationName });
+
+                return RedirectToAction("ShowContent", "FileSystem", new { org = manager.OrganizationName });
             }
             return View(new AccountModel { LdapError = "The user name or password is incorrect" });
         }
@@ -78,15 +92,19 @@ namespace WebsitePanel.WebDavPortal.Controllers
 
         private void AutheticationToServicesUsingWebsitePanelUser()
         {
-            var crypto = _kernel.Get<ICryptography>();
             var websitePanelLogin = WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Login;
-            var websitePanelPassword = crypto.Decrypt(WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Password);
+            var websitePanelPassword = _cryptography.Decrypt(WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Password);
+
             var authTicket = new FormsAuthenticationTicket(1, websitePanelLogin, DateTime.Now, DateTime.Now.Add(FormsAuthentication.Timeout),
                 FormsAuthentication.SlidingExpiration, websitePanelPassword + Environment.NewLine);
             var encryptedTicket = FormsAuthentication.Encrypt(authTicket);
             var authCookie = new HttpCookie(FormsAuthentication.FormsCookieName, encryptedTicket);
+
             if (FormsAuthentication.SlidingExpiration)
+            {
                 authCookie.Expires = authTicket.Expiration;
+            }
+
             Response.Cookies.Add(authCookie);
         } 
     }

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs

@@ -22,26 +22,30 @@ namespace WebsitePanel.WebDavPortal.Controllers
     [LdapAuthorization]
     public class FileSystemController : Controller
     {
-        private readonly IKernel _kernel = new StandardKernel(new WebDavExplorerAppModule());
+        private readonly IWebDavManager _webdavManager;
+
+        public FileSystemController(IWebDavManager webdavManager)
+        {
+            _webdavManager = webdavManager;
+        }
 
         [HttpGet]
         public ActionResult ShowContent(string org, string pathPart = "")
         {
-            var webDavManager = new StandardKernel(new WebDavExplorerAppModule()).Get<IWebDavManager>();
+            if (org != _webdavManager.OrganizationName)
-            if (org != webDavManager.OrganizationName)
                 return new HttpStatusCodeResult(HttpStatusCode.NoContent);
             
             string fileName = pathPart.Split('/').Last();
-            if (webDavManager.IsFile(fileName))
+            if (_webdavManager.IsFile(fileName))
             {
-                var fileBytes = webDavManager.GetFileBytes(fileName);
+                var fileBytes = _webdavManager.GetFileBytes(fileName);
                 return File(fileBytes, MediaTypeNames.Application.Octet, fileName);
             }
 
             try
             {
-                webDavManager.OpenFolder(pathPart);
+                _webdavManager.OpenFolder(pathPart);
-                IEnumerable<IHierarchyItem> children = webDavManager.GetChildren().Where(x => !WebDavAppConfigManager.Instance.ElementsRendering.ElementsToIgnore.Contains(x.DisplayName.Trim('/')));
+                IEnumerable<IHierarchyItem> children = _webdavManager.GetChildren().Where(x => !WebDavAppConfigManager.Instance.ElementsRendering.ElementsToIgnore.Contains(x.DisplayName.Trim('/')));
 
                 var model = new ModelForWebDav { Items = children.Take(WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount), UrlSuffix = pathPart };
                 Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] = WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount;
@@ -56,8 +60,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
 
         public ActionResult ShowOfficeDocument(string org, string pathPart = "")
         {
-            var webDavManager = _kernel.Get<IWebDavManager>();
+            string fileUrl = _webdavManager.RootPath.TrimEnd('/') + "/" + pathPart.TrimStart('/');
-            string fileUrl = webDavManager.RootPath.TrimEnd('/') + "/" + pathPart.TrimStart('/');
             var uri = new Uri(WebDavAppConfigManager.Instance.OfficeOnline.Url).AddParameter("src", fileUrl).ToString();
 
             return View(new OfficeOnlineModel(uri, new Uri(fileUrl).Segments.Last()));
@@ -69,9 +72,11 @@ namespace WebsitePanel.WebDavPortal.Controllers
             if (Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] != null)
             {
                 var renderedElementsCount = (int)Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount];
-                var webDavManager = _kernel.Get<IWebDavManager>();
+
-                IEnumerable<IHierarchyItem> children = webDavManager.GetChildren();
+                IEnumerable<IHierarchyItem> children = _webdavManager.GetChildren();
+
                 var result = children.Skip(renderedElementsCount).Take(WebDavAppConfigManager.Instance.ElementsRendering.AddElementsCount);
+
                 Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] = renderedElementsCount + WebDavAppConfigManager.Instance.ElementsRendering.AddElementsCount;
 
                 return PartialView("_ResourseCollectionPartial", result);

WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/LdapAuthorizationAttribute.cs

@@ -4,6 +4,7 @@ using System.Web.Routing;
 using Ninject;
 using WebsitePanel.WebDavPortal.DependencyInjection;
 using WebsitePanel.WebDavPortal.Models;
+using WebsitePanel.WebDavPortal.UI.Routes;
 
 namespace WebsitePanel.WebDavPortal.CustomAttributes
 {
@@ -11,16 +12,19 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes
     {
         protected override bool AuthorizeCore(HttpContextBase httpContext)
         {
-            IKernel kernel = new StandardKernel(new NinjectSettings { AllowNullInjection = true }, new WebDavExplorerAppModule());
+            var accountInfo = DependencyResolver.Current.GetService<AccountModel>();
-            var accountInfo = kernel.Get<AccountModel>();
+
             if (accountInfo == null)
+            {
                 return false;
+            }
+
             return true;
         }
 
         protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext)
         {
-            filterContext.Result = new RedirectToRouteResult(new RouteValueDictionary(new { controller = "Account", action = "Login" }));
+            filterContext.Result = new RedirectToRouteResult(AccountRouteNames.Login, null);
         }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/NinjectDependecyResolver.cs

@@ -0,0 +1,35 @@
+using Ninject;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace WebsitePanel.WebDavPortal.DependencyInjection
+{
+    public class NinjectDependecyResolver : IDependencyResolver
+    {
+        IKernel kernal;
+
+        public NinjectDependecyResolver()
+        {
+            kernal = new StandardKernel(new NinjectSettings { AllowNullInjection = true });
+            AddBindings();
+        }
+
+        public object GetService(Type serviceType)
+        {
+            return kernal.TryGet(serviceType);
+        }
+
+        public IEnumerable<object> GetServices(Type serviceType)
+        {
+            return kernal.GetAll(serviceType);
+        }
+
+        private void AddBindings()
+        {
+            PortalDependencies.Configure(kernal);
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/PortalDependencies.cs

@@ -0,0 +1,23 @@
+using Ninject;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.SessionState;
+using WebsitePanel.WebDavPortal.Cryptography;
+using WebsitePanel.WebDavPortal.DependencyInjection.Providers;
+using WebsitePanel.WebDavPortal.Models;
+
+namespace WebsitePanel.WebDavPortal.DependencyInjection
+{
+    public class PortalDependencies
+    {
+        public static void Configure(IKernel kernerl)
+        {
+            kernerl.Bind<HttpSessionState>().ToProvider<HttpSessionStateProvider>();
+            kernerl.Bind<IWebDavManager>().ToProvider<WebDavManagerProvider>();
+            kernerl.Bind<AccountModel>().ToProvider<AccountInfoProvider>();
+            kernerl.Bind<ICryptography>().To<CryptoUtils>();
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/AccountInfoProvider.cs

@@ -0,0 +1,25 @@
+using System.Web.SessionState;
+using Ninject;
+using Ninject.Activation;
+using WebsitePanel.WebDavPortal.Config;
+using WebsitePanel.WebDavPortal.Models;
+
+namespace WebsitePanel.WebDavPortal.DependencyInjection.Providers
+{
+    public class AccountInfoProvider : Provider<AccountModel>
+    {
+        protected override AccountModel CreateInstance(IContext context)
+        {
+            var session = context.Kernel.Get<HttpSessionState>();
+
+            AccountModel accountInfo = null;
+
+            if (session != null)
+            {
+                accountInfo = session[WebDavAppConfigManager.Instance.SessionKeys.AccountInfo] as AccountModel;
+            }
+
+            return accountInfo;
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/HttpSessionStateProvider.cs

@@ -0,0 +1,17 @@
+using Ninject.Activation;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.SessionState;
+
+namespace WebsitePanel.WebDavPortal.DependencyInjection.Providers
+{
+    public class HttpSessionStateProvider : Provider<HttpSessionState>
+    {
+        protected override HttpSessionState CreateInstance(IContext context)
+        {
+            return HttpContext.Current.Session;
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebDavPortal/DependencyInjection/Providers/WebDavManagerProvider.cs

@@ -0,0 +1,25 @@
+using System.Web.SessionState;
+using Ninject;
+using Ninject.Activation;
+using WebsitePanel.WebDavPortal.Config;
+using WebsitePanel.WebDavPortal.Models;
+
+namespace WebsitePanel.WebDavPortal.DependencyInjection.Providers
+{
+    public class WebDavManagerProvider : Provider<WebDavManager>
+    {
+        protected override WebDavManager CreateInstance(IContext context)
+        {
+            var session = context.Kernel.Get<HttpSessionState>();
+
+            WebDavManager webDavManager = null;
+
+            if (session != null)
+            {
+                webDavManager = session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] as WebDavManager;
+            }
+
+            return webDavManager;
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Global.asax.cs

@@ -4,6 +4,7 @@ using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
 using WebsitePanel.WebDavPortal.Controllers;
+using WebsitePanel.WebDavPortal.DependencyInjection;
 
 namespace WebsitePanel.WebDavPortal
 {
@@ -15,6 +16,8 @@ namespace WebsitePanel.WebDavPortal
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
             RouteConfig.RegisterRoutes(RouteTable.Routes);
             BundleConfig.RegisterBundles(BundleTable.Bundles);
+
+            DependencyResolver.SetResolver(new NinjectDependecyResolver());
         }
 
         protected void Application_Error(object sender, EventArgs e)

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/WebDavManager.cs

@@ -11,12 +11,15 @@ using WebsitePanel.Portal;
 using WebsitePanel.Providers.OS;
 using Ninject;
 using WebsitePanel.WebDavPortal.DependencyInjection;
+using System.Web.Mvc;
 
 namespace WebsitePanel.WebDavPortal.Models
 {
     public class WebDavManager : IWebDavManager
     {
         private readonly WebDavSession _webDavSession = new WebDavSession();
+        private readonly AccountModel _accountModel;
+
         private IList<SystemFile> _rootFolders;
         private int _itemId;
         private IFolder _currentFolder;
@@ -36,11 +39,11 @@ namespace WebsitePanel.WebDavPortal.Models
 
         public WebDavManager(NetworkCredential credential, int itemId)
         {
+            _accountModel = DependencyResolver.Current.GetService<AccountModel>();
+
             _webDavSession.Credentials = credential;
             _itemId = itemId;
-            IKernel _kernel = new StandardKernel(new NinjectSettings { AllowNullInjection = true }, new WebDavExplorerAppModule());
+            _rootFolders = ConnectToWebDavServer(_accountModel);
-            var accountModel = _kernel.Get<AccountModel>();
-            _rootFolders = ConnectToWebDavServer(accountModel);
 
             if (_rootFolders.Any())
             {

WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/FileSystemRouteNames.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebsitePanel.WebDavPortal.UI.Routes
+{
+    public class FileSystemRouteNames
+    {
+        public const string FilePath = "FilePathRoute";
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml

@@ -2,7 +2,7 @@
 @using Ninject
 @model WebsitePanel.WebDavPortal.Models.ModelForWebDav
 @{
-    var webDavManager = (new StandardKernel(new WebsitePanel.WebDavPortal.DependencyInjection.WebDavExplorerAppModule())).Get<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
+    var webDavManager = DependencyResolver.Current.GetService<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
     ViewBag.Title = (string.IsNullOrEmpty(Model.UrlSuffix) ? webDavManager.OrganizationName : Model.UrlSuffix);
 }
 @Scripts.Render("~/bundles/jquery")

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml

@@ -18,8 +18,7 @@
             break;
         default:
             isTargetBlank = false;
-            IKernel _kernel = new StandardKernel(new WebsitePanel.WebDavPortal.DependencyInjection.WebDavExplorerAppModule());
+            var webDavManager = DependencyResolver.Current.GetService<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
-            var webDavManager = _kernel.Get<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
             href = Model.Href.AbsolutePath; 
             break;
     }

WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml

@@ -3,6 +3,11 @@
 @using WebsitePanel.WebDavPortal.DependencyInjection
 @using WebsitePanel.WebDavPortal.Models
 @using WebsitePanel.WebDavPortal.UI.Routes;
+
+@{
+    var account = DependencyResolver.Current.GetService<AccountModel>();
+}
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -25,8 +30,6 @@
             </div>
             <div class="navbar-collapse collapse">
                 @{
-                    IKernel kernel = new StandardKernel(new NinjectSettings { AllowNullInjection = true }, new WebDavExplorerAppModule());
-                    var account = kernel.Get<AccountModel>();
                     if (account != null)
                     {
                         <a id="logout" class="nav navbar-text navbar-right" href="@Url.RouteUrl(AccountRouteNames.Logout)" title="Log out"><i class="glyphicon glyphicon-log-out"></i></a>

WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj

@@ -158,9 +158,11 @@
     <Compile Include="Cryptography\CryptoUtils.cs" />
     <Compile Include="Cryptography\ICryptography.cs" />
     <Compile Include="CustomAttributes\LdapAuthorizationAttribute.cs" />
-    <Compile Include="DependencyInjection\AccountInfoProvider.cs" />
+    <Compile Include="DependencyInjection\Providers\AccountInfoProvider.cs" />
-    <Compile Include="DependencyInjection\WebDavExplorerAppModule.cs" />
+    <Compile Include="DependencyInjection\NinjectDependecyResolver.cs" />
-    <Compile Include="DependencyInjection\WebDavManagerProvider.cs" />
+    <Compile Include="DependencyInjection\PortalDependencies.cs" />
+    <Compile Include="DependencyInjection\Providers\HttpSessionStateProvider.cs" />
+    <Compile Include="DependencyInjection\Providers\WebDavManagerProvider.cs" />
     <Compile Include="Exceptions\ConnectToWebDavServerException.cs" />
     <Compile Include="Exceptions\ResourceNotFoundException.cs" />
     <Compile Include="Extensions\DictionaryExtensions.cs" />