History

GSF.Core: Added IsUserSID() and IsGroupSID() methods to UserInfo. GSF.TimeSeries: Fixed TimeSeriesStartupOperations user and group validation to check the type of an account before converting it to a SID. GSF.TimeSeries.UI: Fixed instances of SIDs appearing on the SecurityUserControl.

StephenCWills committed 12 years ago

Commit a9cb41b1 parent 70b60316 files · +153 −45Browse files

Unified · Split

6 files
  1. Source/Libraries/GSF.Core/Identity/UserInfo.cs +46 −0
  2. Source/Libraries/GSF.PhasorProtocols/UI/WPF/UserControls/HomeUserControl.xaml.cs +23 −13
  3. Source/Libraries/GSF.TimeSeries/TimeSeriesStartupOperations.cs +2 −2
  4. Source/Libraries/GSF.TimeSeries/Transport/UI/WPF/UserControls/HomeUserControl.xaml.cs +23 −11
  5. Source/Libraries/GSF.TimeSeries/UI/DataModels/SecurityGroup.cs +35 −15
  6. Source/Libraries/GSF.TimeSeries/UI/DataModels/UserAccount.cs +24 −4
Source/Libraries/GSF.Core/Identity/UserInfo.cs+46−0
@@ -2731,6 +2731,52 @@ namespace GSF.Identity · 2730 unmodified lines
27312731 #endif
27322732 }
27332733
2734+ /// <summary>
2735+ /// Determines whether the given security identifier identifies a user account.
2736+ /// </summary>
2737+ /// <param name="sid">The security identifier.</param>
2738+ /// <returns>True if the security identifier identifies a user account; false otherwise.</returns>
2739+ public static bool IsUserSID(string sid)
2740+ {
2741+#if MONO
2742+ throw new NotSupportedException("Not supported under Mono.");
2743+#else
2744+ try
2745+ {
2746+ string accountName = SIDToAccountName(sid);
2747+ DirectoryEntry entry = new DirectoryEntry(string.Format("WinNT://{0}", ValidateGroupName(accountName).Replace('\\', '/')));
2748+ return entry.SchemaClassName.Equals("User", StringComparison.OrdinalIgnoreCase);
2749+ }
2750+ catch (COMException)
2751+ {
2752+ return false;
2753+ }
2754+#endif
2755+ }
2756+
2757+ /// <summary>
2758+ /// Determines whether the given security identifier identifies a group.
2759+ /// </summary>
2760+ /// <param name="sid">The security identifier.</param>
2761+ /// <returns>True if the security identifier identifies a group; false otherwise.</returns>
2762+ public static bool IsGroupSID(string sid)
2763+ {
2764+#if MONO
2765+ throw new NotSupportedException("Not supported under Mono.");
2766+#else
2767+ try
2768+ {
2769+ string accountName = SIDToAccountName(sid);
2770+ DirectoryEntry entry = new DirectoryEntry(string.Format("WinNT://{0}", ValidateGroupName(accountName).Replace('\\', '/')));
2771+ return entry.SchemaClassName.Equals("Group", StringComparison.OrdinalIgnoreCase);
2772+ }
2773+ catch (COMException)
2774+ {
2775+ return false;
2776+ }
2777+#endif
2778+ }
2779+
27342780 // DirectoryEntry will only resolve "BUILTIN\" groups with a dot ".\"
27352781 private static string ValidateGroupName(string groupName)
27362782 {
Source/Libraries/GSF.PhasorProtocols/UI/WPF/UserControls/HomeUserControl.xaml.cs+23−13
@@ -138,8 +138,6 @@ namespace GSF.PhasorProtocols.UI.UserControls · 137 unmodified lines
138138 if (!CommonFunctions.CurrentPrincipal.IsInRole("Administrator,Editor"))
139139 ButtonInputWizard.IsEnabled = false;
140140
141−
142−
143141 m_windowsServiceClient = CommonFunctions.GetWindowsServiceClient();
144142
145143 if (m_windowsServiceClient == null || m_windowsServiceClient.Helper.RemotingClient.CurrentState != ClientState.Connected)
@@ -171,27 +169,39 @@ namespace GSF.PhasorProtocols.UI.UserControls · 25 unmodified lines
171169 Version appVersion = AssemblyInfo.EntryAssembly.Version;
172170 TextBlockManagerVersion.Text = appVersion.Major + "." + appVersion.Minor + "." + appVersion.Build + ".0";
173171
174− using (AdoDataConnection database = new AdoDataConnection(CommonFunctions.DefaultSettingsCategory))
172+ try
175173 {
176− TextBlockDatabaseType.Text = database.DatabaseType.ToString();
177−
178− if (database.DatabaseType == DatabaseType.SQLite || database.DatabaseType == DatabaseType.Access)
174+ using (AdoDataConnection database = new AdoDataConnection(CommonFunctions.DefaultSettingsCategory))
179175 {
176+ TextBlockDatabaseType.Text = database.DatabaseType.ToString();
177+
180178 try
181179 {
182− // Extract database file name from connection string for file centric databases
183− TextBlockDatabaseName.Text = FilePath.GetFileName(ConfigurationFile.Current.Settings[CommonFunctions.DefaultSettingsCategory]["ConnectionString"].Value.ParseKeyValuePairs()["Data Source"]);
180+ if (database.IsSqlite || database.IsJetEngine)
181+ {
182+ // Extract database file name from connection string for file centric databases
183+ TextBlockDatabaseName.Text = FilePath.GetFileName(database.Connection.ConnectionString.ParseKeyValuePairs()["Data Source"]);
184+ }
185+ else if (database.IsOracle)
186+ {
187+ // Extract user name from connection string for Oracle databases
188+ TextBlockDatabaseName.Text = database.Connection.ConnectionString.ParseKeyValuePairs()["User Id"];
189+ }
190+ else
191+ {
192+ TextBlockDatabaseName.Text = database.Connection.Database;
193+ }
184194 }
185195 catch
186196 {
187− // Fall back on database name if file name extraction fails
197+ // Fall back on database name if file anything fails
188198 TextBlockDatabaseName.Text = database.Connection.Database;
189199 }
190200 }
191− else
192− {
193− TextBlockDatabaseName.Text = database.Connection.Database;
194− }
201+ }
202+ catch
203+ {
204+ TextBlockDatabaseName.Text = "Not Avaliable";
195205 }
196206
197207 try
Source/Libraries/GSF.TimeSeries/TimeSeriesStartupOperations.cs+2−2
@@ -135,7 +135,7 @@ namespace GSF.TimeSeries · 134 unmodified lines
135135 {
136136 sid = UserInfo.AccountNameToSID(accountName);
137137
138− if (!ReferenceEquals(accountName, sid))
138+ if (!ReferenceEquals(accountName, sid) && UserInfo.IsUserSID(sid))
139139 updateMap.Add(id, sid);
140140 }
141141 }
@@ -159,7 +159,7 @@ namespace GSF.TimeSeries · 17 unmodified lines
159159 {
160160 sid = UserInfo.AccountNameToSID(accountName);
161161
162− if (!ReferenceEquals(accountName, sid))
162+ if (!ReferenceEquals(accountName, sid) && UserInfo.IsGroupSID(sid))
163163 updateMap.Add(id, sid);
164164 }
165165 }
Source/Libraries/GSF.TimeSeries/Transport/UI/WPF/UserControls/HomeUserControl.xaml.cs+23−11
@@ -169,27 +169,39 @@ namespace GSF.TimeSeries.Transport.UI.UserControls · 168 unmodified lines
169169 Version appVersion = AssemblyInfo.EntryAssembly.Version;
170170 TextBlockManagerVersion.Text = appVersion.Major + "." + appVersion.Minor + "." + appVersion.Build + ".0";
171171
172− using (AdoDataConnection database = new AdoDataConnection(CommonFunctions.DefaultSettingsCategory))
172+ try
173173 {
174− TextBlockDatabaseType.Text = database.DatabaseType.ToString();
175−
176− if (database.DatabaseType == DatabaseType.SQLite || database.DatabaseType == DatabaseType.Access)
174+ using (AdoDataConnection database = new AdoDataConnection(CommonFunctions.DefaultSettingsCategory))
177175 {
176+ TextBlockDatabaseType.Text = database.DatabaseType.ToString();
177+
178178 try
179179 {
180− // Extract database file name from connection string for file centric databases
181− TextBlockDatabaseName.Text = FilePath.GetFileName(ConfigurationFile.Current.Settings[CommonFunctions.DefaultSettingsCategory]["ConnectionString"].Value.ParseKeyValuePairs()["Data Source"]);
180+ if (database.IsSqlite || database.IsJetEngine)
181+ {
182+ // Extract database file name from connection string for file centric databases
183+ TextBlockDatabaseName.Text = FilePath.GetFileName(database.Connection.ConnectionString.ParseKeyValuePairs()["Data Source"]);
184+ }
185+ else if (database.IsOracle)
186+ {
187+ // Extract user name from connection string for Oracle databases
188+ TextBlockDatabaseName.Text = database.Connection.ConnectionString.ParseKeyValuePairs()["User Id"];
189+ }
190+ else
191+ {
192+ TextBlockDatabaseName.Text = database.Connection.Database;
193+ }
182194 }
183195 catch
184196 {
185− // Fall back on database name if file name extraction fails
197+ // Fall back on database name if file anything fails
186198 TextBlockDatabaseName.Text = database.Connection.Database;
187199 }
188200 }
189− else
190− {
191− TextBlockDatabaseName.Text = database.Connection.Database;
192− }
201+ }
202+ catch
203+ {
204+ TextBlockDatabaseName.Text = "Not Avaliable";
193205 }
194206
195207 try
Source/Libraries/GSF.TimeSeries/UI/DataModels/SecurityGroup.cs+35−15
@@ -62,7 +62,7 @@ namespace GSF.TimeSeries.UI.DataModels · 61 unmodified lines
6262
6363 #endregion
6464
65− #region [properties]
65+ #region [ Properties ]
6666
6767 /// <summary>
6868 /// Gets or sets the current SecurityGroup ID
@@ -240,17 +240,19 @@ namespace GSF.TimeSeries.UI.DataModels · 171 unmodified lines
240240
241241 foreach (DataRow row in securityGroupTable.Rows)
242242 {
243+ Guid id = database.Guid(row, "ID");
244+
243245 securityGroupList.Add(new SecurityGroup()
244246 {
245− ID = database.Guid(row, "ID"),
247+ ID = id,
246248 Name = UserInfo.SIDToAccountName(row.Field<string>("Name")),
247249 Description = row.Field<object>("Description") == null ? string.Empty : row.Field<string>("Description"),
248250 CreatedOn = Convert.ToDateTime(row.Field<object>("CreatedOn")),
249251 CreatedBy = row.Field<string>("CreatedBy"),
250252 UpdatedOn = Convert.ToDateTime(row.Field<object>("UpdatedOn")),
251253 UpdatedBy = row.Field<string>("UpdatedBy"),
252− CurrentUsers = GetCurrentUsers(database, Guid.Parse(row.Field<object>("ID").ToString())),
253− PossibleUsers = GetPossibleUsers(database, Guid.Parse(row.Field<object>("ID").ToString()))
254+ CurrentUsers = GetCurrentUsers(database, id),
255+ PossibleUsers = GetPossibleUsers(database, id)
254256 });
255257 }
256258
@@ -279,10 +281,10 @@ namespace GSF.TimeSeries.UI.DataModels · 22 unmodified lines
279281 createdConnection = CreateConnection(ref database);
280282
281283 Dictionary<Guid, string> currentUsers = new Dictionary<Guid, string>();
282− DataTable currentUsersTable = database.Connection.RetrieveData(database.AdapterType, database.ParameterizedQueryString("SELECT * FROM SecurityGroupUserAccountDetail WHERE SecurityGroupID = {0} ORDER BY UserName", "groupID"), groupID);
284+ DataTable currentUsersTable = database.Connection.RetrieveData(database.AdapterType, database.ParameterizedQueryString("SELECT * FROM SecurityGroupUserAccountDetail WHERE SecurityGroupID = {0} ORDER BY UserName", "groupID"), database.Guid(groupID));
283285
284286 foreach (DataRow row in currentUsersTable.Rows)
285− currentUsers[database.Guid(row, "UserAccountID")] = row.Field<string>("UserName");
287+ currentUsers[database.Guid(row, "UserAccountID")] = UserInfo.SIDToAccountName(row.Field<string>("UserName"));
286288
287289 return currentUsers;
288290 }
@@ -307,10 +309,10 @@ namespace GSF.TimeSeries.UI.DataModels · 18 unmodified lines
307309 createdConnection = CreateConnection(ref database);
308310 Dictionary<Guid, string> possibleGroupUsers = new Dictionary<Guid, string>();
309311 string query = database.ParameterizedQueryString("SELECT ID, Name FROM UserAccount WHERE ID NOT IN (SELECT UserAccountID FROM SecurityGroupUserAccount WHERE SecurityGroupID = {0}) ORDER BY Name", "groupID");
310− DataTable possibleUsersTable = database.Connection.RetrieveData(database.AdapterType, query, DefaultTimeout, groupID);
312+ DataTable possibleUsersTable = database.Connection.RetrieveData(database.AdapterType, query, DefaultTimeout, database.Guid(groupID));
311313
312314 foreach (DataRow row in possibleUsersTable.Rows)
313− possibleGroupUsers[database.Guid(row, "ID")] = row.Field<string>("Name");
315+ possibleGroupUsers[database.Guid(row, "ID")] = UserInfo.SIDToAccountName(row.Field<string>("Name"));
314316
315317 return possibleGroupUsers;
316318 }
@@ -340,8 +342,8 @@ namespace GSF.TimeSeries.UI.DataModels · 23 unmodified lines
340342 createdConnection = CreateConnection(ref database);
341343 foreach (Guid id in usersToBeAdded)
342344 {
343− userName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM UserAccount WHERE ID = {0}", "userID"), id).ToNonNullString();
344− securityGroupName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM SecurityGroup WHERE ID = {0}", "securityGroupID"), groupID).ToNonNullString();
345+ userName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM UserAccount WHERE ID = {0}", "userID"), database.Guid(id)).ToNonNullString();
346+ securityGroupName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM SecurityGroup WHERE ID = {0}", "securityGroupID"), database.Guid(groupID)).ToNonNullString();
345347 query = database.ParameterizedQueryString("INSERT INTO SecurityGroupUserAccount (SecurityGroupID, UserAccountID) VALUES ({0}, {1})", "groupID", "userID");
346348 database.Connection.ExecuteNonQuery(query, DefaultTimeout, database.Guid(groupID), database.Guid(id));
347349 CommonFunctions.LogEvent(string.Format("User \"{0}\" successfully added to security group \"{1}\" by user \"{2}\".", UserInfo.SIDToAccountName(userName), UserInfo.SIDToAccountName(securityGroupName), CommonFunctions.CurrentUser), 8);
@@ -375,8 +377,8 @@ namespace GSF.TimeSeries.UI.DataModels · 27 unmodified lines
375377 createdConnection = CreateConnection(ref database);
376378 foreach (Guid id in usersToBeDeleted)
377379 {
378− userName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM UserAccount WHERE ID = {0}", "userID"), id).ToNonNullString();
379− securityGroupName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM SecurityGroup WHERE ID = {0}", "securityGroupID"), groupID).ToNonNullString();
380+ userName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM UserAccount WHERE ID = {0}", "userID"), database.Guid(id)).ToNonNullString();
381+ securityGroupName = database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT Name FROM SecurityGroup WHERE ID = {0}", "securityGroupID"), database.Guid(groupID)).ToNonNullString();
380382 query = database.ParameterizedQueryString("DELETE FROM SecurityGroupUserAccount WHERE SecurityGroupID = {0} AND UserAccountID = {1}", "groupID", "userID");
381383 database.Connection.ExecuteNonQuery(query, DefaultTimeout, database.Guid(groupID), database.Guid(id));
382384 CommonFunctions.LogEvent(string.Format("User \"{0}\" successfully removed from security group \"{1}\" by user \"{2}\".", UserInfo.SIDToAccountName(userName), UserInfo.SIDToAccountName(securityGroupName), CommonFunctions.CurrentUser), 9);
@@ -413,7 +415,7 @@ namespace GSF.TimeSeries.UI.DataModels · 30 unmodified lines
413415 DataTable securityGroupTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID, Name FROM SecurityGroup ORDER BY Name");
414416
415417 foreach (DataRow row in securityGroupTable.Rows)
416− securityGroupList[row.ConvertField<int>("ID")] = row.Field<string>("Name");
418+ securityGroupList[row.ConvertField<int>("ID")] = UserInfo.SIDToAccountName(row.Field<string>("Name"));
417419
418420 return securityGroupList;
419421 }
@@ -432,29 +434,47 @@ namespace GSF.TimeSeries.UI.DataModels · 12 unmodified lines
432434 /// <returns>String, for display use, indicating success.</returns>
433435 public static string Save(AdoDataConnection database, SecurityGroup securityGroup)
434436 {
437+ const string ErrorMessage = "Group name already exists.";
438+
435439 bool createdConnection = false;
436440 string query;
441+ string groupSID;
442+ int existing;
437443
438444 try
439445 {
440446 createdConnection = CreateConnection(ref database);
447+ groupSID = UserInfo.AccountNameToSID(securityGroup.Name);
448+
449+ if (!UserInfo.IsGroupSID(groupSID))
450+ groupSID = securityGroup.Name;
441451
442452 if (securityGroup.ID == Guid.Empty)
443453 {
454+ existing = Convert.ToInt32(database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT COUNT(*) FROM SecurityGroup WHERE Name = {0}", "name"), DefaultTimeout, groupSID));
455+
456+ if (existing > 0)
457+ throw new InvalidOperationException(ErrorMessage);
458+
444459 query = database.ParameterizedQueryString("INSERT INTO SecurityGroup (Name, Description, UpdatedBy, UpdatedOn, CreatedBy, CreatedOn) VALUES ({0}, {1}, " +
445460 "{2}, {3}, {4}, {5})", "name", "description", "updatedBy", "updatedOn", "createdBy", "createdOn");
446461
447− database.Connection.ExecuteNonQuery(query, DefaultTimeout, UserInfo.AccountNameToSID(securityGroup.Name), securityGroup.Description.ToNotNull(),
462+ database.Connection.ExecuteNonQuery(query, DefaultTimeout, groupSID, securityGroup.Description.ToNotNull(),
448463 CommonFunctions.CurrentUser, database.UtcNow(), CommonFunctions.CurrentUser, database.UtcNow());
449464
450465 CommonFunctions.LogEvent(string.Format("Security group \"{0}\" created successfully by user \"{1}\".", securityGroup.Name, CommonFunctions.CurrentUser), 6);
451466 }
452467 else
453468 {
469+ existing = Convert.ToInt32(database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT COUNT(*) FROM SecurityGroup WHERE Name = {0} AND ID <> {1}", "name", "id"), DefaultTimeout, groupSID, securityGroup.ID));
470+
471+ if (existing > 0)
472+ throw new InvalidOperationException(ErrorMessage);
473+
454474 query = database.ParameterizedQueryString("UPDATE SecurityGroup SET Name = {0}, Description = {1}, UpdatedBy = {2}, UpdatedOn = {3} " +
455475 "WHERE ID = {4}", "name", "description", "updatedBy", "updatedOn", "id");
456476
457− database.Connection.ExecuteNonQuery(query, DefaultTimeout, UserInfo.AccountNameToSID(securityGroup.Name), securityGroup.Description.ToNotNull(),
477+ database.Connection.ExecuteNonQuery(query, DefaultTimeout, groupSID, securityGroup.Description.ToNotNull(),
458478 CommonFunctions.CurrentUser, database.UtcNow(), database.Guid(securityGroup.ID));
459479
460480 CommonFunctions.LogEvent(string.Format("Information about security group \"{0}\" updated successfully by user \"{1}\".", securityGroup.Name, CommonFunctions.CurrentUser), 7);
Source/Libraries/GSF.TimeSeries/UI/DataModels/UserAccount.cs+24−4
@@ -395,7 +395,7 @@ namespace GSF.TimeSeries.UI.DataModels · 394 unmodified lines
395395 DataTable userAccountTable = database.Connection.RetrieveData(database.AdapterType, "SELECT ID, Name FROM UserAccount ORDER BY Name");
396396
397397 foreach (DataRow row in userAccountTable.Rows)
398− userAccountList[database.Guid(row, "ID")] = row.Field<string>("Name");
398+ userAccountList[database.Guid(row, "ID")] = UserInfo.SIDToAccountName(row.Field<string>("Name"));
399399
400400 return userAccountList;
401401 }
@@ -414,8 +414,12 @@ namespace GSF.TimeSeries.UI.DataModels · 12 unmodified lines
414414 /// <returns>String, for display use, indicating success.</returns>
415415 public static string Save(AdoDataConnection database, UserAccount userAccount)
416416 {
417+ const string ErrorMessage = "User name already exists.";
418+
417419 bool createdConnection = false;
418420 string query;
421+ string userAccountSID;
422+ int existing;
419423
420424 try
421425 {
@@ -427,19 +431,30 @@ namespace GSF.TimeSeries.UI.DataModels · 5 unmodified lines
427431 pColumn = "[Password]";
428432
429433 object changePasswordOn = userAccount.ChangePasswordOn;
434+
430435 if (userAccount.ChangePasswordOn == DateTime.MinValue)
431436 changePasswordOn = (object)DBNull.Value;
432437 else if (database.IsJetEngine)
433438 changePasswordOn = userAccount.ChangePasswordOn.ToOADate();
434439
435− if (userAccount.ID == null || userAccount.ID == Guid.Empty)
440+ userAccountSID = UserInfo.AccountNameToSID(userAccount.Name);
441+
442+ if (!UserInfo.IsUserSID(userAccountSID))
443+ userAccountSID = userAccount.Name;
444+
445+ if (userAccount.ID == Guid.Empty)
436446 {
447+ existing = Convert.ToInt32(database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT COUNT(*) FROM UserAccount WHERE Name = {0}", "name"), DefaultTimeout, userAccountSID));
448+
449+ if (existing > 0)
450+ throw new InvalidOperationException(ErrorMessage);
451+
437452 query = database.ParameterizedQueryString("INSERT INTO UserAccount (Name, " + pColumn + ", FirstName, LastName, DefaultNodeID, Phone, Email, " +
438453 "LockedOut, UseADAuthentication, ChangePasswordOn, UpdatedBy, UpdatedOn, CreatedBy, CreatedOn) VALUES ({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, " +
439454 "{9}, {10}, {11}, {12}, {13})", "name", "password", "firstName", "lastName", "defaultNodeID", "phone", "email", "lockedOut", "useADAuthentication",
440455 "changePasswordOn", "updatedBy", "updatedOn", "createdBy", "createdOn");
441456
442− database.Connection.ExecuteNonQuery(query, DefaultTimeout, UserInfo.AccountNameToSID(userAccount.Name),
457+ database.Connection.ExecuteNonQuery(query, DefaultTimeout, userAccountSID,
443458 userAccount.Password.ToNotNull(), userAccount.FirstName.ToNotNull(), userAccount.LastName.ToNotNull(), database.CurrentNodeID(),
444459 userAccount.Phone.ToNotNull(), userAccount.Email.ToNotNull(), database.Bool(userAccount.LockedOut), database.Bool(userAccount.UseADAuthentication),
445460 changePasswordOn, CommonFunctions.CurrentUser, database.UtcNow(), CommonFunctions.CurrentUser, database.UtcNow());
@@ -448,12 +463,17 @@ namespace GSF.TimeSeries.UI.DataModels · 2 unmodified lines
448463 }
449464 else
450465 {
466+ existing = Convert.ToInt32(database.Connection.ExecuteScalar(database.ParameterizedQueryString("SELECT COUNT(*) FROM UserAccount WHERE Name = {0} AND ID <> {1}", "name", "id"), DefaultTimeout, userAccountSID, userAccount.ID));
467+
468+ if (existing > 0)
469+ throw new InvalidOperationException(ErrorMessage);
470+
451471 query = database.ParameterizedQueryString("UPDATE UserAccount SET Name = {0}, " + pColumn + " = {1}, FirstName = {2}, LastName = {3}, " +
452472 "DefaultNodeID = {4}, Phone = {5}, Email = {6}, LockedOut = {7}, UseADAuthentication = {8}, ChangePasswordOn = {9}, UpdatedBy = {10}, " +
453473 "UpdatedOn = {11} WHERE ID = {12}", "name", "password", "firstName", "lastName", "defaultNodeID", "phone", "email", "lockedOut",
454474 "useADAuthentication", "changePasswordOn", "updatedBy", "updatedOn", "id");
455475
456− database.Connection.ExecuteNonQuery(query, DefaultTimeout, UserInfo.AccountNameToSID(userAccount.Name),
476+ database.Connection.ExecuteNonQuery(query, DefaultTimeout, userAccountSID,
457477 userAccount.Password.ToNotNull(), userAccount.FirstName.ToNotNull(), userAccount.LastName.ToNotNull(), database.Guid(userAccount.DefaultNodeID),
458478 userAccount.Phone.ToNotNull(), userAccount.Email.ToNotNull(), database.Bool(userAccount.LockedOut), database.Bool(userAccount.UseADAuthentication),
459479 changePasswordOn, CommonFunctions.CurrentUser, database.UtcNow(), database.Guid(userAccount.ID));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t