Changeset 88:b406507a953d in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java

Timestamp:

Feb 3, 2015, 6:01:27 PM (9 years ago)

Author:

casties

Branch:

default

Message:

upped version to 0.5.
can use display name and groups from auth token.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java (modified) (6 diffs)

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

@@ -1 @@
-/**
- * Implements the "annotations" uri of the Annotator API. see
- * <https://github.com/okfn/annotator/wiki/Storage>
- */
 package de.mpiwg.itgroup.annotations.restlet;
 
@@ -88 +84 @@
 
         // do authentication
-        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
+        Person authUser = getUserFromAuthToken(entity);
         logger.fine("request authenticated=" + authUser);
 
@@ -173 +169 @@
 
         // do authentication TODO: who's allowed to create?
-        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
+        Person authUser = getUserFromAuthToken(entity);
         logger.fine("request authenticated=" + authUser);
         if (authUser == null) {
@@ -190 +186 @@
             // make sure id is not set for POST
             jo.remove("id");
-            // get Annotation object from posted JSON
+            // create Annotation object from posted JSON
             annot = createAnnotation(jo, entity);
         } catch (IOException e1) {
@@ -231 +227 @@
 
         // do authentication
-        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
+        Person authUser = getUserFromAuthToken(entity);
         logger.fine("request authenticated=" + authUser);
 
@@ -294 +290 @@
 
         // do authentication
-        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
+        Person authUser = getUserFromAuthToken(entity);
         logger.fine("request authenticated=" + authUser);
         AnnotationStore store = getAnnotationStore();