refactor currentUser into separate service