Changeset 5973 for ComponentRegistry

Timestamp:

02/12/15 14:35:05 (9 years ago)

Author:

Twan Goosen

Message:

moved /authentication into separate resource (so now we have /rest/authentication)
added POST method, which only does a redirect to the front end but is configured to require authentication by means of the SHHAA configuration

Location:

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main

Files:

• java/clarin/cmdi/componentregistry/rest/AuthenticationRestService.java (added)
• java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (3 diffs)
• webapp/WEB-INF/shhaa.xml (modified) (1 diff)

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;
@@ -71 +70 @@
 import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.JAXBException;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import org.slf4j.Logger;
@@ -1999 +1996 @@
         }
     }
-
-    @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));
-        }
-    }
+    
 }

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/WEB-INF/shhaa.xml

@@ -35 +35 @@
         
         <authorization>
-            <location  target="/admin/*" />
+            <location target="/admin/*" />
+            <location target="/rest/authentication" methods="POST" />
         </authorization>