c9059f1 Consolidate token generation into BearerTokenType.