Merge pull request #39 from akatsoulas/rename-settings

Better naming for project's settings.

Author: akatsoulas

mozilla_django_oidc/auth.py

@@ -20,8 +20,8 @@ def __init__(self, *args, **kwargs):
         """Initialize settings."""
         self.OIDC_OP_TOKEN_ENDPOINT = import_from_settings('OIDC_OP_TOKEN_ENDPOINT')
         self.OIDC_OP_USER_ENDPOINT = import_from_settings('OIDC_OP_USER_ENDPOINT')
-        self.OIDC_OP_CLIENT_ID = import_from_settings('OIDC_OP_CLIENT_ID')
-        self.OIDC_OP_CLIENT_SECRET = import_from_settings('OIDC_OP_CLIENT_SECRET')
+        self.OIDC_RP_CLIENT_ID = import_from_settings('OIDC_RP_CLIENT_ID')
+        self.OIDC_RP_CLIENT_SECRET = import_from_settings('OIDC_RP_CLIENT_SECRET')
 
         self.UserModel = get_user_model()
 
@@ -31,9 +31,9 @@ def verify_token(self, token, **kwargs):
         # Get JWT audience without signature verification
         audience = jwt.decode(token, verify=False)['aud']
 
-        secret = self.OIDC_OP_CLIENT_SECRET
+        secret = self.OIDC_RP_CLIENT_SECRET
         if import_from_settings('OIDC_RP_CLIENT_SECRET_ENCODED', False):
-            secret = base64.urlsafe_b64decode(self.OIDC_OP_CLIENT_SECRET)
+            secret = base64.urlsafe_b64decode(self.OIDC_RP_CLIENT_SECRET)
 
         return jwt.decode(token, secret,
                           verify=import_from_settings('OIDC_VERIFY_JWT', True),
@@ -46,8 +46,8 @@ def authenticate(self, code=None, state=None):
             return None
 
         token_payload = {
-            'client_id': self.OIDC_OP_CLIENT_ID,
-            'client_secret': self.OIDC_OP_CLIENT_SECRET,
+            'client_id': self.OIDC_RP_CLIENT_ID,
+            'client_secret': self.OIDC_RP_CLIENT_SECRET,
             'grant_type': 'authorization_code',
             'code': code,
             'redirect_uri': absolutify(reverse('oidc_authentication_callback'))
@@ -56,7 +56,7 @@ def authenticate(self, code=None, state=None):
         # Get the token
         response = requests.post(self.OIDC_OP_TOKEN_ENDPOINT,
                                  json=token_payload,
-                                 verify=import_from_settings('VERIFY_SSL', True))
+                                 verify=import_from_settings('OIDC_VERIFY_SSL', True))
         response.raise_for_status()
 
         # Validate the token

mozilla_django_oidc/views.py

@@ -65,7 +65,7 @@ def __init__(self, *args, **kwargs):
         super(OIDCAuthenticationRequestView, self).__init__(*args, **kwargs)
 
         self.OIDC_OP_AUTH_ENDPOINT = import_from_settings('OIDC_OP_AUTHORIZATION_ENDPOINT')
-        self.OIDC_OP_CLIENT_ID = import_from_settings('OIDC_OP_CLIENT_ID')
+        self.OIDC_RP_CLIENT_ID = import_from_settings('OIDC_RP_CLIENT_ID')
 
     def get(self, request):
         """OIDC client authentication initialization HTTP endpoint"""
@@ -74,7 +74,7 @@ def get(self, request):
         params = {
             'response_type': 'code',
             'scope': 'openid',
-            'client_id': self.OIDC_OP_CLIENT_ID,
+            'client_id': self.OIDC_RP_CLIENT_ID,
             'redirect_uri': absolutify(reverse('oidc_authentication_callback')),
             'state': state,
         }

tests/test_auth.py

@@ -14,8 +14,8 @@ class OIDCAuthenticationBackendTestCase(TestCase):
 
     @override_settings(OIDC_OP_TOKEN_ENDPOINT='https://server.example.com/token')
     @override_settings(OIDC_OP_USER_ENDPOINT='https://server.example.com/user')
-    @override_settings(OIDC_OP_CLIENT_ID='example_id')
-    @override_settings(OIDC_OP_CLIENT_SECRET='example_secret')
+    @override_settings(OIDC_RP_CLIENT_ID='example_id')
+    @override_settings(OIDC_RP_CLIENT_SECRET='example_secret')
     def setUp(self):
         self.backend = OIDCAuthenticationBackend()
 

tests/test_views.py

@@ -169,7 +169,7 @@ def setUp(self):
         self.factory = RequestFactory()
 
     @override_settings(OIDC_OP_AUTHORIZATION_ENDPOINT='https://server.example.com/auth')
-    @override_settings(OIDC_OP_CLIENT_ID='example_id')
+    @override_settings(OIDC_RP_CLIENT_ID='example_id')
     @override_settings(SITE_URL='http://site-url.com')
     @patch('mozilla_django_oidc.views.get_random_string')
     def test_get(self, mock_random_string):