Revert "fixing token checking"

This reverts commit 00c255e80cf485604bb42f7d3432e4a622bbb94c.
Revert "break out redirect from auth code response"

This reverts commit ad676f2816a44a46c5cf5f06cff8619869eb0c7b.