Mercurial > hg > AnnotationManagerN4J
diff src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java @ 89:247cbbb385de
improved logging.
author | casties |
---|---|
date | Wed, 04 Feb 2015 19:37:02 +0100 |
parents | b406507a953d |
children | 475ab3d32630 |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java Tue Feb 03 19:01:27 2015 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java Wed Feb 04 19:37:02 2015 +0100 @@ -72,7 +72,7 @@ */ public abstract class AnnotatorResourceImpl extends ServerResource { - protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.toString()); + protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.getCanonicalName()); private AnnotationStore store; @@ -170,11 +170,12 @@ String authToken = requestHeaders.getFirstValue("x-annotator-auth-token", true); if (authToken == null) { if (!((BaseRestlet) getApplication()).isAuthorizationMode()) { + // no token, no-auth mode -> anonymous return Person.getAnonymous(); } + // no token, auth mode -> null return null; } - Person user = null; try { // decode token first to get consumer key JsonToken token = new JsonTokenParser(null, null).deserialize(authToken); @@ -197,7 +198,7 @@ JsonObject payload = token.getPayloadAsJsonObject(); // userId is mandatory String userId = payload.get("userId").getAsString(); - user = new Person(userId); + Person user = new Person(userId); // displayName is optional if (payload.has("displayName")) { user.name = payload.get("displayName").getAsString(); @@ -211,13 +212,12 @@ } user.groups = groups; } + logger.fine("auth OK! user=" + user); + return user; } catch (Exception e) { logger.warning("Error checking auth token: "+e.toString()); - return null; } - // must be ok then - logger.fine("auth OK! user=" + user); - return user; + return null; } /**