fix crud and refactor consumer auth