From b47f0019e059f77767776ba19249ee8de879497e Mon Sep 17 00:00:00 2001
From: Okke Harsta <oharsta@zilverline.com>
Date: Tue, 8 Feb 2022 10:59:29 +0100
Subject: [PATCH] Do not redirect to missing-service-aup when heading to
 service-aup

---
 client/src/pages/ProtectedRoute.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/ProtectedRoute.jsx b/client/src/pages/ProtectedRoute.jsx
index bf4385ecd..e57eba482 100644
--- a/client/src/pages/ProtectedRoute.jsx
+++ b/client/src/pages/ProtectedRoute.jsx
@@ -11,7 +11,8 @@ export function ProtectedRoute({currentUser, Component, redirectToLogin = true,
         if (!currentUser.second_factor_confirmed) {
             return <Redirect to="/2fa"/>;
         }
-        if (!isEmpty(currentUser.services_without_aup)) {
+        //Ensure that we are not heading to service-aup which is initiated by eduTeams
+        if (!isEmpty(currentUser.services_without_aup) && window.location.href.indexOf("service-aup") === -1) {
             return <Redirect to="/missing-service-aup"/>;
         }
         return <Route render={props => <Component user={currentUser} {...res} {...props}/>}/>;