Author: krasnov
Date: 2006-11-26 10:36:52 -0500 (Sun, 26 Nov 2006)
New Revision: 68478
Added:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/ChangeLog
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipProvider.cs
Log:
* DerbyMembershipHelper.cs:
* DerbyMembershipProvider.cs: fixed CreateUser method, when user already exists
in Users table and adding Membership info
Added: trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/ChangeLog
===================================================================
--- trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/ChangeLog
2006-11-26 15:34:53 UTC (rev 68477)
+++ trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/ChangeLog
2006-11-26 15:36:52 UTC (rev 68478)
@@ -0,0 +1,5 @@
+2006-11-26 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * DerbyMembershipHelper.cs:
+ * DerbyMembershipProvider.cs: fixed CreateUser method, when user
+ already exists in Users table and adding Membership info
\ No newline at end of file
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
===================================================================
--- trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
2006-11-26 15:34:53 UTC (rev 68477)
+++ trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
2006-11-26 15:36:52 UTC (rev 68478)
@@ -78,7 +78,7 @@
// the user exists in users table, this
can occure when user
// does not have membership
information, but has other information
// like roles, etc.
- if (userId != null && newUserId !=
(string) userId) {
+ if (userId != null && newUserId != null
&& newUserId != (string) userId) {
trans.Rollback ();
return 9; // wrong userid
provided
}
@@ -88,6 +88,7 @@
trans.Rollback ();
return 10; // wrong userid provided
}
+ newUserId = (string) userId;
string selectQueryMbrUserId = "SELECT UserId
FROM aspnet_Membership WHERE UserId = ?";
OleDbCommand selectCmdMbrUserId = new
OleDbCommand (selectQueryMbrUserId, (OleDbConnection) connection);
@@ -138,7 +139,7 @@
AddParameter (cmdInsertMbr, "PasswordFormat",
passwordFormat);
AddParameter (cmdInsertMbr, "PasswordSalt",
passwordSalt);
AddParameter (cmdInsertMbr, "Email", email);
- AddParameter (cmdInsertMbr, "LoweredEmail",
email.ToLower ());
+ AddParameter (cmdInsertMbr, "LoweredEmail",
email != null ? email.ToLower () : null);
AddParameter (cmdInsertMbr, "PasswordQuestion",
pwdQuestion);
AddParameter (cmdInsertMbr, "PasswordAnswer",
pwdAnswer);
AddParameter (cmdInsertMbr, "IsApproved",
isApproved);
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipProvider.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipProvider.cs
2006-11-26 15:34:53 UTC (rev 68477)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipProvider.cs
2006-11-26 15:36:52 UTC (rev 68478)
@@ -184,9 +184,6 @@
return null;
}
- if (providerUserKey == null)
- providerUserKey = Guid.NewGuid ().ToString ();
-
/* encode our password/answer using the
* "passwordFormat" configuration option */
string passwordSalt = "";
@@ -238,7 +235,7 @@
return null;
}
- catch (Exception e) {
+ catch (Exception) {
status =
MembershipCreateStatus.ProviderError;
return null;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
