Refactor OAuth code

Merged Ryan Harg requested to merge housekeeping/refactoring-oauth into develop

Merge request reports