From a4b49906a6463d4c212608afd0d434b206693634 Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Wed, 7 Nov 2018 15:10:10 +0100
Subject: [PATCH 1/5] Style the buttons as all othe rbuttons

---
 templates/openid/login.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/openid/login.html b/templates/openid/login.html
index b074171..3bcfbd7 100644
--- a/templates/openid/login.html
+++ b/templates/openid/login.html
@@ -27,12 +27,14 @@
 <p><label for="id_openid_identifier">{% trans 'OpenID' %}:</label>&nbsp;
 <input class="required openid" id="id_openid_identifier" size="70" maxlength="255" name="openid_identifier" value="{{ openid_identifier }}" type="text"></p>
 
-<p><input type="submit" value="{% trans 'Login' %}" />
+<p>
+<button type="submit" class="btn btn-default">{% trans 'Login' %}</button>
 <input type="hidden" name="next" id="next"/>
 <script>
   document.getElementById("next").value = window.location.protocol + '//' + window.location.hostname + "{% url 'profile' %}";
 </script>
-&nbsp;<a href="{% url 'home' %}">{% trans 'Cancel' %}</a></p>
+&nbsp;
+<button type="reset" class="btn btn-default" onclick="window.history.back();">{% trans 'Cancel' %}</button>
 
 </form>
 

From 9009bc7e2fe0585f976e39270d4b87fdbf6e7217 Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Wed, 7 Nov 2018 15:10:47 +0100
Subject: [PATCH 2/5] Add messages again

---
 templates/base.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/templates/base.html b/templates/base.html
index d3a19a3..3eb96a7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -71,7 +71,15 @@
 
   {% autoescape off %}{% endautoescape %}
 
-  <div class="container">
+    <div class="container">
+      {% if messages %}
+          {% for message in messages %}
+            <div class="alert alert-{{ message.tags }}" role="alert">
+              {{ message }}
+            </div>
+          {% endfor %}
+      {% endif %}
+
       {% block content %}{% endblock content %}
     </div>
 

From 9c4a975a773ead47e63105933579a77f47f7eca7 Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Wed, 7 Nov 2018 15:11:12 +0100
Subject: [PATCH 3/5] We also need to delete the main OpenID object to not
 leave any traces

---
 ivatar/ivataraccount/views.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py
index 03fd460..750ab12 100644
--- a/ivatar/ivataraccount/views.py
+++ b/ivatar/ivataraccount/views.py
@@ -526,6 +526,10 @@ class RemoveConfirmedOpenIDView(View):
         try:
             openid = self.model.objects.get(  # pylint: disable=no-member
                 user=request.user, id=kwargs['openid_id'])
+            openidobj = UserOpenID.objects.get(  # pylint: disable=no-member
+                user_id=request.user.id,
+                claimed_id=openid.openid)
+            openidobj.delete()
             openid.delete()
             messages.success(request, _('ID removed'))
         except self.model.DoesNotExist:  # pylint: disable=no-member

From c8a8624da0fedaeafb749692503a7e6f9c75b52b Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Wed, 7 Nov 2018 15:11:30 +0100
Subject: [PATCH 4/5] Add button/link to OpenID login

---
 ivatar/ivataraccount/templates/login.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ivatar/ivataraccount/templates/login.html b/ivatar/ivataraccount/templates/login.html
index ccbf6ac..6210eab 100644
--- a/ivatar/ivataraccount/templates/login.html
+++ b/ivatar/ivataraccount/templates/login.html
@@ -29,7 +29,11 @@
 <label for="id_password">{% trans 'Password' %}:</label>
 <input type="password" name="password" class="form-control" required id="id_password">
 </div>
-  <button type="submit" class="btn btn-default">{% trans 'Login' %}</button> or <a href="{% url 'new_account' %}" class="btn btn-default">{% trans 'Create new user' %}</a>
+  <button type="submit" class="btn btn-default">{% trans 'Login' %}</button>
+  or
+  <a href="{% url 'openid-login' %}" class="btn btn-default">{% trans 'Login with OpenID' %}</a>
+  or
+  <a href="{% url 'new_account' %}" class="btn btn-default">{% trans 'Create new user' %}</a>
 </form>
 </div>
 <div style="height:40px"></div>

From ffde836b075f6bdb036c93bde3c799ac53ce527c Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Wed, 7 Nov 2018 15:21:43 +0100
Subject: [PATCH 5/5] Regression in tests

---
 ivatar/ivataraccount/views.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py
index 750ab12..414bc3e 100644
--- a/ivatar/ivataraccount/views.py
+++ b/ivatar/ivataraccount/views.py
@@ -526,10 +526,14 @@ class RemoveConfirmedOpenIDView(View):
         try:
             openid = self.model.objects.get(  # pylint: disable=no-member
                 user=request.user, id=kwargs['openid_id'])
-            openidobj = UserOpenID.objects.get(  # pylint: disable=no-member
-                user_id=request.user.id,
-                claimed_id=openid.openid)
-            openidobj.delete()
+            try:
+                openidobj = UserOpenID.objects.get(  # pylint: disable=no-member
+                    user_id=request.user.id,
+                    claimed_id=openid.openid)
+                openidobj.delete()
+            except:
+                # Why it is not there?
+                pass
             openid.delete()
             messages.success(request, _('ID removed'))
         except self.model.DoesNotExist:  # pylint: disable=no-member