+ Added user info API
+ Added new nc error management
This commit is contained in:
@@ -3,6 +3,7 @@ using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Web.Helpers;
|
||||
using Step.Model.DatabaseModels;
|
||||
using Step.Model.DTOModels;
|
||||
|
||||
namespace Step.Database.Controllers
|
||||
{
|
||||
@@ -36,6 +37,7 @@ namespace Step.Database.Controllers
|
||||
// Create a new user model with params
|
||||
return new UserModel()
|
||||
{
|
||||
UserId = id,
|
||||
Username = username,
|
||||
Password = Crypto.HashPassword(password),
|
||||
FirstName = firstName,
|
||||
@@ -50,22 +52,38 @@ namespace Step.Database.Controllers
|
||||
return CreateUserModel(0, username, password, firstName, lastName, roleId, language);
|
||||
}
|
||||
|
||||
public UserModel Find(int id)
|
||||
public DTOUserModel GetUserInfo(int id)
|
||||
{
|
||||
// Find user by Id with Role object included
|
||||
UserModel userDatabaseModel = dbCtx.Users.Include("Role").Where(u => u.UserId == id).FirstOrDefault();
|
||||
|
||||
return new DTOUserModel()
|
||||
{
|
||||
Id = userDatabaseModel.UserId,
|
||||
Username = userDatabaseModel.Username,
|
||||
FirstName = userDatabaseModel.FirstName,
|
||||
LastName = userDatabaseModel.LastName,
|
||||
Language = userDatabaseModel.Language,
|
||||
RoleId = userDatabaseModel.RoleId
|
||||
};
|
||||
}
|
||||
|
||||
public UserModel FindById(int id)
|
||||
{
|
||||
// Find user by Id with Role object included
|
||||
return dbCtx.Users.Include("Role").Where(u => u.UserId == id).FirstOrDefault();
|
||||
}
|
||||
|
||||
public UserModel Find(string username)
|
||||
private UserModel FindByUsername(string username)
|
||||
{
|
||||
// Find user by Id with Role object included
|
||||
return dbCtx.Users.Include("Role").Where(u => u.Username == username).FirstOrDefault();
|
||||
}
|
||||
|
||||
public UserModel Find(string username, string password)
|
||||
public UserModel FindByUsernameAndPassword(string username, string password)
|
||||
{
|
||||
// Find if username exists
|
||||
UserModel user = Find(username);
|
||||
UserModel user = FindByUsername(username);
|
||||
|
||||
if (user != null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user