diff --git a/auth_remember/middleware.py b/auth_remember/middleware.py index ca6d7c3..b35518a 100644 --- a/auth_remember/middleware.py +++ b/auth_remember/middleware.py @@ -7,6 +7,14 @@ class AuthRememberMiddleware(object): + def __init__(self, get_response=None): + self.get_response = get_response + + def __call__(self, request): + self.process_request(request) + response = self.get_response(request) + return self.process_response(request, response) + def process_request(self, request): if request.user.is_authenticated(): request.user.is_fresh = request.session.get(SESSION_KEY, False) diff --git a/auth_remember/migrations/0001_initial.py b/auth_remember/migrations/0001_initial.py deleted file mode 100644 index 5801c19..0000000 --- a/auth_remember/migrations/0001_initial.py +++ /dev/null @@ -1,73 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'RememberToken' - db.create_table('auth_remember_remembertoken', ( - ('token_hash', self.gf('django.db.models.fields.CharField')(max_length=128, primary_key=True)), - ('created', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now, blank=True)), - ('created_initial', self.gf('django.db.models.fields.DateTimeField')()), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='remember_me_tokens', to=orm['auth.User'])), - )) - db.send_create_signal('auth_remember', ['RememberToken']) - - - def backwards(self, orm): - - # Deleting model 'RememberToken' - db.delete_table('auth_remember_remembertoken') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'auth_remember.remembertoken': { - 'Meta': {'object_name': 'RememberToken'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), - 'created_initial': ('django.db.models.fields.DateTimeField', [], {}), - 'token_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'remember_me_tokens'", 'to': "orm['auth.User']"}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['auth_remember'] diff --git a/auth_remember/migrations/__init__.py b/auth_remember/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/auth_remember/tests.py b/auth_remember/tests.py index 5e64274..fe855a3 100644 --- a/auth_remember/tests.py +++ b/auth_remember/tests.py @@ -131,7 +131,7 @@ def test_middleware_update_token(self): self.assertTrue(RememberToken.objects.get_by_string(token_string)) def test_middleware_set_remember_token(self): - from auth_remember import remember_user + from auth_remember.core import remember_user from auth_remember import settings from auth_remember.middleware import AuthRememberMiddleware diff --git a/setup.py b/setup.py index 3b446bc..9e542e7 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,6 @@ install_requires = [ 'Django >= 1.9.1', - 'South >= 0.8.4', ] diff --git a/tests/settings.py b/tests/settings.py index 80b5ad7..ab83a93 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -131,7 +131,6 @@ # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', - 'south', 'auth_remember', )