Use :query-params with string keys.
Merge branches 'fix-params-key' and 'add-grant-type'