RFR: changing token, tenant authentication to fetch session by tenant

Currently we are storing the session for the tenant , token id authentication using the token id; changing this to be storing the session using tenant id instead.