fixing event payload
abstracting auth and cleaning up service provider