1818import cgi
1919
2020from djopenid import util
21+ from djopenid .util import getViewURL
2122
2223from django import http
2324
@@ -32,32 +33,11 @@ def getOpenIDStore():
3233 """
3334 return util .getOpenIDStore ('/tmp/djopenid_s_store' , 's_' )
3435
35- def getServerURL (request ):
36- """
37- Get the OpenID endpoint URL for this application.
38- """
39- return util .getTrustRoot (request ) + "server/endpoint/"
40-
4136def getServer (request ):
4237 """
4338 Get a Server object to perform OpenID authentication.
4439 """
45- return Server (getOpenIDStore (), getServerURL (request ))
46-
47- def getUserURL (request , name = None ):
48- """
49- Return the URL of the OpenID that this application serves.
50- """
51- if name :
52- return util .getTrustRoot (request ) + "server/id/%s/" % (name ,)
53- else :
54- return util .getTrustRoot (request ) + "server/user/"
55-
56- def getIdpXRDSURL (request ):
57- """
58- Return the URL to the server's XRDS URL.
59- """
60- return util .getTrustRoot (request ) + "server/xrds/"
40+ return Server (getOpenIDStore (), getViewURL (request , endpoint ))
6141
6242def setRequest (request , openid_request ):
6343 """
@@ -79,8 +59,10 @@ def server(request):
7959 """
8060 Respond to requests for the server's primary web page.
8161 """
82- return 'server/index.html' , {'user_url' : getUserURL (request ),
83- 'server_xrds_url' : getIdpXRDSURL (request )}
62+ return 'server/index.html' , {
63+ 'user_url' : getViewURL (request , idPage ),
64+ 'server_xrds_url' : getViewURL (request , idpXrds ),
65+ }
8466
8567@util .sendResponse
8668def idpXrds (request ):
@@ -89,7 +71,7 @@ def idpXrds(request):
8971 IDP-driven identifier selection.
9072 """
9173 body = util .renderTemplate (request , 'server/xrds.html' ,
92- {'server_url' : getServerURL (request )})
74+ {'server_url' : getViewURL (request , endpoint )})
9375 r = http .HttpResponse (body )
9476 r ['Content-Type' ] = 'application/xrds+xml'
9577 return r
@@ -99,7 +81,7 @@ def idPage(request):
9981 """
10082 Serve the identity page for OpenID URLs.
10183 """
102- return 'server/idPage.html' , {'server_url' : getServerURL (request )}
84+ return 'server/idPage.html' , {'server_url' : getViewURL (request , endpoint )}
10385
10486@util .sendResponse
10587def trustPage (request ):
@@ -169,7 +151,7 @@ def showDecidePage(request, openid_request):
169151 idSelect = openid_request .idSelect ()
170152 identity = openid_request .identity
171153 trust_root = openid_request .trust_root
172- default_url = getUserURL (request )
154+ default_url = getViewURL (request , idPage )
173155
174156 return 'server/trust.html' , {'idSelect' : idSelect ,
175157 'identity' : identity ,
@@ -201,7 +183,9 @@ def processTrustResult(request):
201183 # (i.e., the IDP URL was entered at the RP), look at the form to
202184 # find out what identity URL the user wanted to send.
203185 if openid_request .idSelect ():
204- response_identity = getUserURL (request , name = request .POST ['name' ])
186+ response_identity = getViewURL (
187+ request ,
188+ idPage , kwargs = {'name' :request .POST ['name' ]})
205189
206190 # Generate a response with the appropriate answer.
207191 openid_response = openid_request .answer (result ,
0 commit comments