CORS support adjustments for token authentication

CORS support adjustments in order to support token authentication