Removed unnecessary map entries
Retrieve tenant id from auth as well
Merge pull request #4 from rampage644/auth

Auth