X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/6cea0592c2d7522b7e6501ebe52368618f92d58c..e25a52bd2e384683c99b6e57647b829dba3bf5a2:/forum_modules/openidauth/consumer.py

diff --git a/forum_modules/openidauth/consumer.py b/forum_modules/openidauth/consumer.py
index 9b5d6e7..aa24a36 100644
--- a/forum_modules/openidauth/consumer.py
+++ b/forum_modules/openidauth/consumer.py
@@ -1,5 +1,8 @@
+# -*- coding: utf-8 -*-
+
 import re
 
+from django.utils.encoding import smart_unicode
 from django.utils.html import escape
 from django.http import get_host
 
@@ -41,7 +44,7 @@ class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
 
     def prepare_authentication_request(self, request, redirect_to):
         if not redirect_to.startswith('http://') or redirect_to.startswith('https://'):
-		    redirect_to =  get_url_host(request) + redirect_to
+            redirect_to =  get_url_host(request) + redirect_to
 
         user_url = self.get_user_url(request)
 
@@ -78,9 +81,9 @@ class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
             axr = AXFetchRequest()
             for data_type, schema in ax_schema.items():
                 if isinstance(schema, tuple):
-                    axr.add(AttrInfo(schema[0], 1, True, schema[1]))
+                    axr.add(AttrInfo(schema[0], required=True, alias=schema[1]))
                 else:
-                    axr.add(AttrInfo(schema, 1, True, data_type))
+                    axr.add(AttrInfo(schema, required=True, alias=data_type))
 
             auth_request.addExtension(axr)
 
@@ -94,7 +97,7 @@ class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
         consumer = Consumer(request.session, OsqaOpenIDStore())
 
         query_dict = dict([
-            (k.encode('utf8'), v.encode('utf8')) for k, v in request.GET.items()
+            (smart_unicode(k), smart_unicode(v)) for k, v in request.GET.items()
         ])
 
         #for i in query_dict.items():
@@ -123,7 +126,7 @@ class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
             ax_schema = getattr(self, 'dataype2ax_schema', False)
 
             if ax_schema:
-                ax = AXFetchResponse.fromSuccessResponse(openid_response)
+                ax = AXFetchResponse.fromSuccessResponse(openid_response, False)
 
                 if ax:
                     axargs = ax.getExtensionArgs()
@@ -137,7 +140,8 @@ class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
 
                     for t, s in available_types.items():
                         if not t in consumer_data:
-                            consumer_data[t] = axargs["value.%s.1" % s]
+                            if axargs.get("value.%s.1" % s, None):
+                                consumer_data[t] = axargs["value.%s.1" % s]
                     
             request.session['auth_consumer_data'] = consumer_data