Move preauth expiration logic to service

Fix this