PDI-11140 - Refactored AuthContext logic to limit duplication