Skip to content

Commit bc7b13d

Browse files
author
http://j3h.us/
committed
[project @ AX API: fromOpenIDRequest now takes a CheckIDRequest instead of a Message]
1 parent d3db4a6 commit bc7b13d

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

‎openid/extensions/ax.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,23 +267,24 @@ def getRequiredAttrs(self):
267267

268268
return required
269269

270-
def fromOpenIDRequest(cls, message):
270+
def fromOpenIDRequest(cls, openid_request):
271271
"""Extract a FetchRequest from an OpenID message
272272
273-
@param message: The OpenID message containing the attribute
274-
fetch request
275-
@type message: C{L{openid.message.Message}}
273+
@param openid_request: The OpenID authentication request
274+
containing the attribute fetch request
275+
@type message: C{L{openid.server.server.CheckIDRequest}}
276276
277277
@rtype: C{L{FetchRequest}}
278278
@returns: The FetchRequest extracted from the message
279279
280-
@raises KeyError: if the message is not consistent in its use
280+
@raises KeyError: if the AuthRequest is not consistent in its use
281281
of namespace aliases.
282282
283283
@raises AXError: When parseExtensionArgs would raise same.
284284
285285
@see: parseExtensionArgs
286286
"""
287+
message = openid_request.message
287288
ax_args = message.getArgs(cls.ns_uri)
288289
self = cls()
289290
self.parseExtensionArgs(ax_args)

‎openid/test/test_ax.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ class BogusAXMessage(ax.AXMessage):
1010

1111
getExtensionArgs = ax.AXMessage._newArgs
1212

13+
class DummyRequest(object):
14+
def __init__(self, message):
15+
self.message = message
1316

1417
class AXMessageTest(unittest.TestCase):
1518
def setUp(self):
@@ -349,10 +352,9 @@ def test_openidNoRealm(self):
349352
'ax.update_url': 'http://different.site/path',
350353
'ax.mode': 'fetch_request',
351354
})
352-
353355
self.failUnlessRaises(ax.AXError,
354356
ax.FetchRequest.fromOpenIDRequest,
355-
openid_req_msg)
357+
DummyRequest(openid_req_msg))
356358

357359
def test_openidUpdateURLVerificationError(self):
358360
openid_req_msg = Message.fromOpenIDArgs({
@@ -366,7 +368,7 @@ def test_openidUpdateURLVerificationError(self):
366368

367369
self.failUnlessRaises(ax.AXError,
368370
ax.FetchRequest.fromOpenIDRequest,
369-
openid_req_msg)
371+
DummyRequest(openid_req_msg))
370372

371373
def test_openidUpdateURLVerificationSuccess(self):
372374
openid_req_msg = Message.fromOpenIDArgs({
@@ -378,7 +380,7 @@ def test_openidUpdateURLVerificationSuccess(self):
378380
'ax.mode': 'fetch_request',
379381
})
380382

381-
fr = ax.FetchRequest.fromOpenIDRequest(openid_req_msg)
383+
fr = ax.FetchRequest.fromOpenIDRequest(DummyRequest(openid_req_msg))
382384

383385
def test_openidUpdateURLVerificationSuccessReturnTo(self):
384386
openid_req_msg = Message.fromOpenIDArgs({
@@ -390,7 +392,7 @@ def test_openidUpdateURLVerificationSuccessReturnTo(self):
390392
'ax.mode': 'fetch_request',
391393
})
392394

393-
fr = ax.FetchRequest.fromOpenIDRequest(openid_req_msg)
395+
fr = ax.FetchRequest.fromOpenIDRequest(DummyRequest(openid_req_msg))
394396

395397
class FetchResponseTest(unittest.TestCase):
396398
def setUp(self):

0 commit comments

Comments
 (0)