also needs to check for  the wildcard
added grant_type support
added a convenience method