allow app installs against personal repos

Author: tstromberg

pkg/github/client.go

@@ -298,9 +298,9 @@ func (c *Client) UserAndOrgs(ctx context.Context) (username string, orgs []strin
 			log.Printf("GitHub API: SUCCESS - App installation token authenticated for organization: %s", installation.Account.Login)
 			return "app[installation]", []string{installation.Account.Login}, nil
 		}
-		// App installed on user account
+		// App installed on user account - treat the personal account as an "org" for subscription purposes
 		log.Printf("GitHub API: SUCCESS - App installation token authenticated for user account: %s", installation.Account.Login)
-		return "app[installation]", []string{}, nil
+		return "app[installation]", []string{installation.Account.Login}, nil
 	}
 	log.Printf("GitHub API: Token did not work with /installation/repositories (error: %v), trying /user endpoint...", appErr)
 
@@ -461,5 +461,5 @@ func (c *Client) ValidateOrgMembership(ctx context.Context, org string) (usernam
 	// User is not a member of the requested organization
 	log.Printf("GitHub API: User '%s' is NOT a member of organization '%s'", username, org)
 	log.Printf("GitHub API: User is member of %d organizations: %v", len(orgNames), orgNames)
-	return "", nil, errors.New("user is not a member of the requested organization")
+	return username, orgNames, errors.New("user is not a member of the requested organization")
 }

pkg/srv/websocket.go

@@ -312,7 +312,17 @@ func (h *WebSocketHandler) validateAuth(ctx context.Context, ws *websocket.Conn,
 				errorReason = "forbidden"
 			case strings.Contains(errStr, "not a member"):
 				errorCode = "access_denied"
-				errorMsg = fmt.Sprintf("You are not a member of organization '%s'.", sub.Organization)
+				// Include username/app identifier in error message
+				if username != "" {
+					if len(userOrgs) > 0 {
+						errorMsg = fmt.Sprintf("User '%s' is not a member of organization '%s'. Member of: %s",
+							username, sub.Organization, strings.Join(userOrgs, ", "))
+					} else {
+						errorMsg = fmt.Sprintf("User '%s' is not a member of organization '%s'.", username, sub.Organization)
+					}
+				} else {
+					errorMsg = fmt.Sprintf("You are not a member of organization '%s'.", sub.Organization)
+				}
 				errorReason = "not_org_member"
 			case strings.Contains(errStr, "rate limit"):
 				errorCode = "rate_limit_exceeded"
@@ -325,6 +335,7 @@ func (h *WebSocketHandler) validateAuth(ctx context.Context, ws *websocket.Conn,
 			logger.Error("GitHub auth/org membership validation failed", err, logger.Fields{
 				"ip":           ip,
 				"org":          sub.Organization,
+				"username":     username,
 				"token_prefix": tokenPrefix,
 				"token_length": len(githubToken),
 				"reason":       errorReason,