2121from djopenid .util import getViewURL
2222
2323from django import http
24+ from django .views .generic .simple import direct_to_template
2425
2526from openid .server .server import Server , ProtocolError , CheckIDRequest , \
2627 EncodingError
@@ -56,44 +57,46 @@ def getRequest(request):
5657 """
5758 return request .session .get ('openid_request' )
5859
59- @util .sendResponse
6060def server (request ):
6161 """
6262 Respond to requests for the server's primary web page.
6363 """
64- return 'server/index.html' , {
65- 'user_url' : getViewURL (request , idPage ),
66- 'server_xrds_url' : getViewURL (request , idpXrds ),
67- }
64+ return direct_to_template (
65+ request ,
66+ 'server/index.html' ,
67+ {'user_url' : getViewURL (request , idPage ),
68+ 'server_xrds_url' : getViewURL (request , idpXrds ),
69+ })
6870
69- @util .sendResponse
7071def idpXrds (request ):
7172 """
7273 Respond to requests for the IDP's XRDS document, which is used in
7374 IDP-driven identifier selection.
7475 """
75- body = util .renderTemplate (request , 'server/xrds.html' ,
76- {'server_url' : getViewURL (request , endpoint )})
77- r = http .HttpResponse (body )
76+ r = direct_to_template (request , 'server/xrds.html' ,
77+ {'server_url' : getViewURL (request , endpoint )})
7878 r ['Content-Type' ] = 'application/xrds+xml'
7979 return r
8080
81- @util .sendResponse
8281def idPage (request ):
8382 """
8483 Serve the identity page for OpenID URLs.
8584 """
86- return 'server/idPage.html' , {'server_url' : getViewURL (request , endpoint )}
85+ return direct_to_template (
86+ request ,
87+ 'server/idPage.html' ,
88+ {'server_url' : getViewURL (request , endpoint )})
8789
88- @util .sendResponse
8990def trustPage (request ):
9091 """
9192 Display the trust page template, which allows the user to decide
9293 whether to approve the OpenID verification.
9394 """
94- return 'server/trust.html' , {'trust_handler_url' :getViewURL (request , processTrustResult )}
95+ return direct_to_template (
96+ request ,
97+ 'server/trust.html' ,
98+ {'trust_handler_url' :getViewURL (request , processTrustResult )})
9599
96- @util .sendResponse
97100def endpoint (request ):
98101 """
99102 Respond to low-level OpenID protocol messages.
@@ -108,12 +111,18 @@ def endpoint(request):
108111 openid_request = s .decodeRequest (query )
109112 except ProtocolError , why :
110113 # This means the incoming request was invalid.
111- return 'server/endpoint.html' , {'error' : str (why )}
114+ return direct_to_template (
115+ request ,
116+ 'server/endpoint.html' ,
117+ {'error' : str (why )})
112118
113119 # If we did not get a request, display text indicating that this
114120 # is an endpoint.
115121 if openid_request is None :
116- return 'server/endpoint.html' , {}
122+ return direct_to_template (
123+ request ,
124+ 'server/endpoint.html' ,
125+ {})
117126
118127 # We got a request; if the mode is checkid_*, we will handle it by
119128 # getting feedback from the user or by checking the session.
@@ -165,15 +174,17 @@ def showDecidePage(request, openid_request):
165174 except DiscoveryFailure , err :
166175 trust_root_valid = "DISCOVERY_FAILED"
167176
168- return 'server/trust.html' , {'idSelect' : idSelect ,
169- 'identity' : identity ,
170- 'trust_root' : trust_root ,
171- 'default_url' : default_url ,
172- 'trust_handler_url' :getViewURL (request , processTrustResult ),
173- 'trust_root_valid' : trust_root_valid ,
174- }
177+ return direct_to_template (
178+ request ,
179+ 'server/trust.html' ,
180+ {'idSelect' : idSelect ,
181+ 'identity' : identity ,
182+ 'trust_root' : trust_root ,
183+ 'default_url' : default_url ,
184+ 'trust_handler_url' :getViewURL (request , processTrustResult ),
185+ 'trust_root_valid' : trust_root_valid ,
186+ })
175187
176- @util .sendResponse
177188def processTrustResult (request ):
178189 """
179190 Handle the result of a trust decision and respond to the RP
@@ -241,7 +252,10 @@ def displayResponse(request, openid_response):
241252 except EncodingError , why :
242253 # If it couldn't be encoded, display an error.
243254 text = why .response .encodeToKVForm ()
244- return 'server/endpoint.html' , {'error' : cgi .escape (text )}
255+ return direct_to_template (
256+ request ,
257+ 'server/endpoint.html' ,
258+ {'error' : cgi .escape (text )})
245259
246260 # Construct the appropriate django framework response.
247261 r = http .HttpResponse (webresponse .body )
0 commit comments