From 330be7bf97df9c8239f194ce1fe200274b3dd4ca Mon Sep 17 00:00:00 2001
From: xuechen5 <xuechen5@illinois.edu>
Date: Tue, 3 Nov 2020 07:56:54 -0600
Subject: [PATCH] Backend: allow pregistered patient role to access home page
---
iTrust/WebRoot/auth/forwardUser.jsp | 14 ++++++++++----
iTrust/WebRoot/global.jsp | 4 ++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/iTrust/WebRoot/auth/forwardUser.jsp b/iTrust/WebRoot/auth/forwardUser.jsp
index a3bfd77..72e75a9 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 cd4c16c..6c70895 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";
}
--
GitLab