diff --git a/iTrust/WebRoot/auth/forwardUser.jsp b/iTrust/WebRoot/auth/forwardUser.jsp index a3bfd776e93c125faf05939a63cbff4f45d45328..72e75a9a43574c8618442c068c4c31b13575b051 100644 --- a/iTrust/WebRoot/auth/forwardUser.jsp +++ b/iTrust/WebRoot/auth/forwardUser.jsp @@ -17,10 +17,17 @@ if(request.getUserPrincipal() != null) { long mid = Long.valueOf(request.getUserPrincipal().getName()); + if (request.isUserInRole("patient")) { response.sendRedirect("patient/home.jsp"); return; } + + else if (request.isUserInRole("preRegisteredPatient")) { + response.sendRedirect("preRegisteredPatient/home.jsp"); + return; + } + else if (request.isUserInRole("uap")) { response.sendRedirect("uap/home.jsp"); return; @@ -53,14 +60,13 @@ if(request.getUserPrincipal() != null) { session.invalidate(); response.sendRedirect("/iTrust/"); } - else if (mid == 0) - { + else if (mid == 0) { session.invalidate(); } - else { - + else { response.sendRedirect("errors/noaccess.jsp"); } } %> + diff --git a/iTrust/WebRoot/global.jsp b/iTrust/WebRoot/global.jsp index cd4c16c3e8149c8db84a4db41e6d62ec5684408e..6c7089591f1b739e4bf18ce94203cf7ea7878fee 100644 --- a/iTrust/WebRoot/global.jsp +++ b/iTrust/WebRoot/global.jsp @@ -34,6 +34,10 @@ try { userRole = (String) session.getAttribute("userRole"); if (userRole == null) { + + if (request.isUserInRole("preRegisteredPatient")) { + userRole = "preRegisteredPatient"; + } if (request.isUserInRole("patient")) { userRole = "patient"; }