Skip to content

Commit 1e44189

Browse files
committed
private userpage
1 parent a91d976 commit 1e44189

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

Diff for: settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
)
8888

8989
BASE_URL = "http://openid.bantic.info/"
90-
90+
LOGIN_URL = "/login"
9191

9292
# A sample logging configuration. The only tangible logging
9393
# performed by this configuration is to send an email to
@@ -112,4 +112,4 @@
112112
}
113113
}
114114

115-
DEFAULT_CHARSET = "utf-8"
115+
DEFAULT_CHARSET = "utf-8"

Diff for: users/views.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from users.models import TrustedRoot, DjangoidUser, UserAttribute
99
from openidhandlers import convertToOpenIDRequest, checkYadisRequest, convertToHttpResponse
1010
from microidutils import microid
11-
11+
from django.contrib.auth.decorators import login_required
1212
from django.views.decorators.csrf import csrf_exempt
1313

1414
def useryadis(request, uid):
@@ -18,7 +18,7 @@ def useryadis(request, uid):
1818
res["Content-Type"] = mimetype
1919
return res
2020

21-
def userpage(request, uid):
21+
def userpage_short(request, uid):
2222
uid = User.objects.get(username = uid)
2323
#Check whether this is a YADIS request
2424
if checkYadisRequest(request):
@@ -30,6 +30,16 @@ def userpage(request, uid):
3030
res = render_to_response("users/userpage.html", {"server_url": settings.BASE_URL[:-1] + urlreverse("server.views.endpoint"), "user": user, "microid": mid})
3131
res["X-XRDS-Location"] = user.get_yadis_uri()
3232
return res
33+
@login_required
34+
def userpage(request, uid):
35+
uid = User.objects.get(username = uid)
36+
user = DjangoidUser.objects.get(djangouser = uid)
37+
user.attributes = user.get_attributes(True)
38+
mid = microid(user.get_user_page(), user.get_user_page())
39+
res = render_to_response("users/userpage.html", {"server_url": settings.BASE_URL[:-1] + urlreverse("server.views.endpoint"), "user": user, "microid": mid})
40+
res["X-XRDS-Location"] = user.get_yadis_uri()
41+
return res
42+
3343

3444
@csrf_exempt
3545
def accept(request):

0 commit comments

Comments
 (0)