Support the new longterm token model in user-api

@cheddar -- quick, backwards compatible changes for the new user-api