B-52618 wrapper class on auth service client