diff --git a/cas_server/migrations/0005_auto_20160616_1018.py b/cas_server/migrations/0005_auto_20160616_1018.py index 4a503ea..fea9167 100644 --- a/cas_server/migrations/0005_auto_20160616_1018.py +++ b/cas_server/migrations/0005_auto_20160616_1018.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals from django.db import migrations, models import picklefield.fields +import django.db.models.deletion class Migration(migrations.Migration): @@ -13,12 +14,33 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AlterField( + model_name='servicepattern', + name='pos', + field=models.IntegerField(default=100, help_text='service patterns are sorted using the position attribute', verbose_name='position'), + ), + migrations.CreateModel( + name='FederatedIendityProvider', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('suffix', models.CharField(help_text='Suffix append to backend CAS returner username: `returned_username`@`suffix`', max_length=30, unique=True, verbose_name='suffix')), + ('server_url', models.CharField(max_length=255, verbose_name='server url')), + ('cas_protocol_version', models.CharField(choices=[(b'1', b'CAS 1.0'), (b'2', b'CAS 2.0'), (b'3', b'CAS 3.0'), (b'CAS_2_SAML_1_0', b'SAML 1.1')], default=b'3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS', max_length=30, verbose_name='CAS protocol version')), + ('verbose_name', models.CharField(help_text='Name for this identity provider displayed on the login page', max_length=255, verbose_name='verbose name')), + ('pos', models.IntegerField(default=100, help_text='Identity provider are sorted using the (position, verbose name, suffix) attributes', verbose_name='position')), + ('display', models.BooleanField(default=True, help_text='Display the provider on the login page', verbose_name='display')), + ], + options={ + 'verbose_name': 'identity provider', + 'verbose_name_plural': 'identity providers', + }, + ), migrations.CreateModel( name='FederatedUser', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('username', models.CharField(max_length=124)), - ('provider', models.CharField(max_length=124)), + ('provider', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cas_server.FederatedIendityProvider')), ('attributs', picklefield.fields.PickledObjectField(editable=False)), ('ticket', models.CharField(max_length=255)), ('last_update', models.DateTimeField(auto_now=True)), @@ -28,4 +50,17 @@ class Migration(migrations.Migration): name='federateduser', unique_together=set([('username', 'provider')]), ), + migrations.CreateModel( + name='FederateSLO', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('username', models.CharField(max_length=30)), + ('session_key', models.CharField(blank=True, max_length=40, null=True)), + ('ticket', models.CharField(db_index=True, max_length=255)), + ], + ), + migrations.AlterUniqueTogether( + name='federateslo', + unique_together=set([('username', 'session_key', 'ticket')]), + ), ] diff --git a/cas_server/migrations/0006_auto_20160623_1516.py b/cas_server/migrations/0006_auto_20160623_1516.py deleted file mode 100644 index 6a580c4..0000000 --- a/cas_server/migrations/0006_auto_20160623_1516.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-23 15:16 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0005_auto_20160616_1018'), - ] - - operations = [ - migrations.CreateModel( - name='FederateSLO', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('username', models.CharField(max_length=30)), - ('session_key', models.CharField(blank=True, max_length=40, null=True)), - ('ticket', models.CharField(max_length=255)), - ], - ), - migrations.AlterUniqueTogether( - name='federateslo', - unique_together=set([('username', 'session_key')]), - ), - ] diff --git a/cas_server/migrations/0007_auto_20160704_1510.py b/cas_server/migrations/0007_auto_20160704_1510.py deleted file mode 100644 index 822f6d3..0000000 --- a/cas_server/migrations/0007_auto_20160704_1510.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-04 15:10 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0006_auto_20160623_1516'), - ] - - operations = [ - migrations.CreateModel( - name='FederatedIendityProvider', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('suffix', models.CharField(help_text='Suffix append to backend CAS returner username: `returned_username`@`suffix`', max_length=30, unique=True, verbose_name='suffix')), - ('server_url', models.CharField(max_length=255, verbose_name='server url')), - ('cas_protocol_version', models.CharField(choices=[(b'1', b'CAS 1.0'), (b'2', b'CAS 2.0'), (b'3', b'CAS 3.0'), (b'CAS_2_SAML_1_0', b'SAML 1.1')], default=b'3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS', max_length=30, verbose_name='CAS protocol version')), - ('verbose_name', models.CharField(help_text='Name for this identity provider displayed on the login page', max_length=255, verbose_name='verbose name')), - ('pos', models.IntegerField(default=100, help_text='Identity provider are sorted using the (position, verbose name, suffix) attributes', verbose_name='position')), - ], - options={ - 'verbose_name': 'identity provider', - 'verbose_name_plural': 'identity providers', - }, - ), - migrations.RemoveField( - model_name='federateduser', - name='provider' - ), - migrations.AddField( - model_name='federateduser', - name='provider', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cas_server.FederatedIendityProvider'), - ), - migrations.AlterField( - model_name='federateslo', - name='ticket', - field=models.CharField(db_index=True, max_length=255), - ), - migrations.AlterField( - model_name='servicepattern', - name='pos', - field=models.IntegerField(default=100, help_text='service patterns are sorted using the position attribute', verbose_name='position'), - ), - migrations.AlterUniqueTogether( - name='federateslo', - unique_together=set([('username', 'session_key', 'ticket')]), - ), - ] diff --git a/cas_server/migrations/0008_federatediendityprovider_display.py b/cas_server/migrations/0008_federatediendityprovider_display.py deleted file mode 100644 index ec1a3b2..0000000 --- a/cas_server/migrations/0008_federatediendityprovider_display.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-04 15:33 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0007_auto_20160704_1510'), - ] - - operations = [ - migrations.AddField( - model_name='federatediendityprovider', - name='display', - field=models.BooleanField(default=True, help_text='Display the provider on the login page', verbose_name='display'), - ), - ]