update admin and migrations

Author: Marco DiDomenico

MANIFEST.in

@@ -1,2 +1,3 @@
 include LICENSE
 include README.rst
+recursive-include docs *

README.md

@@ -41,6 +41,10 @@ And add the following to your `urls.py`
     	...
     )
 
+In your templates you can initiate the OAuth2 workflow like this:
+
+	<a href="{% url 'replyify:authorize' %}">Connect to Replyify</a>
+
 
 
 

README.rst

@@ -32,18 +32,18 @@ Configure the django-replyify-oauth2 module
 -------------------------------------------
 
 From your previously configured app, found at https://app.replyify.com/oauth2/applications add the following to your Django settings:
-* REPLYIFY_CLIENT_ID
-* REPLYIFY_CLIENT_SECRET
-* REPLYIFY_REDIRECT_URI
-* REPLYIFY_USER_ID_FIELD
+- REPLYIFY_CLIENT_ID
+- REPLYIFY_CLIENT_SECRET
+- REPLYIFY_REDIRECT_URI
+- REPLYIFY_USER_ID_FIELD
 
-And add the following to your :: urls.py
+And add the following to your `urls.py`
 ::
 	urlpatterns = patterns(
-    	...
-    	url(r'^replyify/', include('replyify_oauth2.urls', namespace='replyify')),
-    	...
-    )
+		...
+		url(r'^replyify/', include('replyify_oauth2.urls', namespace='replyify')),
+		...
+	)
 
 
 Using the Replyify API

docs/.gitkeep

@@ -7,6 +7,27 @@
 #
 
 from django.contrib import admin
+from django.contrib.auth import get_user_model
+from django.conf import settings
 from .models import Credentials
 
-admin.site.register(Credentials)
+
+def user_search_fields():
+    User = get_user_model()
+    USERNAME_FIELD = getattr(User, 'USERNAME_FIELD', None)
+    fields = []
+    if USERNAME_FIELD is not None:
+        # Using a Django 1.5+ User model
+        fields = [
+            'user__{}'.format(USERNAME_FIELD),
+            'user__{}'.format(settings.REPLYIFY_USER_ID_FIELD)
+        ]
+    return fields
+
+
+class CredentialsAdmin(admin.ModelAdmin):
+    search_fields = ['access_token'] + user_search_fields()
+    raw_id_fields = ('user',)
+
+
+admin.site.register(Credentials, CredentialsAdmin)

replyify_oauth2/admin.py

@@ -14,3 +14,5 @@
 
     class ReplyifyOAuth2Config(AppConfig):
         name = 'replyify_oauth2'
+        verbose_name = 'Replyify OAuth2'
+        label = 'replyify_oauth2'

replyify_oauth2/apps.py

@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Credentials',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True, related_name='replyify_credentials')),
                 ('user', models.OneToOneField(null=True, to=settings.AUTH_USER_MODEL)),
                 ('access_token', models.CharField(max_length=50)),
                 ('refresh_token', models.CharField(max_length=50)),

replyify_oauth2/migrations/0001_initial.py

@@ -13,7 +13,7 @@
 
 
 class Credentials(models.Model):
-    user = models.OneToOneField(getattr(settings, 'AUTH_USER_MODEL', 'auth.User'), on_delete=models.CASCADE)
+    user = models.OneToOneField(getattr(settings, 'AUTH_USER_MODEL', 'auth.User'), on_delete=models.CASCADE, related_name='replyify_credentials')
     access_token = models.CharField(max_length=50)
     refresh_token = models.CharField(max_length=50)
     expires = models.DateTimeField(default=timezone.now)

replyify_oauth2/models.py

@@ -5,17 +5,13 @@
 # This file is subject to the terms and conditions defined in
 # file 'LICENSE.md', which is part of this source code package.
 #
-
-try:
-    from . import settings
-except ImportError:
-    import settings
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.utils import timezone
 from django.utils.crypto import get_random_string
 from .models import Credentials
+from . import settings
 from datetime import timedelta
 import requests
 
@@ -51,7 +47,16 @@ def callback(request=None):
         raise Exception(request.GET['error'])
 
     uid = _check_state(request)
-    data = _exchange_auth_code(request)
+    code = request.GET['code']
+    data = {
+        'grant_type': 'authorization_code',
+        'code': code,
+        'client_id': settings.REPLYIFY_CLIENT_ID,
+        'redirect_uri': settings.REPLYIFY_REDIRECT_URI
+    }
+    url = settings.REPLYIFY_TOKEN_URL
+    r = requests.post(url=url, data=data)
+    data = r.json()
     creds = _store_credentials(uid, data)
 
     return HttpResponse(creds)
@@ -98,19 +103,6 @@ def _check_state(request=None):
     return uid
 
 
-def _exchange_auth_code(request=None):
-    code = request.GET['code']
-    data = {
-        'grant_type': 'authorization_code',
-        'code': code,
-        'client_id': settings.REPLYIFY_CLIENT_ID,
-        'redirect_uri': settings.REPLYIFY_REDIRECT_URI
-    }
-    url = settings.REPLYIFY_TOKEN_URL
-    r = requests.post(url=url, data=data)
-    return r.json()
-
-
 def _store_credentials(user, data=None):
     assert user is not None
     creds, _ = Credentials.objects.get_or_create(user=user)