Revert "Removing old OAuth"

This reverts commit 3e64dc36a310e254ab255e93b8650360af06b837.
Revert "Complete Removal of oauth2"

This reverts commit c7a45acd3773ca7649ff0a6556c44e7afb9ed9e2.