JARVIS-412 progress with auth middleware
JARVIS-412 progress with auth middleware