Changeset 5350

Timestamp:

01/21/11 16:26:07 (14 years ago)

Author:

jwolfing

Message:

#1196 added setpassword to the model

Location:

branches/UserManagement

Files:

• HeuristicLab.Authentication.suo (modified) (previous)
• HeuristicLab.Services.Authentication.DataAccess/UserManagement.dbml (modified) (1 diff)
• HeuristicLab.Services.Authentication.DataAccess/UserManagement.designer.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication.ServiceClients/HeuristicLab.Services.Authentication.ServiceClient.csproj (modified) (1 diff)
• HeuristicLab.Services.Authentication/AuthenticationService.cs (modified) (1 diff)

branches/UserManagement/HeuristicLab.Services.Authentication.DataAccess/UserManagement.dbml

@@ -72 +72 @@
     </Type>
   </Table>
-  <Function Name="dbo.aspnet_Membership_ResetPassword" Method="aspnet_Membership_ResetPassword">
+  <Function Name="dbo.aspnet_Membership_SetPassword" Method="aspnet_Membership_SetPassword">
     <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
     <Parameter Name="UserName" Parameter="userName" Type="System.String" DbType="NVarChar(256)" />
     <Parameter Name="NewPassword" Parameter="newPassword" Type="System.String" DbType="NVarChar(128)" />
-    <Parameter Name="MaxInvalidPasswordAttempts" Parameter="maxInvalidPasswordAttempts" Type="System.Int32" DbType="Int" />
-    <Parameter Name="PasswordAttemptWindow" Parameter="passwordAttemptWindow" Type="System.Int32" DbType="Int" />
     <Parameter Name="PasswordSalt" Parameter="passwordSalt" Type="System.String" DbType="NVarChar(128)" />
     <Parameter Name="CurrentTimeUtc" Parameter="currentTimeUtc" Type="System.DateTime" DbType="DateTime" />
     <Parameter Name="PasswordFormat" Parameter="passwordFormat" Type="System.Int32" DbType="Int" />
-    <Parameter Name="PasswordAnswer" Parameter="passwordAnswer" Type="System.String" DbType="NVarChar(128)" />
     <Return Type="System.Int32" />
   </Function>

branches/UserManagement/HeuristicLab.Services.Authentication.DataAccess/UserManagement.designer.cs

@@ -118 +118 @@
     }
     
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Membership_ResetPassword")]
-    public int aspnet_Membership_ResetPassword([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="NewPassword", DbType="NVarChar(128)")] string newPassword, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="MaxInvalidPasswordAttempts", DbType="Int")] System.Nullable<int> maxInvalidPasswordAttempts, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordAttemptWindow", DbType="Int")] System.Nullable<int> passwordAttemptWindow, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordSalt", DbType="NVarChar(128)")] string passwordSalt, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="CurrentTimeUtc", DbType="DateTime")] System.Nullable<System.DateTime> currentTimeUtc, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordFormat", DbType="Int")] System.Nullable<int> passwordFormat, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordAnswer", DbType="NVarChar(128)")] string passwordAnswer)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userName, newPassword, maxInvalidPasswordAttempts, passwordAttemptWindow, passwordSalt, currentTimeUtc, passwordFormat, passwordAnswer);
+    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Membership_SetPassword")]
+    public int aspnet_Membership_SetPassword([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="NewPassword", DbType="NVarChar(128)")] string newPassword, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordSalt", DbType="NVarChar(128)")] string passwordSalt, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="CurrentTimeUtc", DbType="DateTime")] System.Nullable<System.DateTime> currentTimeUtc, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordFormat", DbType="Int")] System.Nullable<int> passwordFormat)
+    {
+      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userName, newPassword, passwordSalt, currentTimeUtc, passwordFormat);
       return ((int)(result.ReturnValue));
     }

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/HeuristicLab.Services.Authentication.ServiceClient.csproj

@@ -70 +70 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="HeuristicLab.snk" />
     <None Include="ServiceClients\GenerateServiceClients.cmd" />

branches/UserManagement/HeuristicLab.Services.Authentication/AuthenticationService.cs

@@ -145 +145 @@
 
 
-    // TODO !!!
+
     public User ResetPassword(string applicationName, string userName, string password) {
 
       string salt = "";
-      string answer = "";
-
-      using (UserManagementDataContext db = new UserManagementDataContext()) {
-        db.aspnet_Membership_ResetPassword(applicationName, userName, password, null, null, salt, null, null, answer);
+      int format = 1; //Password format (0=Plaintext, 1=Hashed, 2=Encrypted)
+
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        db.aspnet_Membership_SetPassword(applicationName, userName, password, salt, DateTime.UtcNow, format);
         return null;
       }