Mercurial > hg > AnnotationManagerN4J
comparison src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByResources.java @ 88:b406507a953d
upped version to 0.5.
can use display name and groups from auth token.
author | casties |
---|---|
date | Tue, 03 Feb 2015 19:01:27 +0100 |
parents | 25eb2e1df106 |
children | cf44d9e1a4a7 |
comparison
equal
deleted
inserted
replaced
87:2beafb8e19e4 | 88:b406507a953d |
---|---|
57 public Representation doGetJSON(Representation entity) { | 57 public Representation doGetJSON(Representation entity) { |
58 logger.fine("AnnotatorAnnotatonsByResource doGetJSON!"); | 58 logger.fine("AnnotatorAnnotatonsByResource doGetJSON!"); |
59 setCorsHeaders(); | 59 setCorsHeaders(); |
60 | 60 |
61 // do authentication | 61 // do authentication |
62 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); | 62 Person authUser = getUserFromAuthToken(entity); |
63 logger.fine("request authenticated=" + authUser); | 63 logger.fine("request authenticated=" + authUser); |
64 | 64 |
65 String id = null; | 65 String id = null; |
66 String jsonId = (String) getRequest().getAttributes().get("id"); | 66 String jsonId = (String) getRequest().getAttributes().get("id"); |
67 if (jsonId != null) { | 67 if (jsonId != null) { |