Resolve "[OAuth] Endpoint URLs broken in recent refactoring" Closes #537 See merge request !775
#40209