Fixed conflict on last pull request

- Fixed a function being called as a property ( $this->hasAccessToken to $this->hasAccessToken() )
- Refactored to start using injected instead hard-coded dependencies

If I happen to overwrite anything from the last commit, I apologize.