Changeset 4312 for branches/OKB

Timestamp:

08/25/10 04:31:15 (14 years ago)

Author:

swagner

Message:

Worked on OKB user authentication (#1167)

Location:

branches/OKB/HeuristicLab.OKB.AlgorithmHost

Files:

• AlgorithmHost.cs (modified) (3 diffs)
• Service References/OKBRunner/Reference.cs (modified) (2 diffs)
• Service References/OKBRunner/service.xsd (modified) (1 diff)

branches/OKB/HeuristicLab.OKB.AlgorithmHost/AlgorithmHost.cs

@@ -106 +106 @@
     public OKBRunner.StarterKit StarterKit { get; set; }
 
-    private static string username = Environment.UserDomainName + "\\" + Environment.UserName;
-
     public OKBRunner.StarterKit DownloadStarerKit() {
       OKBRunner.RunnerServiceClient client =
         ClientFactory.Create<OKBRunner.RunnerServiceClient, OKBRunner.IRunnerService>();
-      client.Login(username, Environment.MachineName);
+      client.Login(Environment.MachineName);
       OKBRunner.StarterKit starterKit = client.GetStarterKit("HL 3.3");
       client.Logout();
@@ -192 +190 @@
     public void SubmitRun(OKBRunner.ExperimentKit experimentKit) {
       var client = ClientFactory.Create<OKBRunner.RunnerServiceClient, OKBRunner.IRunnerService>();
-      client.Login(username, Environment.MachineName);
+      client.Login(Environment.MachineName);
       client.AddRun(experimentKit.Algorithm, experimentKit.Problem, StarterKit.Projects.First());
       client.Logout();
@@ -270 +268 @@
       OKBRunner.RunnerServiceClient client =
         ClientFactory.Create<OKBRunner.RunnerServiceClient, OKBRunner.IRunnerService>();
-      client.Login(username, Environment.MachineName);
+      client.Login(Environment.MachineName);
       OKBRunner.ExperimentKit experimentKit = client.PrepareExperiment(OKBAlgorithm, OKBProblem);
       client.Logout();

branches/OKB/HeuristicLab.OKB.AlgorithmHost/Service References/OKBRunner/Reference.cs

@@ -4109 +4109 @@
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IRunnerService/Login", ReplyAction="http://tempuri.org/IRunnerService/LoginResponse")]
-        bool Login(string username, string clientname);
+        bool Login(string clientname);
         
         [System.ServiceModel.OperationContractAttribute(IsInitiating=false, Action="http://tempuri.org/IRunnerService/GetStarterKit", ReplyAction="http://tempuri.org/IRunnerService/GetStarterKitResponse")]
@@ -4154 +4154 @@
         }
         
-        public bool Login(string username, string clientname) {
-            return base.Channel.Login(username, clientname);
+        public bool Login(string clientname) {
+            return base.Channel.Login(clientname);
         }
         

branches/OKB/HeuristicLab.OKB.AlgorithmHost/Service References/OKBRunner/service.xsd

@@ -6 +6 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="username" nillable="true" type="xs:string" />
         <xs:element minOccurs="0" name="clientname" nillable="true" type="xs:string" />
       </xs:sequence>