admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-05-09 00:01:43 +00:00
parent 60a79bab63
commit 72540fa3e6
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/AyaNova/biz/UserBiz.cs
View File

@@ -159,15 +159,15 @@ namespace AyaNova.Biz
dbObj.Salt = SnapshotOfOriginalDBObj.Salt;
}
//Updating login?
if (!string.IsNullOrWhiteSpace(inObj.Login))
if (!string.IsNullOrWhiteSpace(inObj.Login))
{
//YES Login is being updated:
dbObj.Login=inObj.Login;
dbObj.Login = inObj.Login;
}
else
{
//No, use the original value
dbObj.Login = SnapshotOfOriginalDBObj.Login;
dbObj.Login = SnapshotOfOriginalDBObj.Login;
}
@@ -212,16 +212,16 @@ namespace AyaNova.Biz
dbObj.Password = Hasher.hash(dbObj.Salt, dbObj.Password);
}
//Updating login?
if (!string.IsNullOrWhiteSpace(dbObj.Login) && dbObj.Login != SnapshotOfOriginalDBObj.Login)
//Updating login?
if (!string.IsNullOrWhiteSpace(dbObj.Login) && dbObj.Login != SnapshotOfOriginalDBObj.Login)
{
//YES Login is being updated:
dbObj.Login=SnapshotOfOriginalDBObj.Login;
dbObj.Login = SnapshotOfOriginalDBObj.Login;
}
else
{
//No, use the original value
dbObj.Login = SnapshotOfOriginalDBObj.Login;
dbObj.Login = SnapshotOfOriginalDBObj.Login;
}
ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = concurrencyToken;
@@ -364,7 +364,11 @@ namespace AyaNova.Biz
}
}
//LOGIN must be unique
if (await ct.User.AnyAsync(m => m.Login == proposedObj.Login && m.Id != proposedObj.Id))
{
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, "Login");
}
//TODO: Validation rules that require future other objects that aren't present yet:
/*