OSQA-382, convert the python files line endings to OS native mode, propedit svn:eol...

[osqa.git] / forum_modules / openidauth / consumer.py

diff --git a/forum_modules/openidauth/consumer.py b/forum_modules/openidauth/consumer.py
index 680359681394a83d7bfe5060f4965abc87646028..6ed5b2b111e3545a1eac1d21cfb789c0b7c6d040 100644 (file)
--- a/forum_modules/openidauth/consumer.py
+++ b/forum_modules/openidauth/consumer.py
@@ -1,3 +1,5 @@
+import re
+

 from django.utils.html import escape
 from django.http import get_host
 
 from django.utils.html import escape
 from django.http import get_host
 


@@ -15,6 +17,22 @@ from store import OsqaOpenIDStore
 
 class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
 
 
 class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
 

+    dataype2ax_schema = {
+        'username': 'http://axschema.org/namePerson/friendly',
+        'email': 'http://axschema.org/contact/email',
+        #'web': 'http://axschema.org/contact/web/default',
+        #'firstname': 'http://axschema.org/namePerson/first',
+        #'lastname': 'http://axschema.org/namePerson/last',
+        #'birthdate': 'http://axschema.org/birthDate',
+    }
+
+    sreg_attributes = {
+        "required": {
+            "email": "email",
+            "nickname": "username"
+        }
+    }
+

     def get_user_url(self, request):
         try:
             return request.POST['openid_identifier']
     def get_user_url(self, request):
         try:
             return request.POST['openid_identifier']


@@ -39,30 +57,37 @@ class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
         except DiscoveryFailure:
             raise InvalidAuthentication(_('Sorry, but your input is not a valid OpenId'))
 
         except DiscoveryFailure:
             raise InvalidAuthentication(_('Sorry, but your input is not a valid OpenId'))
 

-        #sreg = getattr(settings, 'OPENID_SREG', False)
+        sreg = getattr(self, 'sreg_attributes', False)
+
+        if sreg:
+            s = SRegRequest()
+
+            for k, attr_dic in sreg.items():
+                if k == "policy_url":
+                    s.policy_url = attr_dic
+                    continue
+
+                for attr_name in attr_dic.keys():
+                    s.requestField(field_name=attr_name, required=(k == "required"))

 
 

-        #if sreg:
-        #    s = SRegRequest()
-        #    for sarg in sreg:
-        #        if sarg.lower().lstrip() == "policy_url":
-        #            s.policy_url = sreg[sarg]
-        #        else:
-        #            for v in sreg[sarg].split(','):
-        #                s.requestField(field_name=v.lower().lstrip(), required=(sarg.lower().lstrip() == "required"))
-        #    auth_request.addExtension(s)
+            auth_request.addExtension(s)

 
 

-        #auth_request.addExtension(SRegRequest(required=['email']))
+        ax_schema = getattr(self, 'dataype2ax_schema', False)

 
 

-        if request.session.get('force_email_request', True):
+        if ax_schema and request.session.get('force_email_request', True):

             axr = AXFetchRequest()
             axr = AXFetchRequest()

-            axr.add(AttrInfo("http://axschema.org/contact/email", 1, True, "email"))
+            for data_type, schema in ax_schema.items():
+                if isinstance(schema, tuple):
+                    axr.add(AttrInfo(schema[0], 1, True, schema[1]))
+                else:
+                    axr.add(AttrInfo(schema, 1, True, data_type))
+

             auth_request.addExtension(axr)
 
         trust_root = getattr(
             settings, 'OPENID_TRUST_ROOT', get_url_host(request) + '/'
         )
 
             auth_request.addExtension(axr)
 
         trust_root = getattr(
             settings, 'OPENID_TRUST_ROOT', get_url_host(request) + '/'
         )
 

-

         return auth_request.redirectURL(trust_root, redirect_to)
 
     def process_authentication_request(self, request):
         return auth_request.redirectURL(trust_root, redirect_to)
 
     def process_authentication_request(self, request):


@@ -73,19 +98,50 @@ class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
         ])
 
         #for i in query_dict.items():
         ])
 
         #for i in query_dict.items():

-        #    print "%s : %s" % i
+            #print "%s : %s" % i

 
         url = get_url_host(request) + request.path
         openid_response = consumer.complete(query_dict, url)
 
         if openid_response.status == SUCCESS:
 
         url = get_url_host(request) + request.path
         openid_response = consumer.complete(query_dict, url)
 
         if openid_response.status == SUCCESS:

-            if request.session.get('force_email_request', True):
-                try:
-                    ax = AXFetchResponse.fromSuccessResponse(openid_response)
-                    email = ax.getExtensionArgs()['value.ext0.1']
-                    request.session['auth_email_request'] = email
-                except Exception, e:
-                    pass
+
+            consumer_data = {}
+
+            sreg_attrs = getattr(self, 'sreg_attributes', False)
+
+            if sreg_attrs:
+                sreg_response = SRegResponse.fromSuccessResponse(openid_response)
+
+                if sreg_response:
+                    all_attrs = {}
+                    [all_attrs.update(d) for k,d in sreg_attrs.items() if k != "policy_url"]
+
+                    for attr_name, local_name in all_attrs.items():
+                        if attr_name in sreg_response:
+                            consumer_data[local_name] = sreg_response[attr_name]
+
+            ax_schema = getattr(self, 'dataype2ax_schema', False)
+
+            if ax_schema:
+                ax = AXFetchResponse.fromSuccessResponse(openid_response)
+
+                if ax:
+                    axargs = ax.getExtensionArgs()
+
+                    ax_schema2data_type = dict([(s, t) for t, s in ax_schema.items()])
+
+                    available_types = dict([
+                        (ax_schema2data_type[s], re.sub('^type\.', '', n))
+                        for n, s in axargs.items() if s in ax_schema2data_type
+                    ])
+
+                    for t, s in available_types.items():
+                        if not t in consumer_data:
+                            if axargs.get("value.%s.1" % s, None):
+                                consumer_data[t] = axargs["value.%s.1" % s]
+                    
+            request.session['auth_consumer_data'] = consumer_data
+

 
             return request.GET['openid.identity']
         elif openid_response.status == CANCEL:
 
             return request.GET['openid.identity']
         elif openid_response.status == CANCEL: