Rename CLIENT_ID to STRAVA_CLIENT_ID and CLIENT_SECRET similarly

README.md

@@ -10,5 +10,5 @@ Usage
 
 1. Add 'stravauth' to settings.INSTALLED_APPS
 2. Set settings.AUTHENTICATION_BACKENDS = ('stravauth.backend.StravaV3Backend', )
-3. Add CLIENT_ID, CLIENT_SECRET, STRAVA_REDIRECT to settings
+3. Add STRAVA_CLIENT_ID, STRAVA_CLIENT_SECRET, STRAVA_REDIRECT to settings
 4. Add to urls: url(r'^login/', StravaAuth.as_view(url=reverse_lazy("home")), kwargs={"approval_prompt": "force"})

example/app/urls.py

@@ -1,13 +1,12 @@
-from django.conf.urls import patterns, include, url
-from django.contrib import admin
-from django.core.urlresolvers import reverse_lazy
+from django.conf.urls import url
+from django.contrib.auth.views import logout as logoutview
+from django.urls import reverse_lazy
 
+from example.app.views import home_view
 from stravauth.views import StravaAuth
 
-from app.views import HomeView
-
-urlpatterns = patterns('',
-    url(r'^$', HomeView.as_view(), name="home"),
-    url(r'^login/', StravaAuth.as_view(url=reverse_lazy("home")), kwargs={"approval_prompt": "force"}, name="login"),
-    url(r'^logout/$', 'django.contrib.auth.views.logout', kwargs={'next_page': '/'}, name="logout"),
-)
+urlpatterns = [
+    url(r'^$', home_view, name="home"),
+    url(r'^login', StravaAuth.as_view(url=reverse_lazy("home")), kwargs={"approval_prompt": "force"}, name="login"),
+    url(r'^logout$', logoutview, kwargs={'next_page': '/'}, name="logout"),
+]

example/app/views.py

@@ -1,4 +1,5 @@
-from django.views.generic import TemplateView
+from django.shortcuts import render
 
-class HomeView(TemplateView):
-    template_name = "home.html"
+
+def home_view(request):
+    return render(request, "home.html", {})

example/example/settings.py

@@ -43,15 +43,16 @@
     'app',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
+]
+
 
 ROOT_URLCONF = 'app.urls'
 
@@ -69,6 +70,25 @@
     }
 }
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [os.path.join(BASE_DIR, 'app/templates')]
+        ,
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+
+
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
 
@@ -89,11 +109,12 @@
 STATIC_URL = '/static/'
 
 # Strava settings
-CLIENT_ID = None
-CLIENT_SECRET = None
+STRAVA_CLIENT_ID = None
+STRAVA_CLIENT_SECRET = None
 STRAVA_REDIRECT = "http://localhost:8000/login/"
+
 try:
-    from stravauth_settings import CLIENT_ID, CLIENT_SECRET
+    from stravauth_settings import STRAVA_CLIENT_ID, STRAVA_CLIENT_SECRET
 except ImportError:
     pass
 

stravauth/backend.py

@@ -9,8 +9,8 @@ class StravaV3Backend(object):
     Authenticate using the Strava V3 API.
     """
     def authenticate(self, code):
-        client_id = settings.CLIENT_ID
-        client_secret = settings.CLIENT_SECRET
+        client_id = settings.STRAVA_CLIENT_ID
+        client_secret = settings.STRAVA_CLIENT_SECRET
 
         # Make the request to the API
         c = StravaClient()

stravauth/models.py

@@ -4,6 +4,5 @@
 
 
 class StravaToken(models.Model):
-    user = models.OneToOneField(User)
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
     token = models.CharField(max_length=60)
-

stravauth/tests/test_utils.py

@@ -17,7 +17,7 @@ def test_get_stravauth_url_no_params(self):
         self.assertEqual(url, "https://app.strava.com/oauth/authorize")
 
         self.assertEqual(len(vars), 5)
-        self.assertEqual(vars["client_id"], str(settings.CLIENT_ID))
+        self.assertEqual(vars["client_id"], str(settings.STRAVA_CLIENT_ID))
         self.assertEqual(vars["response_type"], "code")
         self.assertEqual(vars["redirect_uri"], settings.STRAVA_REDIRECT)
         self.assertEqual(vars["approval_prompt"], "auto")

stravauth/utils.py

@@ -11,7 +11,7 @@ def get_stravauth_url(approval_prompt="auto", scope="write"):
 
     strava_url = "https://app.strava.com/oauth/authorize"
     vars = ""
-    vars += "client_id=%s" % settings.CLIENT_ID
+    vars += "client_id=%s" % settings.STRAVA_CLIENT_ID
     vars += "&response_type=%s" % "code"
     vars += "&redirect_uri=%s" % settings.STRAVA_REDIRECT
     vars += "&approval_prompt=%s" % approval_prompt