18a3819 Restore scope and enhance scope checking with scope/authorize/client_id/username.