changeset 3214:ff32c72b9b79

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 07 Mar 2008 14:45:42 +0100
parents 6162f334bd5a (current diff) 5c5dbfafea66 (diff)
children f12af017cfd1
files MoinMoin/action/serveopenid.py
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/serveopenid.py	Fri Mar 07 14:45:05 2008 +0100
+++ b/MoinMoin/action/serveopenid.py	Fri Mar 07 14:45:42 2008 +0100
@@ -297,14 +297,17 @@
         dummyidentity, server_url = self._make_identity()
         return self.approved(identity, openidreq, server_url=server_url)
 
-    def approved(self, identity, openidreq, data=False, server_url=None):
+    def approved(self, identity, openidreq, server_url=None):
+        # TODO: If simple registration is implemented, this needs
+        #       to do something like the following:
+        #
+        #       sreg_data = { fill this dict with real values }
+        #       sreq_req = sreg.SRegRequest.fromOpenIDRequest(openidreq.message)
+        #       # do something with the request to see what values are required?
+        #       sreg_resp = sreg.SRegResponse.extractResponse(openidreq, sreg_data)
+        #       sreg_resp.addToOpenIDResponse(reply.fields)
+
         reply = openidreq.answer(True, identity=identity, server_url=server_url)
-        if data:
-            # TODO
-            sreg_data = {}
-            sreq_req = sreg.SRegRequest.fromOpenIDRequest(openidreq.message)
-            sreg_resp = sreg.SRegResponse.extractResponse(openidreq, sreg_data)
-            sreg_resp.addToOpenIDResponse(reply.fields)
         return reply
 
     def user_trusts_url(self, trustroot):