api: Improve discovery code

Now supports C2S, S2S, as well as Identity discovery
Still needs to somehow report the preferred identity server in a
reasonable manner