Changeset 9215 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/AdminController.cs

Timestamp:

02/11/13 10:15:52 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Janitor is now working as expected in Windows Azure
• Added basic support for experiments (draggable experiments)
• Added methods to save/read experiments from TableStorage
• The job status can now be retrieved by using the GetTasks/GetTaskData methods
• Added a class to convert JSON-objects to Algorithm instances
• Web page: Added experiment button to navigation

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/AdminController.cs (modified) (5 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/AdminController.cs

@@ -13 +13 @@
 using System.Web.Security;
 using HeuristicLab.Services.Optimization.ControllerService.Model;
+using HeuristicLab.Services.Optimization.Web.Helpers;
 
 namespace HeuristicLab.Services.Optimization.Web.Controllers
@@ -19 +20 @@
     public class AdminController : Controller
     {
-      public delegate T ControllerServiceDelegate<T>(IControllerService service);
-      public delegate void ControllerServiceDelegate(IControllerService service);
-
-      public T withControllerService<T>(ControllerServiceDelegate<T> del) {
-        using (var cf = new ChannelFactory<IControllerService>(OptimizationController.DEFAULT_CONTROLLER_ENDPOINT)) {
-          var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
-          credentialBehaviour.UserName.UserName = Membership.GetUser().UserName;
-          credentialBehaviour.UserName.Password = Session["pw"] as string;
-          var controllerProxy = cf.CreateChannel();
-          return del(controllerProxy);
+      private ControllerServiceHelper ControllerService {
+          get {
+            var helper = new ControllerServiceHelper(Session["pw"] as string);
+            if (!helper.Valid) {
+              Response.Redirect("/Account/Logon");
+            }
+            return helper;
+          }
         }
-      }
-
-      public void withControllerService(ControllerServiceDelegate del) {
-        using (var cf = new ChannelFactory<IControllerService>(OptimizationController.DEFAULT_CONTROLLER_ENDPOINT)) {
-          var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
-          credentialBehaviour.UserName.UserName = Membership.GetUser().UserName;
-          credentialBehaviour.UserName.Password = Session["pw"] as string;
-          var controllerProxy = cf.CreateChannel();
-          del(controllerProxy);
-        }
-      }
         //
         // GET: /Admin/
@@ -46 +34 @@
         public ActionResult Index()
         {
-          var names = withControllerService<IEnumerable<string>>((service) => {            
+          var names = ControllerService.withControllerService<IEnumerable<string>>((service) => {            
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
             return service.GetOptimizationScenarioNames();
@@ -68 +56 @@
           }
 
-          var ok = withControllerService<bool>((service) => {
+          var ok = ControllerService.withControllerService<bool>((service) => {
             OptimizationModel model = new OptimizationModel();
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
@@ -78 +66 @@
 
         public ActionResult DeleteScenario(string id) {
-          withControllerService<bool>((service) => {            
+          ControllerService.withControllerService<bool>((service) => {            
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
             return service.DeleteHiveScenario(u, id);