first steps

Author: sirmmo

server/views.py

@@ -12,7 +12,7 @@
 from django.views.decorators.csrf import csrf_exempt
 #Get a DjangoidUser object, based on a delegate URI
 def getDjangoidUserFromIdentity(identity):
-        s = settings.BASE_URL[:-1] + (urlreverse("users.views.userpage", kwargs = {"uid": "@blah@"})[:-1].replace("@blah@", "(?P<uid>[^/]+)/"))
+        s = settings.BASE_URL[:-1] + (urlreverse("user_entrypoint", kwargs = {"uid": "@blah@"})[:-1].replace("@blah@", "(?P<uid>[^/]+)/"))
         print s
         _identityRe = re.compile(s)
         uid = _identityRe.match(identity).groupdict()["uid"]

urls.py

@@ -9,6 +9,8 @@
     url(r'^accept/$', 'users.views.accept'),
     url(r'^(?P<uid>[^/]+)/yadis/$', 'users.views.useryadis'),
     url(r'^(?P<uid>[^/]+)/foaf/$', 'users.views.userfoaf'),
-    url(r'^(?P<uid>[^/]+)/$', 'users.views.userpage'),
+
+    url(r'^(?P<uid>[^/]+)/profile$', 'users.views.userpage'),
+    url(r'^(?P<uid>[^/]+)/$', 'users.views.userpage_short', name="user_entrypoint"),
     url(r'^$', 'server.views.endpoint'),
 )

users/models.py

@@ -72,9 +72,9 @@ def get_name(self):
                                 return l
                         return f + " " + l
 
-        def get_attributes(self, public = False):
+        def get_attributes(self, public = False, area = "FOAF"):
                 attributes = {}
-                for a in UserAttribute.objects.filter(user = self, public = public):
+                for a in UserAttribute.objects.filter(user = self, public = public, foaf_name__not= None):
                         attributes[a.attribute.name] = a.value
                 return attributes
 
@@ -116,14 +116,27 @@ def createDJIDUser(sender, instance, **kwargs):
 #Identities can have attributes. These items represent one possible attribute.
 class IdentityAttribute(models.Model):
         name = models.CharField("Name", max_length = 128, help_text = "Internal name of the attribute.", primary_key = True)
+
+	ax_name = models.TextField(blank = True, null=True)
+	foaf_name = models.TextField(blank = True, null=True)
+	namespace = models.TextField(blank=True, null=True)
+
+	openid_attribute = models.BooleanField(default=False)
+	foaf_attribute = models.BooleanField(default=False)
+
         title = models.CharField("Title", max_length = 128, help_text = "Title of the attribute, as displayed to the user")
         description = models.TextField("Description", blank = True, help_text = "Longer description of the attribute, as displayed to the user")
+	protocol = models.TextField(null=True, blank=True)
         regex = models.CharField("Validation regex", max_length = 128, blank = True, help_text = "Regex the value of this field is validated upon on updates")
 
         def __str__(self):
                 return self.title
 
 
+
+
+
+
 #This maps an attribute to a user, including a value, obviously
 class UserAttribute(models.Model):
         user = models.ForeignKey(DjangoidUser, help_text = "DjangoidUser this attribute value belongs to")

users/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render_to_response
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseForbidden
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 from openid.server import server
@@ -32,13 +32,17 @@ def userpage_short(request, uid):
         return res
 @login_required
 def userpage(request, uid):
-        uid = User.objects.get(username = uid)
-        user = DjangoidUser.objects.get(djangouser = uid)
-        user.attributes = user.get_attributes(True)
-        mid = microid(user.get_user_page(), user.get_user_page())
-        res = render_to_response("users/userpage.html", {"server_url": settings.BASE_URL[:-1] + urlreverse("server.views.endpoint"), "user": user, "microid": mid})
-        res["X-XRDS-Location"] = user.get_yadis_uri()
-        return res
+	if request.user.username == uid:
+                uid = User.objects.get(username = uid)
+                user = DjangoidUser.objects.get(djangouser = uid)
+                user.attributes = user.get_attributes(True)
+                mid = microid(user.get_user_page(), user.get_user_page())
+                res = render_to_response("users/userpage.html", {"server_url": settings.BASE_URL[:-1] + urlreverse("server.views.endpoint"), "user": user, "microid": mid})
+                res["X-XRDS-Location"] = user.get_yadis_uri()
+                return res
+	else: 
+                #return only public data, but as a demo it still works
+		return HttpResponseForbidden()
 
 
 @csrf_exempt