Besciamello (#1)

* Fixed login & auth
* Added dynamic breadcrumb
* Added DOC
* Added Patient
* Added Notifications
* Added Messages
* Refactoring api
* Re-writed menu
* Removed unused things
* Created README
This commit was merged in pull request #1.
This commit is contained in:
Giacomo Bertolazzi 20015159
2019-01-15 21:35:00 +01:00
committed by GitHub
parent 191daf8218
commit 1246116804
36 changed files with 1154 additions and 535 deletions

View File

@@ -4,65 +4,46 @@ using SeniorAssistant.Models;
using SeniorAssistant.Controllers;
using LinqToDB;
using System.Linq;
using System;
using SeniorAssistant.Models.Users;
namespace IdentityDemo.Controllers
{
[ApiExplorerSettings(IgnoreApi = true)]
[Route("[controller]/[action]")]
public class AccountController : BaseController
{
/*
private readonly UserManager<User> _userManager;
private readonly SignInManager<User> _signInManager;
private readonly ILogger _logger;
public AccountController(
UserManager<User> userManager,
SignInManager<User> signInManager,
ILogger<AccountController> logger)
{
_userManager = userManager;
_signInManager = signInManager;
_logger = logger;
}
/*
[TempData]
public string ErrorMessage { get; set; }
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> Login(string returnUrl = null)
{
// Clear the existing external cookie to ensure a clean login process
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
ViewData["ReturnUrl"] = returnUrl;
return View();
}
*/
private static readonly string NoteModified = "Il tuo dottore ha modificato la nota per te";
[HttpPost]
public ActionResult _login(string username, string password)
{
JsonResponse response = new JsonResponse();
response.Success = false;
response.Message = "Username or password is invalid.";
var strunz = Db.GetTable<User>().Where(user => user.Username.Equals(username) && user.Password.Equals(password)).ToListAsync().Result;
if (strunz.Count == 1)
JsonResponse response = new JsonResponse
{
var loggedUser = HttpContext.Session.GetString("username");
if (loggedUser==null || !loggedUser.Equals(username))
Success = false,
Message = "Username or password is invalid."
};
var result = Db.GetTable<User>().Where(user => user.Username.Equals(username) && user.Password.Equals(password)).ToListAsync().Result;
if (result.Count == 1)
{
var loggedUser = HttpContext.Session.GetString(Username);
if (loggedUser==null || !loggedUser.Equals(username)) // non ha senso
{
HttpContext.Session.SetString("username", username);
HttpContext.Session.SetString("email", strunz.First().Email);
HttpContext.Session.SetString("name", strunz.First().Name);
HttpContext.Session.SetString("isdoc", strunz.First().Doctor?"true":"false");
//HttpContext.Session.SetString("lastname", strunz.First().LastName);
User user = result.First();
HttpContext.Session.SetString(Username, username);
HttpContext.Session.SetString("email", user.Email);
HttpContext.Session.SetString("name", user.Name);
HttpContext.Session.SetString("lastname", user.LastName);
var isDoc = (from d in Db.Doctors
where d.Username.Equals(username)
select d).ToArray().FirstOrDefault() != null;
HttpContext.Session.SetString("role", isDoc? "doctor":"patient");
response.Success = true;
response.Message = "";
response.Message = Request.Query["ReturnUrl"];
}
else
{
@@ -80,28 +61,125 @@ namespace IdentityDemo.Controllers
}
[HttpPost]
public ActionResult _register(Register register)
public ActionResult _register(User user)
{
if(ModelState.IsValid)
return Action(() =>
{
User user = new User() { Username = register.Username, Email = register.Email, Password = register.Password};
try
{
Db.Insert(user);
return _login(user.Username, user.Password);
}
catch
{
return Json(new JsonResponse() { Success = false, Message = "Username already exist" });
return Json(new JsonResponse(false, "Username already exists"));
}
_login(user.Username, user.Password);
return Json(new JsonResponse() { Success = true });
}
return Json(new JsonResponse() { Success = false, Message = "Modello non valido" });
});
}
internal class JsonResponse
[HttpPost]
public ActionResult _notification(string username, string message)
{
public bool Success { get; internal set; }
public string Message { get; internal set; }
return LoggedAction(() =>
{
Db.Insert(new Notification()
{
Message = message,
Username = username,
Time = DateTime.Now,
Seen = false
});
return Json(OkJson);
});
}
[HttpPut]
public ActionResult _notification(int id)
{
return LoggedAction(() =>
{
JsonResponse response = OkJson;
Notification note = Db.Notifications.Where(n => n.Id == id).ToArray().FirstOrDefault();
if(note != null)
{
note.Seen = true;
Db.Update(note);
}
else
{
response.Success = false;
response.Message = "La notifica da modificare non esiste";
}
return Json(response);
});
}
[HttpPost]
public ActionResult _addDoc(string doctor)
{
return LoggedAction(() =>
{
string username = HttpContext.Session.GetString(Username);
var isAlreadyPatient = Db.Patients.Where(p => p.Username.Equals(username)).ToArray().FirstOrDefault() != null;
if (isAlreadyPatient)
return Json(new JsonResponse()
{
Success = false,
Message = "You are already a patient"
});
var docExist = Db.Doctors.Where(d => d.Username.Equals(doctor)).ToArray().FirstOrDefault() != null;
if(!docExist)
return Json(new JsonResponse()
{
Success = false,
Message = "Doctor doesn't exist"
});
Db.Insert(new Patient()
{
Doctor = doctor,
Username = username
});
_notification(doctor, "L'utente "+username+" ti ha inserito come il suo dottore.");
return Json(new JsonResponse());
});
}
[HttpPost]
public ActionResult _sendMessage(string reciver, string body)
{
return LoggedAction(() => {
string username = HttpContext.Session.GetString(Username);
Message message = new Message()
{
Reciver = reciver,
Body = body,
Time = DateTime.Now,
Username = username,
Seen = false
};
Db.Insert(message);
return Json(new JsonResponse());
});
}
[HttpPut]
public ActionResult _addNote(string patient, string text)
{
return LoggedAccessDataOf(patient, () =>
{
var pat = Db.Patients.Where((p) => p.Username.Equals(patient)).FirstOrDefault();
pat.Notes = text;
Db.Update(pat);
_notification(patient, NoteModified);
return Json(OkJson);
});
}
}
}

View File

@@ -1,17 +1,10 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
namespace SeniorAssistant.Controllers
{
[ApiExplorerSettings(IgnoreApi = true)]
public class HomeController : Controller
public class HomeController : BaseController
{
private readonly ISession session;
public HomeController(IHttpContextAccessor httpContextAccessor)
{
this.session = httpContextAccessor.HttpContext.Session;
}
[Route("")]
[Route("Home")]
[Route("Index")]
@@ -23,31 +16,47 @@ namespace SeniorAssistant.Controllers
[Route("Heartbeat")]
public IActionResult Heartbeat()
{
return View();
return CheckAuthorized("Heartbeat");
}
[Route("Sleep")]
public IActionResult Sleep()
{
return View();
return CheckAuthorized("Sleep");
}
[Route("Step")]
public IActionResult Step()
{
return View();
return CheckAuthorized("Step");
}
[Route("Users")]
public IActionResult Users()
{
return View();
return CheckAuthorized("Users");
}
[Route("User/{User}")]
public IActionResult SingleUser(string user)
{
return View("data", user);
return CheckAuthorized("Data", user);
}
[Route("Message/{Id}")]
public IActionResult Message(int id)
{
return CheckAuthorized("Message", id);
}
private IActionResult CheckAuthorized(string view, object model = null)
{
if (!IsLogged())
{
model = "/" + view;
view = "Index";
}
return View(view, model);
}
}
}

View File

@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Mvc;
using SeniorAssistant.Models;
using SeniorAssistant.Models.Users;
namespace SeniorAssistant.Controllers.Services
{
@@ -18,4 +19,12 @@ namespace SeniorAssistant.Controllers.Services
[Route("api/[controller]")]
public class UserController : CrudController<User>
{ }
[Route("api/[controller]")]
public class PatientController : CrudController<Patient>
{ }
[Route("api/[controller]")]
public class DoctorController : CrudController<Doctor>
{ }
}

View File

@@ -1,10 +1,19 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using SeniorAssistant.Data;
using System.Linq;
using System;
namespace SeniorAssistant.Controllers
{
public abstract class BaseController : Controller
{
protected static readonly string MustBeLogged = "Devi essere loggato per vedere/modificare questo dato";
protected static readonly string InvalidModel = "Modello non valido";
protected static readonly string NoAuthorized = "Non sei autorizzato a vedere questi dati";
protected static readonly string Username = "username";
protected readonly JsonResponse OkJson = new JsonResponse();
IDataContextFactory<SeniorDataContext> dbFactory;
SeniorDataContext db;
@@ -20,5 +29,68 @@ namespace SeniorAssistant.Controllers
base.Dispose(disposing);
}
protected bool IsLogged()
{
return HttpContext.Session.GetString(Username) != null;
}
protected ActionResult Action(Func<ActionResult> success)
{
return ModelState.IsValid ?
success.Invoke() :
Json(new JsonResponse()
{
Success = false,
Message = InvalidModel
});
}
protected ActionResult LoggedAction(Func<ActionResult> success)
{
return Action(() =>
{
return IsLogged() ?
success.Invoke() :
Json(new JsonResponse()
{
Success = false,
Message = MustBeLogged
});
});
}
protected ActionResult LoggedAccessDataOf(string username, Func<ActionResult> success, bool patients = true)
{
return LoggedAction(() =>
{
var loggedUser = HttpContext.Session.GetString(Username);
var condition = username.Equals(loggedUser);
condition = condition || (patients && (from patient in Db.Patients
where patient.Doctor.Equals(loggedUser) && patient.Username.Equals(username)
select patient).ToArray().FirstOrDefault() != null);
return condition ?
success.Invoke() :
Json(new JsonResponse()
{
Success = false,
Message = NoAuthorized
});
});
}
}
public class JsonResponse
{
public JsonResponse(bool success=true, string message="")
{
Success = success;
Message = message;
}
public bool Success { get; set; }
public string Message { get; set; }
}
}

View File

@@ -10,24 +10,24 @@ namespace SeniorAssistant.Controllers.Services
public abstract class CrudController<TEntity> : BaseController
where TEntity : class, IHasUsername
{
[HttpGet]
public async Task<IEnumerable<TEntity>> Read() => await Db.GetTable<TEntity>().ToListAsync();
[HttpGet("{username}")]
public async Task<TEntity> Read(string username) => await Db.GetTable<TEntity>().FirstOrDefaultAsync(c => c.Username.Equals(username));
[HttpPost]
public async Task Create([FromBody]TEntity item) => await Db.InsertAsync(item);
[HttpPut("{username}")]
public async Task Update(string username, [FromBody]TEntity item)
public async Task<IActionResult> Read(string username)
{
item.Username = username;
await Db.UpdateAsync(item);
return LoggedAccessDataOf(username, () =>
{
return Json(Db.GetTable<TEntity>().Where((u) => u.Username.Equals(username)).ToArray());
});
}
[HttpDelete("{username}")]
public async Task Delete(string username) => await Db.GetTable<TEntity>().Where(c => c.Username.Equals(username)).DeleteAsync();
[HttpPut("{username}")]
public async Task<IActionResult> Update(string username, [FromBody] TEntity entity)
{
return LoggedAccessDataOf(username, () =>
{
entity.Username = username;
Db.Update(entity);
return Json(OkJson);
}, false);
}
}
}

