rewrite with newer auth flow