Refactor Api Auth for AAF