Changeset 37:34b9d044d0bf in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations

Timestamp:

Sep 26, 2012, 12:48:41 PM (13 years ago)

Author:

dwinter

Branch:

default

Message:

authorisation added
js / css aufgeraeumt

Location:

src/main/java/de/mpiwg/itgroup/annotations/restlet

Files:

• AnnotatorAnnotations.java (modified) (3 diffs)
• AnnotatorAnnotationsByTags.java (modified) (3 diffs)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java

@@ -56 +56 @@
         logger.debug("annotation-id=" + id);
 
+        
+        // do authentication
+        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
+        logger.debug("request authenticated=" + authUser);
+
         if (id == null) {
             
-            return getAllAnnotations();
-        }
-
-        // do authentication
-        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
-        logger.debug("request authenticated=" + authUser);
-
+            return getAllAnnotations(authUser);
+        }
+
+     
         AnnotationStore store = getAnnotationStore();
         Annotation annot = store.getAnnotationById(id);
@@ -83 +85 @@
     }
 
-    private Representation getAllAnnotations() {
+    private Representation getAllAnnotations(Person authUser) {
         
          Form form = getRequest().getResourceRef().getQueryAsForm();
@@ -98 +100 @@
         List<Annotation> annotations = store.getAnnotations(null, null);
         for (Annotation annotation : annotations) {
-                
+                 //check permission
+                         if (!annotation.isActionAllowed("read", authUser, store)) continue;
+     
                  JSONObject jo = createAnnotatorJson(annotation,false);
              results.add(jo);

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByTags.java

@@ -18 +18 @@
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.NS;
+import de.mpiwg.itgroup.annotations.Person;
 import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
@@ -38 +39 @@
         setCorsHeaders();
        
+        // do authentication
+        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
+        logger.debug("request authenticated=" + authUser);
+
+        
         String jsonId = (String) getRequest().getAttributes().get("id");
         
@@ -60 +66 @@
         
                 for (Annotation annot : annotations) {
-            JSONObject jo = createAnnotatorJson(annot,false);
+                        //check permission
+                        if (!annot.isActionAllowed("read", authUser, store)) continue;
+            
+                        JSONObject jo = createAnnotatorJson(annot,false);
             results.add(jo);
         }