Changing ready logic to support both oauth and basic auth