Fix: ensure redirect to user group view includes required group path …

augur/api/view/api.py

@@ -1,34 +1,43 @@
-from flask import request, jsonify, redirect, url_for, flash, current_app
+import logging
 import re
+
+from flask import flash, current_app, jsonify, redirect, request, url_for
 from flask_login import current_user, login_required
+
 from augur.application.db.models import Repo, RepoGroup, UserGroup, UserRepo
-from augur.tasks.frontend import add_github_orgs_and_repos, parse_org_and_repo_name, parse_org_name, add_gitlab_repos
-from .utils import *
-from ..server import app
 from augur.application.db.session import DatabaseSession
+from augur.tasks.frontend import (
+    add_github_orgs_and_repos,
+    add_gitlab_repos,
+    parse_org_and_repo_name,
+    parse_org_name
+)
+
+from ..server import app
+from .utils import *
 
 @app.route('/cache/file/')
 @app.route('/cache/file/<path:file>')
 def cache(file=None):
     if file is None:
         return redirect(url_for('static', filename="cache"))
     return redirect(url_for('static', filename="cache/" + toCacheFilename(file, False)))
 
 
 def add_existing_org_to_group(session, user_id, group_name, rg_id):
 
     logger.info("Adding existing org to group")
 
     group_id = UserGroup.convert_group_name_to_id(session, user_id, group_name)
     if group_id is None:
         return False
 
     repos = session.query(Repo).filter(Repo.repo_group_id == rg_id).all()
     logger.info("Length of repos in org: " + str(len(repos)))
     for repo in repos:
         result = UserRepo.insert(session, repo.repo_id, group_id)
         if not result:
             logger.info("Failed to add repo to group")
 
 
 
@@ -155,21 +164,37 @@
     group = request.args.get("group_name")
     repo = request.args.get("repo_id")
 
-    if not repo:
-        flash("No repo id provided")
-    if not group:
-        flash("No group name provided")
-
-    repo = int(repo)
+
+    if not repo or not group:
+        if not repo:
+            flash("No repo id provided")
+        if not group:
+            flash("No group name provided")
+        # Staying on same page instead of redirecting to settings
+        return redirect(url_for("user_group_view", group=group))
+
+    try:
+        repo_id = int(repo)
+    except (TypeError, ValueError) as e:
+        flash("Invalid repo id provided")
+
+        logging.error(f"Invalid repo id provided for repo '{repo}'. Error: {e}")
+
+
+        return redirect(url_for("user_group_view", group=group))
 
-    result = current_user.remove_repo(group, repo)[0]
+    result = current_user.remove_repo(group, repo_id)[0]
 
     if result:
         flash(f"Successfully removed repo {repo} from group {group}")
     else:
         flash("An error occurred removing repo from group")
 
-    return redirect(url_for("user_group_view") + f"?group={group}")
+
+    return redirect(url_for("user_group_view", group=group))
+
+
+
 
 @app.route('/account/application/deauthorize')
 @login_required
@@ -209,5 +234,5 @@
 """
 @app.route('/requests/report/wait/<id>')
 def wait_for_report_request(id):
     requestReports(id)
     return jsonify(report_requests[id])