fix: split fetch and validate auth class steps (#1036)

fix: split fetch and validate auth class steps (#1036) #179