Added expiresIn method to AuthCode case class
GrantHandler for token request was comparing old non-Option clientId to option client id, fixed)