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',
+ #'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):
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
- #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)
+ for attr_name in attr_dic.keys():
+ s.requestField(field_name=attr_name, required=(k == "required"))
- #auth_request.addExtension(SRegRequest(required=['email']))
+ auth_request.addExtension(s)
- if request.session.get('force_email_request', True):
+ ax_schema = getattr(self, 'dataype2ax_schema', False)
+
+ if ax_schema and request.session.get('force_email_request', True):
axr = AXFetchRequest()
- for data_type, schema in self.dataype2ax_schema.items():
+ for data_type, schema in ax_schema.items():
if isinstance(schema, tuple):
axr.add(AttrInfo(schema[0], 1, True, schema[1]))
else:
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)
+ 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, False)
+
+ if ax:
axargs = ax.getExtensionArgs()
- ax_schema2data_type = dict([(s, t) for t, s in self.dataype2ax_schema.items()])
+ 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
])
- #available_data = dict([
- # (t, axargs["value.%s.1" % s]) for t, s in available_types.items()
- #])
-
- #print available_data
+ 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
- #email = ax.getExtensionArgs()['value.ext0.1']
- #username = ax.getExtensionArgs()['value.ext0.2']
-
- request.session['auth_consumer_data'] = {
- 'email': '',
- 'username': ''
- }
-
- except Exception, e:
- import sys, traceback
- traceback.print_exc(file=sys.stdout)
return request.GET['openid.identity']
elif openid_response.status == CANCEL: