Commit 3e331fb5 authored by Ben Waters's avatar Ben Waters

Token auth in settings

parent 40b449e8
......@@ -2,21 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d9cecc44-3001-4c5b-a72e-16df32873bd9" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/geo/migrations/0001_initial.py" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/geo/migrations/__init__.py" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/geo/admin.py" afterPath="$PROJECT_DIR$/geo/admin.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/friendfinder.iml" afterPath="$PROJECT_DIR$/.idea/friendfinder.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/models.py" afterPath="$PROJECT_DIR$/core/models.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/geo/models.py" afterPath="$PROJECT_DIR$/geo/models.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/requirements.txt" afterPath="$PROJECT_DIR$/requirements.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/geo/router.py" afterPath="$PROJECT_DIR$/geo/router.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/ffREST/settings.py" afterPath="$PROJECT_DIR$/ffREST/settings.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/geo/tests.py" afterPath="$PROJECT_DIR$/geo/tests.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/ffREST/urls.py" afterPath="$PROJECT_DIR$/ffREST/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/views.py" afterPath="$PROJECT_DIR$/core/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/geo/views.py" afterPath="$PROJECT_DIR$/geo/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="friendfinder.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -92,16 +78,26 @@
</provider>
</entry>
</file>
<file leaf-file-name="views.py" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="views.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/views.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.075885326" vertical-offset="0" max-vertical-offset="593">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="3" column="33" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="settings.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/ffREST/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.842576" vertical-offset="444" max-vertical-offset="1695">
<caret line="61" column="1" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindManager">
......@@ -121,6 +117,7 @@
<option value="$PROJECT_DIR$/ffREST/urls.py" />
<option value="$PROJECT_DIR$/core/models.py" />
<option value="$PROJECT_DIR$/core/views.py" />
<option value="$PROJECT_DIR$/ffREST/settings.py" />
</list>
</option>
</component>
......@@ -666,12 +663,20 @@
</entry>
<entry file="file://$PROJECT_DIR$/core/views.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.075885326" vertical-offset="0" max-vertical-offset="593">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="3" column="33" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ffREST/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.842576" vertical-offset="444" max-vertical-offset="1695">
<caret line="61" column="1" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
......@@ -55,10 +55,15 @@ INSTALLED_APPS = (
)
REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.TokenAuthentication',
),
}
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
#'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment