Merge branch 'master' of github.com:namespace-ee/django-rest-framework-sso

Author: lnagel

README.rst

@@ -48,7 +48,7 @@ the ObtainAuthorizationTokenView and AuthorizationTokenSerializer::
         serializer_class = AuthorizationTokenSerializer
 
 
-    class AuthorizationTokenSerializer(QuerySetReadableMixin, serializers.Serializer):
+    class AuthorizationTokenSerializer(serializers.Serializer):
         account = serializers.HyperlinkedRelatedField(
             queryset=Account.objects.all(),
             required=True,
@@ -151,22 +151,22 @@ Example settings for project that both issues and validates tokens for `myapp` a
         'AUTHORIZATION_AUDIENCE': ['myapp', 'otherapp'],
         'ACCEPTED_ISSUERS': ['myapp'],
         'PUBLIC_KEYS': {
-            'myapp': 'keys/myapp_public_key.pem',
+            'myapp': 'keys/myapp-20180101.pem',  # both private/public key in same file
         },
         'PRIVATE_KEYS': {
-            'myapp': 'keys/myapp_private_key.pem',
+            'myapp': 'keys/myapp-20180101.pem',  # both private/public key in same file
         },
     }
     
-Example settings for project that only accepts tokens signed by `myapp` for `otherapp`::
+Example settings for project that only accepts tokens signed by `myapp` public key for `otherapp`::
 
     REST_FRAMEWORK_SSO = {
         'AUTHENTICATE_PAYLOAD': 'otherapp.authentication.authenticate_payload',
         'VERIFY_SESSION_TOKEN': False,
         'IDENTITY': 'otherapp',
         'ACCEPTED_ISSUERS': ['myapp'],
         'PUBLIC_KEYS': {
-            'myapp': 'keys/myapp_public_key.pem',
+            'myapp': 'keys/myapp-20180101.pem',  # only public key in this file
         },
     }
 
@@ -205,4 +205,5 @@ You can use openssl to generate your public/private key pairs::
 
     $ openssl genpkey -algorithm RSA -out private_key.pem -pkeyopt rsa_keygen_bits:2048
     $ openssl rsa -pubout -in private_key.pem -out public_key.pem
+    $ cat private_key.pem public_key.pem > keys/myapp-20180101.pem
 

requirements.txt

@@ -1,4 +1,4 @@
 Django>=1.8
 djangorestframework>=3.2,<4.0
 PyJWT>=1.4.0,<2.0.0
-cryptography>=2.0,<3.0
+cryptography>=2.1.0,<4.0