Changeset 5700 for branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models

Timestamp:

03/15/11 20:56:57 (14 years ago)

Author:

wtollsch

Message:

#1433 adjusted HLWebOKBAdminPlugin to new Service (AdministrationService)

File:

• branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AlgorithmClassModel.cs (modified) (2 diffs)

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AlgorithmClassModel.cs

@@ -5 +5 @@
 using System.ServiceModel.Security;
 using System.Web.Security;
+using HLWebOKBAdminPlugin.OKBAdministrationService;
 
 namespace HLWebPluginHost.Models {
     public class AlgorithmClassModel {
 
+        private AdministrationServiceClient CertificateValidator() {
+            AdministrationServiceClient asc = new AdministrationServiceClient();
+
+            asc.ClientCredentials.UserName.UserName = Membership.GetUser().UserName;
+            asc.ClientCredentials.UserName.Password = HttpContext.Current.Session["pwd"].ToString();
+            asc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
+
+            return asc;
+        }//CertificateValidator
+
         public int NumOfClasses { get; set; }
-        public List<OKBService.AlgorithmClass> AlgorithmClassList { get; set; }
+        public List<AlgorithmClass> AlgorithmClassList { get; set; }
 
-        public List<OKBService.AlgorithmClass> AlgorithmClassGetAll() {
-            //returns list of algorithm classes
-            OKBService.OKBServiceClient sc = new OKBService.OKBServiceClient();
-            sc.ClientCredentials.UserName.UserName = Membership.GetUser().UserName;
-            sc.ClientCredentials.UserName.Password = HttpContext.Current.Session["pwd"].ToString();
-            sc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
+        public List<AlgorithmClass> AlgorithmClassGetAll() {
+            //returns list of algorithm classes            
+            AdministrationServiceClient asc = CertificateValidator();
 
-            var agcList = new List<OKBService.AlgorithmClass>();
+            var agcList = new List<AlgorithmClass>();
 
-            OKBService.AlgorithmClass[] ac = sc.GetAlgorithmClasses();
-            foreach (OKBService.AlgorithmClass a in ac) {
+            AlgorithmClass[] ac = asc.GetAlgorithmClasses();
+            foreach (AlgorithmClass a in ac) {
                 agcList.Add(a);
 
@@ -34 +42 @@
             long retValue;
             //get service client
-            OKBService.OKBServiceClient sc = new OKBService.OKBServiceClient();
-            sc.ClientCredentials.UserName.UserName = Membership.GetUser().UserName;
-            sc.ClientCredentials.UserName.Password = HttpContext.Current.Session["pwd"].ToString();
-            sc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
+            AdministrationServiceClient asc = CertificateValidator();
 
-            OKBService.AlgorithmClass ac = new OKBService.AlgorithmClass();
+            AlgorithmClass ac = new AlgorithmClass();
             //test
             //ac.Id = 8;
             ac.Name = name;
             ac.Description = description;
-            retValue = sc.AddAlgorithmClass(ac);
+            retValue = asc.AddAlgorithmClass(ac);
             
             return true;