authFilter refactor