From 39145ccb923bcf70211295bf004ad6d7b13a209e Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Sun, 21 Jun 2020 15:58:22 +0200
Subject: [PATCH] saml: remove unused LibertyProvider fields (#16313)

---
 src/authentic2/saml/admin.py                  |  6 -----
 .../migrations/0019_auto_20200621_1558.py     | 25 +++++++++++++++++++
 src/authentic2/saml/models.py                 |  3 ---
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 src/authentic2/saml/migrations/0019_auto_20200621_1558.py

diff --git a/src/authentic2/saml/admin.py b/src/authentic2/saml/admin.py
index da34d8cd..bfada2db 100644
--- a/src/authentic2/saml/admin.py
+++ b/src/authentic2/saml/admin.py
@@ -75,9 +75,6 @@ class TextAndFileWidget(forms.widgets.MultiWidget):
 
 class LibertyProviderForm(ModelForm):
     metadata = forms.CharField(required=True, widget=TextAndFileWidget, label=_('Metadata'))
-    public_key = forms.CharField(required=False, widget=TextAndFileWidget, label=_('Public key'))
-    ssl_certificate = forms.CharField(required=False, widget=TextAndFileWidget, label=_('SSL certificate'))
-    ca_cert_chain = forms.CharField(required=False, widget=TextAndFileWidget, label=_('Certificate chain'))
 
     class Meta:
         model = LibertyProvider
@@ -90,9 +87,6 @@ class LibertyProviderForm(ModelForm):
             'federation_source',
             'metadata_url',
             'metadata',
-            'public_key',
-            'ssl_certificate',
-            'ca_cert_chain',
         ]
 
 
diff --git a/src/authentic2/saml/migrations/0019_auto_20200621_1558.py b/src/authentic2/saml/migrations/0019_auto_20200621_1558.py
new file mode 100644
index 00000000..e41db6bc
--- /dev/null
+++ b/src/authentic2/saml/migrations/0019_auto_20200621_1558.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2.13 on 2020-06-21 13:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('saml', '0018_truncate_saml_keyvalue'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='libertyprovider',
+            name='ca_cert_chain',
+        ),
+        migrations.RemoveField(
+            model_name='libertyprovider',
+            name='public_key',
+        ),
+        migrations.RemoveField(
+            model_name='libertyprovider',
+            name='ssl_certificate',
+        ),
+    ]
diff --git a/src/authentic2/saml/models.py b/src/authentic2/saml/models.py
index 7b463938..345765cc 100644
--- a/src/authentic2/saml/models.py
+++ b/src/authentic2/saml/models.py
@@ -374,9 +374,6 @@ class LibertyProvider(Service):
         verbose_name=_('Protocol conformance'))
     metadata = models.TextField(validators=[metadata_validator])
     # All following field must be PEM formatted textual data
-    public_key = models.TextField(blank=True)
-    ssl_certificate = models.TextField(blank=True)
-    ca_cert_chain = models.TextField(blank=True)
     federation_source = models.CharField(
         max_length=64,
         blank=True,
-- 
2.26.2