View File

@@ -2,74 +2,86 @@
using Microsoft.AspNetCore.Mvc;
using SeniorAssistant.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace SeniorAssistant.Controllers.Services
{
public class CrudTimeController<TEntity> : BaseController
public class CrudTimeController<TEntity> : CrudController<TEntity>
where TEntity : class, IHasTime
{
static readonly object Empty = new { };
[HttpGet]
public async Task<IEnumerable<TEntity>> Read() => await Db.GetTable<TEntity>().ToListAsync();
[HttpGet("{username}")]
public async Task<IEnumerable<TEntity>> Read(string username) => await Db.GetTable<TEntity>().Where(e => e.Username.Equals(username)).ToListAsync();
private static readonly string DateNotCorrect = "Il formato della data non e' corretto";
[HttpGet("{username}/{date:regex((today|\\d{{4}}-\\d{{2}}-\\d{{2}}))}/{hour:range(0, 23)?}")]
public async Task<IEnumerable<TEntity>> Read(string username, string date, int hour = -1) => await Read(username, date, date, hour);
public async Task<IActionResult> Read(string username, string date, int hour = -1) => await Read(username, date, date, hour);
[HttpGet("{username}/{from:regex((today|\\d{{4}}-\\d{{2}}-\\d{{2}}))}/{to:regex((today|\\d{{4}}-\\d{{2}}-\\d{{2}}))}/{hour:range(0, 23)?}")]
public async Task<IEnumerable<TEntity>> Read(string username, string from, string to, int hour = -1)
public async Task<IActionResult> Read(string username, string from, string to, int hour = -1)
{
try
return LoggedAccessDataOf(username, () =>
{
DateTime dateFrom = (from.Equals("today") ? DateTime.Now : DateTime.ParseExact(from, "yyyy-MM-dd", null));
DateTime dateTo = (to.Equals("today") ? DateTime.Now : DateTime.ParseExact(to, "yyyy-MM-dd", null));
try
{
DateTime dateFrom = (from.Equals("today") ? DateTime.Now : DateTime.ParseExact(from, "yyyy-MM-dd", null));
DateTime dateTo = (to.Equals("today") ? DateTime.Now : DateTime.ParseExact(to, "yyyy-MM-dd", null));
return await Db.GetTable<TEntity>().Where(e => e.Username.Equals(username) && dateFrom.Date<=e.Time.Date && dateTo.Date>=e.Time.Date && (hour < 0 || e.Time.Hour == hour)).ToListAsync();
}
catch
{
return new List<TEntity>();
}
return Json((from entity in Db.GetTable<TEntity>()
where entity.Username.Equals(username)
&& dateFrom.Date <= entity.Time.Date
&& dateTo.Date >= entity.Time.Date
&& (hour < 0 || entity.Time.Hour == hour)
select entity).ToArray());
}
catch
{
return Json(new JsonResponse(false, DateNotCorrect));
}
});
}
[HttpGet("{username}/last/{hour:min(1)}")]
public async Task<IEnumerable<TEntity>> Read(string username, int hour)
public async Task<IActionResult> Read(string username, int hour)
{
DateTime date = DateTime.Now.AddHours(-hour);
return await Db.GetTable<TEntity>().Where(e => e.Username.Equals(username) && date <= e.Time).ToListAsync();
return LoggedAccessDataOf(username, () =>
{
DateTime date = DateTime.Now.AddHours(-hour);
return Json((from entity in Db.GetTable<TEntity>()
where entity.Username.Equals(username)
&& date <= entity.Time
select entity).ToArray());
});
}
[HttpPost]
public async Task<IActionResult> Create([FromBody]TEntity item)
{
return Action(() =>
{
Db.Insert(item);
return Json(OkJson);
});
}
[HttpPut]
public async Task<IActionResult> Update([FromBody]TEntity item)
{
return LoggedAccessDataOf(item.Username, () =>
{
var e = Read(item.Username, item.Time);
if (e == null)
{
Create(item);
}
else
{
Db.UpdateAsync(item);
}
return Json(OkJson);
}, false);
}
[NonAction]
public async Task<TEntity> Read(string username, DateTime date) => await Db.GetTable<TEntity>().FirstOrDefaultAsync(e => e.Username.Equals(username) && date == e.Time);
[HttpPost]
public async Task Create([FromBody]TEntity item) => await Db.InsertAsync(item);
[HttpPut]
public async Task<object> Update([FromBody]TEntity item)
{
var e = await Read(item.Username, item.Time);
if (e == null)
{
await Create(item);
}
else
{
await Db.UpdateAsync(item);
}
return Empty;
}
/*
[HttpDelete("{username}")]
public async Task Delete(string username) => await Db.GetTable<TEntity>().Where(c => c.Username.Equals(username)).DeleteAsync();
*/
private TEntity Read(string username, DateTime date) => Db.GetTable<TEntity>().FirstOrDefault(e => e.Username.Equals(username) && date == e.Time);
}
}