Merge branch 'main' into enhance/tup-414-help-users-view-all-tickets

apps/tup-cms/src/apps/portal/backend.py

@@ -13,10 +13,12 @@ def authenticate(self, request):
 
         profile_url = f"{service_url}/users/profile"
         headers = {"x-tup-token": token}
-
-        req = requests.get(profile_url, headers=headers)
-        if req.status_code != 200:
-            raise PermissionDenied
+
+        try:
+            req = requests.get(profile_url, headers=headers, timeout=10)
+            req.raise_for_status()
+        except Exception as exc:
+            raise PermissionDenied from exc
 
         profile = req.json()
         username = profile['username']

libs/tup-components/src/projects/users/UserList/ManageTeam.tsx

@@ -1,7 +1,6 @@
 import { Button } from '@tacc/core-components';
 import { useProject, useRoleForCurrentUser } from '@tacc/tup-hooks';
 import styles from './UserList.module.css';
-import AddUserModal from './AddUserModal';
 
 const ManageTeam: React.FC<{ projectId: number }> = ({ projectId }) => {
   const currentUserRole = useRoleForCurrentUser(projectId) ?? '';
@@ -26,7 +25,13 @@ const ManageTeam: React.FC<{ projectId: number }> = ({ projectId }) => {
 
   return (
     <div className={styles['user-navactions']}>
-      <AddUserModal projectId={projectId} />
+      <a
+        target="_blank"
+        rel="noreferrer"
+        href={`https://accounts.tacc.utexas.edu/project_invite?project_id=${projectId}`}
+      >
+        <Button>+ Add Users</Button>
+      </a>
     </div>
   );
 };