* addresing ticket #585

* `prepare_request_body` client_id is deprecated in favor of include_client_id
* a new unit test `test_prepare_request_body` is added to ensure conformity of several use cases
* the docstrings for the `body` param have been consolidated and standardized across multiple functions linked to `prepare_request_body` for clarity

1 files changed, 7 insertions, 6 deletions

diff --git a/oauthlib/oauth2/rfc6749/clients/service_application.py b/oauthlib/oauth2/rfc6749/clients/service_application.py
index 3045676..6bb784e 100644
--- a/oauthlib/oauth2/rfc6749/clients/service_application.py
+++ b/oauthlib/oauth2/rfc6749/clients/service_application.py
@@ -97,18 +97,19 @@ class ServiceApplicationClient(Client):
         :param issued_at: A unix timestamp of when the JWT was created.
                           Defaults to now, i.e. ``time.time()``.
 
+        :param extra_claims: A dict of additional claims to include in the JWT.
+
+        :param body: Existing request body (URL encoded string) to embed parameters
+                     into. This may contain extra paramters. Default ''.
+
+        :param scope: The scope of the access request.
+
         :param not_before: A unix timestamp after which the JWT may be used.
                            Not included unless provided.
 
         :param jwt_id: A unique JWT token identifier. Not included unless
                        provided.
 
-        :param extra_claims: A dict of additional claims to include in the JWT.
-
-        :param scope: The scope of the access request.
-
-        :param body: Request body (string) with extra parameters.
-
         :param kwargs: Extra credentials to include in the token request.
 
         The "scope" parameter may be used, as defined in the Assertion