Authentication refactor done: OAuth + APIKEY + HTTP BASIC