[project @ Django demo RP: if no pape auth policies are returned, say no PAPE response was returned]

2 files changed, 6 insertions, 9 deletions

diff --git a/examples/djopenid/consumer/views.py b/examples/djopenid/consumer/views.py
index 78f6a2d..2b4d708 100644
--- a/examples/djopenid/consumer/views.py
+++ b/examples/djopenid/consumer/views.py
@@ -159,6 +159,9 @@ def finishOpenID(request):
         if response.status == consumer.SUCCESS:
             pape_response = pape.Response.fromSuccessResponse(response)
 
+            if not pape_response.auth_policies:
+                pape_response = None
+
         # Map different consumer status codes to template contexts.
         results = {
             consumer.CANCEL:
diff --git a/examples/djopenid/templates/consumer/index.html b/examples/djopenid/templates/consumer/index.html
index 53a139c..ac34add 100644
--- a/examples/djopenid/templates/consumer/index.html
+++ b/examples/djopenid/templates/consumer/index.html
@@ -59,19 +59,13 @@
       {% endif %}
 
       {% if pape %}
+        An authentication policy response contained these policies:
 
-        {% if pape.auth_policies %}
-          An authentication policy response contained these policies:
-
-          <ul>
+        <ul>
           {% for uri in pape.auth_policies %}
             <li><tt>{{ uri }}</tt></li>
           {% endfor %}
-          </ul>
-        {% else %}
-          An authentication policy response was returned, but no
-          policies were enforced by the server.
-        {% endif %}
+        </ul>
       {% else %}
         The server returned no authentication policy data (PAPE).
       {% endif %}