Auth upgrade

* Adds configurable auth strategy

Change-Id: I248cc445cfae184a01ca3c3b299101b4cae1b2a6