Changeset 4321 for trunk/sources

Timestamp:

08/26/10 04:23:35 (14 years ago)

Author:

swagner

Message:

Worked on OKB user authentication (#1167)

Location:

trunk/sources

Files:

• HeuristicLab.Services.OKB.DataAccess/3.3/SQL Scripts/Initialize OKB.sql (modified) (previous)
• HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/RunnerService.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

@@ -115 +115 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />

trunk/sources/HeuristicLab.Services.OKB/3.3/RunnerService.cs

@@ -25 +25 @@
 using System.Linq;
 using System.ServiceModel;
+using System.Web.Security;
 using HeuristicLab.Services.OKB.DataAccess;
 using log4net;
@@ -307 +308 @@
     /// </returns>
     public bool Login(string clientname) {
-      string username = ServiceSecurityContext.Current.PrimaryIdentity.Name;
-
-      Log("Authenticating {0}@{1}", username, clientname);
-      if (string.IsNullOrEmpty(username) ||
+      MembershipUser user = Membership.GetUser();
+
+      Log("Authenticating {0}@{1}", user.UserName, clientname);
+      if (user == null ||
           string.IsNullOrEmpty(clientname) ||
           ServiceSecurityContext.Current.IsAnonymous) {
@@ -317 +318 @@
       }
       using (OKBDataContext okb = new OKBDataContext()) {
-        currentUser = okb.Users.SingleOrDefault(u => u.Name == username);
+        currentUser = okb.Users.SingleOrDefault(u => u.Id == (Guid)user.ProviderUserKey);
         currentClient = okb.Clients.SingleOrDefault(c => c.Name == clientname);
         if (currentUser == null) {
-          currentUser = new User() { Name = username, Id = Guid.NewGuid() };
+          currentUser = new User() { Name = user.UserName, Id = (Guid)user.ProviderUserKey };
           okb.Users.InsertOnSubmit(currentUser);
           okb.SubmitChanges();