Add client-id input and deprecate app-id
#353
+118
−37
Draft