Fix wheel token auth by moving eauth checks below token
Merge pull request #4217 from whiteinge/fix-token-auth

Fix wheel token auth by moving eauth checks below token