Changeset 3940

Timestamp:

06/23/10 20:46:30 (14 years ago)

Author:

hmayr

Message:

commit all current changes, so bfarka can try something (#1046):

• extended DataClasses in Persistence.csproj
• added DatabaseUtil.cs to Persistence.csproj
• added HeuristicLabUserTest.cs to UnitTests.csproj

Location:

branches/HeuristicLab.Services.Authentication Prototype

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Authentication Prototyp.vsmdi (modified) (1 diff)
• Persistence/DataClasses.cs (modified) (1 diff)
• Persistence/DataClasses.dbml (modified) (1 diff)
• Persistence/DataClasses.dbml.layout (modified) (1 diff)
• Persistence/DatabaseUtil.cs (added)
• Persistence/Persistence.csproj (modified) (2 diffs)
• UnitTests/HeuristicLabUserTest.cs (added)
• UnitTests/Test References (added)
• UnitTests/Test References/Persistence.accessor (added)
• UnitTests/UnitTests.csproj (modified) (3 diffs)

branches/HeuristicLab.Services.Authentication Prototype

@@ -1 +1 @@
 *.suo
+PersistenceTest
+TestResults

@@ -1 +1 @@
 *.suo
+PersistenceTest
+TestResults

branches/HeuristicLab.Services.Authentication Prototype/HeuristicLab.Services.Authentication Prototyp.vsmdi

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
+  <TestList name="HeuristicLabUserTestList" id="1ebca506-0e3e-4cc3-800e-9905f9a66bd2" parentListId="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
+    <Description>just first test for HeuristicLabUser</Description>
+    <TestLinks>
+      <TestLink id="def90666-533d-bda5-8a29-fde7f290333f" name="createDBTest" storage="unittests\bin\debug\unittests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    </TestLinks>
+  </TestList>
   <TestList name="Testlisten" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
     <RunConfiguration id="3cde0e70-9e75-4b76-a987-9e1d702958f0" name="Lokaler Testlauf" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common,   PublicKeyToken=b03f5f7f11d50a3a" />

branches/HeuristicLab.Services.Authentication Prototype/Persistence/DataClasses.cs

@@ +1 @@
+using System;
 using System.Web.Security;
+
 namespace Persistence {
   partial class HeuristicLabUser : MembershipUser {
+    public override bool ChangePassword(string oldPassword, string newPassword) {
+      if (oldPassword == null) {
+        throw new ArgumentNullException("oldPassword");
+      }
+      if (newPassword == null) {
+        throw new ArgumentNullException("newPassword");
+      }
+      if (oldPassword.Length == 0) {
+        throw new ArgumentException("Parameter oldPassword must not be empty!");
+      }
+      if (newPassword.Length == 0) {
+        throw new ArgumentException("Parameter newPassword must not be empty!");
+      }
+
+      if (Password.CompareTo(oldPassword) == 0) {
+        Password = newPassword;
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    public override bool ChangePasswordQuestionAndAnswer(string password, string newPasswordQuestion, string newPasswordAnswer) {
+      if (password == null) {
+        throw new ArgumentNullException("password");
+      }
+      if (newPasswordQuestion == null) {
+        throw new ArgumentNullException("newPasswordQuestion");
+      }
+      if (newPasswordAnswer == null) {
+        throw new ArgumentNullException("newPasswordAnswer");
+      }
+      if (password.Length == 0) {
+        throw new ArgumentException("Parameter password must not be empty!");
+      }
+      if (newPasswordQuestion.Length == 0) {
+        throw new ArgumentException("Parameter newPasswordQuestion must not be empty!");
+      }
+      if (newPasswordAnswer.Length == 0) {
+        throw new ArgumentException("Parameter newPasswordAnswer must not be empty!");
+      }
+
+      if (Password.CompareTo(password) == 0) {
+        _PasswordQuestion = newPasswordQuestion;
+        PasswordAnswer = newPasswordAnswer;
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    public override string GetPassword() {
+      return Password;
+    }
+
+    //
+    // Summary:
+    //     Gets the password for the membership user from the membership data store.
+    //
+    // Parameters:
+    //   passwordAnswer:
+    //     The password answer for the membership user.
+    //
+    // Returns:
+    //     The password for the membership user.
+    public override string GetPassword(string passwordAnswer) {
+      throw new NotImplementedException();
+    }
+
+    //
+    // Summary:
+    //     Resets a user's password to a new, automatically generated password.
+    //
+    // Returns:
+    //     The new password for the membership user.
+    public override string ResetPassword() {
+      throw new NotImplementedException();
+    }
+
+    //
+    // Summary:
+    //     Resets a user's password to a new, automatically generated password.
+    //
+    // Parameters:
+    //   passwordAnswer:
+    //     The password answer for the membership user.
+    //
+    // Returns:
+    //     The new password for the membership user.
+    public override string ResetPassword(string passwordAnswer) {
+      throw new NotImplementedException();
+    }
+
+    public override string ToString() {
+      return UserName;
+    }
+
+    //
+    // Summary:
+    //     Clears the locked-out state of the user so that the membership user can be
+    //     validated.
+    //
+    // Returns:
+    //     true if the membership user was successfully unlocked; otherwise, false.
+    public override bool UnlockUser() {
+      throw new NotImplementedException();
+    }
   }
 }

branches/HeuristicLab.Services.Authentication Prototype/Persistence/DataClasses.dbml

@@ -3 +3 @@
   <Table Name="" Member="HeuristicLabUsers">
     <Type Name="HeuristicLabUser">
-      <Column Member="Comment" Modifier="Virtual" Type="System.String" CanBeNull="false" />
+      <Column Name="UserName" Modifier="Override" Type="System.String" IsReadOnly="true" CanBeNull="false" />
+      <Column Name="Password" Type="System.String" CanBeNull="false" />
+      <Column Name="PasswordQuestion" Modifier="Override" Type="System.String" IsReadOnly="true" CanBeNull="false" />
+      <Column Name="LastPasswordChangedDate" Modifier="Override" Type="System.DateTime" IsReadOnly="true" CanBeNull="false" />
+      <Column Name="Email" Modifier="Override" Type="System.String" CanBeNull="false" />
+      <Column Name="Comment" Modifier="Override" Type="System.String" CanBeNull="false" />
+      <Column Name="PasswordAnswer" Type="System.String" CanBeNull="false" />
+      <Column Member="id" AutoSync="Never" Type="System.Int64" IsReadOnly="true" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" UpdateCheck="Always" />
     </Type>
   </Table>

branches/HeuristicLab.Services.Authentication Prototype/Persistence/DataClasses.dbml.layout

@@ -3 +3 @@
   <DataContextMoniker Name="/DataClassesDataContext" />
   <nestedChildShapes>
-    <classShape Id="d272bb7d-2ecc-4bb7-851f-8e1ecee6fdbd" absoluteBounds="3.625, 1.875, 2, 1.0016910807291666">
+    <classShape Id="d272bb7d-2ecc-4bb7-851f-8e1ecee6fdbd" absoluteBounds="3.625, 1.875, 2, 2.3478011067708326">
       <DataClassMoniker Name="/DataClassesDataContext/HeuristicLabUser" />
       <nestedChildShapes>
-        <elementListCompartment Id="cb578485-5602-4fe8-96b8-63d240ffa2d9" absoluteBounds="3.64, 2.335, 1.9700000000000002, 0.44169108072916663" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="cb578485-5602-4fe8-96b8-63d240ffa2d9" absoluteBounds="3.64, 2.335, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>

branches/HeuristicLab.Services.Authentication Prototype/Persistence/Persistence.csproj

@@ -50 +50 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DatabaseUtil.cs" />
     <Compile Include="DataClasses.cs">
       <DependentUpon>DataClasses.dbml</DependentUpon>
     </Compile>
-    <Compile Include="HeuristicLabUser.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>HeuristicLabUser.dbml</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="HeuristicLabUser.dbml">
-      <Generator>MSLinqToSQLGenerator</Generator>
-      <LastGenOutput>HeuristicLabUser.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
@@ -71 +60 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="ClassDiagram1.cd" />
     <None Include="DataClasses.dbml">
       <Generator>MSLinqToSQLGenerator</Generator>
       <SubType>Designer</SubType>
-    </None>
-    <None Include="HeuristicLabUser.dbml.layout">
-      <DependentUpon>HeuristicLabUser.dbml</DependentUpon>
     </None>
   </ItemGroup>

branches/HeuristicLab.Services.Authentication Prototype/UnitTests/UnitTests.csproj

@@ -39 +39 @@
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Runtime.Serialization">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -54 +60 @@
     <Compile Include="HeuristicLabMembershipProviderTest.cs" />
     <Compile Include="HeuristicLabRoleProviderTest.cs" />
+    <Compile Include="HeuristicLabUserTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -69 +76 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Shadow Include="Test References\Persistence.accessor" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

@@ -1 +1 @@
 *.suo
+PersistenceTest
+TestResults