Skip to content

Commit fdaa3f9

Browse files
author
http://j3h.us/
committed
[project @ Remove hard-coded URLs from the Django example]
1 parent 6c377fb commit fdaa3f9

6 files changed

Lines changed: 29 additions & 37 deletions

File tree

‎examples/djopenid/consumer/views.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
from djopenid import util
3-
42
from django import http
53
from django.http import HttpResponseRedirect
64

75
from openid.consumer import consumer
86
from openid.consumer.discover import DiscoveryFailure
97
from openid import sreg
108

9+
from djopenid import util
10+
1111
def getOpenIDStore():
1212
"""
1313
Return an OpenID store object fit for the currently-chosen
@@ -64,8 +64,8 @@ def startOpenID(request):
6464

6565
# Compute the trust root and return URL values to build the
6666
# redirect information.
67-
trust_root = util.getTrustRoot(request)
68-
return_to = trust_root + 'consumer/finish/'
67+
trust_root = util.getViewURL(request, startOpenID)
68+
return_to = util.getViewURL(request, finishOpenID)
6969

7070
# Send the browser to the server either by sending a redirect
7171
# URL or by generating a POST form.

‎examples/djopenid/server/views.py‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import cgi
1919

2020
from djopenid import util
21+
from djopenid.util import getViewURL
2122

2223
from 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-
4136
def 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

6242
def 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
8668
def 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
10587
def 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,

‎examples/djopenid/templates/consumer/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</div>
7474
{% endif %}
7575

76-
<form method="post" action="/consumer/">
76+
<form method="post" action="{% url djopenid.consumer.views.startOpenID %}">
7777
<input type="text" size="40" name="openid_url" />
7878
<input type="submit" value="Begin" />
7979
</form>

‎examples/djopenid/templates/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</p>
1616

1717
<ul>
18-
<li><a href="/consumer/">Example Consumer (Relying Party)</a></li>
19-
<li><a href="/server/">Example Server (Identity Provider)</a></li>
18+
<li><a href="{% url djopenid.consumer.views.startOpenID %}">Example Consumer (Relying Party)</a></li>
19+
<li><a href="{% url djopenid.server.views.server %}">Example Server (Identity Provider)</a></li>
2020
</ul>
2121

2222
<p>

‎examples/djopenid/templates/server/trust.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
of your OpenID.
77

88
<div>
9-
<form method="post" action="/server/processTrustResult/">
9+
<form method="post"
10+
action="{% url djopenid.server.views.processTrustResult %}">
1011
{% if idSelect %}
1112
<p>
1213
Because you entered the server URL when authenticating, enter a

‎examples/djopenid/util.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
Utility code for the Django example consumer and server.
44
"""
55

6+
from urlparse import urljoin
7+
68
from django.db import connection
79
from django.template.context import RequestContext
810
from django.template import loader
911
from django import http
1012
from django.core.exceptions import ImproperlyConfigured
13+
from django.core.urlresolvers import reverse as reverseURL
1114

1215
from django.conf import settings
1316

@@ -115,7 +118,11 @@ def _responseWrapper(request, *args, **kwargs):
115118
return response_class(renderTemplate(request, template_name, response_data))
116119
return _responseWrapper
117120

118-
def getTrustRoot(req):
121+
def getViewURL(req, view_name_or_obj, args=None, kwargs=None):
122+
relative_url = reverseURL(view_name_or_obj, args=args, kwargs=kwargs)
123+
return urljoin(getBaseURL(req), relative_url)
124+
125+
def getBaseURL(req):
119126
"""
120127
Given a Django web request object, returns the OpenID 'trust root'
121128
for that request; namely, the absolute URL to the site root which

0 commit comments

Comments
 (0)