nit: clientidKey as variable name.  Only because ClientId has such a specific meaning in OAuth.