Refactor OAuth code

Ryan Hargrequested to merge
housekeeping/refactoring-oauth into develop

Merge request reports