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

Timestamp:

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

Author:

dwinter

Branch:

default

Message:

authorisation added
js / css aufgeraeumt

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.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);