refactor uri routes
refactor authorization code
Merge branch 'gsfr-current-user'