Prepare for multiple oauth channels

Is Session still needed?