Navigation

Changeset 17

Timestamp:

01/05/07 15:06:41 (5 years ago)

Author:

nicolast

Message:

Some URL resolving/reverse work

Files:

r16	r17
20	20	from django.shortcuts import render_to_response
21	21	from django.contrib.auth.views import redirect_to_login
	22	from django.core.urlresolvers import reverse as urlreverse
22	23	from django.contrib.auth.models import User as DjangoUser
23	24	from djangoid.users.models import DjangoidUser, ClaimedUri
…	…
30	31	# ^^^^^^^
31	32	#Watch the trailing /
32		_identityRe = re.compile(settings.BASE_URL ~~+ "(?P<uid>[^/]+)/$"~~)
	33	_identityRe = re.compile(settings.BASE_URL[:-1] + (urlreverse("djangoid.users.views.userpage", kwargs = {"uid": "@blah@"})[:-1].replace("@blah@", "(?P<uid>[^/]+)/$")))
33	34
34	35	#Get a DjangoidUser object, based on a delegate URI
…	…
94	95	#A server YADIS document is requested. I don't think this is widely used yet, but well... Let's just return it.
95	96	def serveryadis(request):
96		res = render_to_response("server/yadis.xrds", {"server_url": settings.BASE_URL})
	97	res = render_to_response("server/yadis.xrds", {"server_url": settings.BASE_URL[:-1] + urlreverse("djangoid.server.views.endpoint")})
97	98	res["Content-Type"] = "application/xrds+xml; charset=%s" % settings.DEFAULT_CHARSET
98	99	return res

r16	r17
2	2	<head>
3	3	<link rel="openid.server" href="{{ server_url }}" />
4		<link rel="openid.delegate" href="{{ ~~server_url}}{{ user.djangouser~~ }}/" />
5		<meta http-equiv="x-xrds-location" content="{{ ~~server_url }}{{ user.djangouser }}/yadis/~~" />
	4	<link rel="openid.delegate" href="{{ user.get_user_page }}/" />
	5	<meta http-equiv="x-xrds-location" content="{{ user.get_yadis_uri }}" />
6	6	<meta name="microid" content="{{ microid }}" />
7	7	</head>

r15	r17
19	19	from django.contrib.auth.models import User
20	20	from django.conf import settings
	21	from django.core.urlresolvers import reverse as urlreverse
21	22	import datetime
22	23	from djangoid.microidutils import microid, find_microid
…	…
54	55
55	56	def get_user_page(self):
56		return settings.BASE_URL + self.djangouser + "/"
	57	#Strip of last / from BASE_URL
	58	return settings.BASE_URL[:-1] + urlreverse("djangoid.users.views.userpage", kwargs = {"uid": self.djangouser})
	59
	60	def get_yadis_uri(self):
	61	return settings.BASE_URL[:-1] + urlreverse("djangoid.users.views.useryadis", kwargs = {"uid": self.djangouser})
57	62
58	63	class Admin:
…	…
101	106	user = models.ForeignKey(DjangoidUser)
102	107	uri = models.URLField()
	108	description = models.CharField(maxlength = 128, blank = True)
103	109	last_checked = models.DateTimeField(default = datetime.datetime(2006, 1, 1))
104	110	is_valid = models.BooleanField(default = False)

r16	r17
19	19	from django.http import HttpResponse
20	20	from django.conf import settings
	21	from django.core.urlresolvers import reverse as urlreverse
21	22	from openid.server import server
22	23
…	…
27	28
28	29	def useryadis(request, uid):
29		res = render_to_response("users/yadis.xrds", {"server_url": settings.BASE_URL, "uid": uid})
	30	res = render_to_response("users/yadis.xrds", {"server_url": settings.BASE_URL[:-1] + urlreverse("djangoid.server.views.endpoint"), "uid": uid})
30	31	mimetype = "application/xrds+xml; charset=%s" % settings.DEFAULT_CHARSET
31	32	res["Content-Type"] = mimetype
…	…
39	40	user = DjangoidUser.objects.get(djangouser = uid)
40	41	mid = microid(user.get_user_page(), user.get_user_page())
41		res = render_to_response("users/userpage.html", {"server_url": settings.BASE_URL, "user": user, "microid": mid})
42		res["X-XRDS-Location"] = ~~settings.BASE_URL + uid + "/yadis/"~~
	42	res = render_to_response("users/userpage.html", {"server_url": settings.BASE_URL[:-1] + urlreverse("djangoid.server.views.endpoint"), "user": user, "microid": mid})
	43	res["X-XRDS-Location"] = user.get_yadis_uri()
43	44	return res
44	45