update on passport logic to works with Oauth2 tokens