Do not redirect to missing-service-aup when heading to service-aup

SURFscz · Feb 8, 2022 · b47f001 · b47f001
1 parent ef4e7f6
commit b47f001
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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}/>}/>;