feat: update add-user-to-repository script to include existing invitation check

gh-cli/README.md

@@ -133,7 +133,7 @@ Adds a team to a repository with a given permission level
 Example usage:
 
 ```shell
-./add-team-to-repository.sh joshjohanning-org my-repo my-team push"
+./add-team-to-repository.sh joshjohanning-org my-repo push my-team"
 ```
 
 ### add-user-to-project.sh
@@ -144,7 +144,7 @@ Example usage:
 
 ```shell
 ./add-user-to-project.sh <organization> <repository> <project-number> <role> <user>
-./add-user-to-project.sh joshjohanning-org my-repo 1234 joshjohanning ADMIN"
+./add-user-to-project.sh joshjohanning-org my-repo 1234 ADMIN joshjohanning"
 ```
 
 Example roles:
@@ -161,7 +161,14 @@ Adds a user to a repository with a given permission
 Example usage:
 
 ```shell
-./add-user-to-repository.sh joshjohanning-org my-repo joshjohanning write"
+./add-user-to-repository.sh joshjohanning-org my-repo write joshjohanning"
+```
+
+This also will attempt to check if there is an existing invitation for this user pending, and if it's expired, cancel it. This can be opted out of by passing in `true` as the 5th parameter, such as
+
+```shell
+# don't check to see if existing invite is present; i.e. if adding existing organization user to repository
+./add-user-to-repository.sh joshjohanning-org my-repo write joshjohanning true"
 ```
 
 ### add-user-to-team.sh
@@ -1150,7 +1157,7 @@ Example output:
 
 ### invite-user-to-repository.sh
 
-Calls the `./add-collaborator-to-repository.sh` script to add a user to a repository (this is a wrapper script as an alias since `invite == add`.
+Calls the `./add-user-to-repository.sh` script to add a user to a repository (this is a wrapper script as an alias since `invite == add`).
 
 ### invite-users-to-organization-from-list.sh
 

gh-cli/add-team-to-repository.sh

@@ -3,8 +3,8 @@
 # Adds a team to a repo
 
 function print_usage {
-  echo "Usage: $0 <org> <repo> <team_slug> <role>"
-  echo "Example: ./add-team-to-repository.sh joshjohanning-org my-repo my-team push"
+  echo "Usage: $0 <org> <repo> <role> <team_slug>"
+  echo "Example: ./add-team-to-repository.sh joshjohanning-org my-repo push my-team"
   echo "Valid roles: admin, maintain, push (write), triage, pull (read)"
   exit 1
 }
@@ -15,8 +15,8 @@ fi
 
 org=$1
 repo=$2
-team=$3
-permission=$(echo "$4" | tr '[:upper:]' '[:lower:]')
+permission=$(echo "$3" | tr '[:upper:]' '[:lower:]')
+team=$4
 
 case "$permission" in
   "admin" | "maintain" | "push" | "triage" | "pull")

gh-cli/add-user-to-repository.sh

@@ -3,9 +3,11 @@
 # Adds a user to a repo
 
 function print_usage {
-  echo "Usage: $0 <org> <repo> <user> <role>"
-  echo "Example: ./add-user-to-repository.sh joshjohanning-org my-repo joshjohanning ADMIN"
+  echo "Usage: $0 <org> <repo> <role> <user> [skip_invite_check]"
+  echo "Example: ./add-user-to-repository.sh joshjohanning-org my-repo ADMIN joshjohanning"
+  echo "Example: ./add-user-to-repository.sh joshjohanning-org my-repo ADMIN joshjohanning true"
   echo "Valid roles: ADMIN, MAINTAIN, WRITE, TRIAGE, READ"
+  echo "skip_invite_check: true to skip checking/canceling pending invitations, defaults to false"
   exit 1
 }
 
@@ -15,8 +17,9 @@ fi
 
 org="$1"
 repo="$2"
-user="$3"
-permission=$(echo "$4" | tr '[:lower:]' '[:upper:]')
+permission=$(echo "$3" | tr '[:lower:]' '[:upper:]')
+user="$4"
+skip_invite_check="${5:-false}"
 
 case "$permission" in
   "ADMIN" | "MAINTAIN" | "WRITE" | "TRIAGE" | "READ")
@@ -26,4 +29,32 @@ case "$permission" in
     ;;
 esac
 
+# Check for existing pending invitations (unless skipped)
+if [ "$skip_invite_check" != "true" ]; then
+  echo "Checking for existing invitations for $user..."
+  invitation_data=$(gh api "/repos/$org/$repo/invitations" --jq ".[] | select(.invitee.login == \"$user\") | {id: .id, expired: .expired}" 2>/dev/null)
+
+  if [ -n "$invitation_data" ]; then
+    invitation_id=$(echo "$invitation_data" | jq -r '.id')
+    is_expired=$(echo "$invitation_data" | jq -r '.expired')
+
+    if [ "$is_expired" = "true" ]; then
+      echo "Found expired invitation (ID: $invitation_id) for $user. Canceling it..."
+      gh api -X DELETE "/repos/$org/$repo/invitations/$invitation_id"
+      if [ $? -eq 0 ]; then
+        echo "Successfully canceled expired invitation."
+      else
+        echo "Warning: Failed to cancel expired invitation. Proceeding anyway..."
+      fi
+    else
+      echo "Found active invitation (ID: $invitation_id) for $user. Leaving it as is."
+      echo "Skipping new invitation since an active one already exists."
+      exit 0
+    fi
+  fi
+else
+  echo "Skipping invitation check as requested..."
+fi
+
+echo "Adding/inviting $user to $org/$repo with $permission permission..."
 gh api -X PUT /repos/$org/$repo/collaborators/$user -f permission=$permission

gh-cli/invite-user-to-repository.sh

@@ -10,4 +10,4 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # Call the add-collaborator-to-repository.sh script with all arguments
-exec "$SCRIPT_DIR/add-collaborator-to-repository.sh" "$@"
+exec "$SCRIPT_DIR/add-user-to-repository.sh" "$@"