astronomer / astro-cli / 5903445d-4be9-4f20-89b7-53d8ac3a5048

40%

push

circleci

fix: org switch silently falls back to wrong org when user has >20 orgs (#2084)

When a user belonged to more organizations than the API's default page size and ran `astro organization switch`, selecting any org beyond position 20 would silently switch to the wrong org (the first in the list) instead of the chosen one.

Root cause: after the user picks an org, `CheckUserSession` re-fetches the org list to resolve the active org with no `Limit` set, so the API returned only its default 20. When the chosen org wasn't in those 20, the code silently fell back to `orgs[0]`.

Fix: resolve the active org by ID via `GetOrganization` rather than list-and-search. On 403/404 (membership revoked, org deleted, state from a prior account), fall through to list-and-pick-first so users with stale context still land somewhere usable — see #2097 for the lifecycle cleanup that would let us drop that fallback.

Closes #2083

21 of 29 new or added lines in 1 file covered. (72.41%)

25081 of 63502 relevant lines covered (39.5%)

9.54 hits per line