Changeset 5972 for ComponentRegistry

Timestamp:

02/12/15 13:52:06 (9 years ago)

Author:

Twan Goosen

Message:

Added new GET method /authentication for retrieving current auth state

Location:

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• model/AuthenticationInfo.java (added)
• rest/ComponentRegistryRestService.java (modified) (3 diffs)

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -16 +16 @@
 import clarin.cmdi.componentregistry.impl.database.GroupService;
 import clarin.cmdi.componentregistry.impl.database.ValidationException;
+import clarin.cmdi.componentregistry.model.AuthenticationInfo;
 import clarin.cmdi.componentregistry.model.BaseDescription;
 import clarin.cmdi.componentregistry.model.Comment;
@@ -70 +71 @@
 import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.JAXBException;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import org.slf4j.Logger;
@@ -1996 +1999 @@
         }
     }
+
+    @GET
+    @Path("/authentication")
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+    @ApiOperation(value = "Information on the current authentication state")
+    public AuthenticationInfo getAuthenticationInformation() throws JSONException, AuthenticationRequiredException {
+        final Principal userPrincipal = security.getUserPrincipal();
+
+        if (userPrincipal == null) {
+            return new AuthenticationInfo(false);
+        } else {
+            return new AuthenticationInfo(getUserCredentials(userPrincipal));
+        }
+    }
 }