Integrate auth with flux setup
Merge changes