Add: intercept servise and improve auth controller