Changeset 5266 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java

Timestamp:

05/22/14 14:22:49 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Fixing automatic generation of a shibbolized user record and fixing update principals (both bugs appeared after refactoring). Fixing dynamic logout link. Fixing jsp page.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified) (4 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.Helpers;
+import eu.dasish.annotation.backend.NotInDataBaseException;
 import eu.dasish.annotation.schema.ObjectFactory;
 import eu.dasish.annotation.schema.Principal;
@@ -41 +42 @@
 public class AutheticationResource extends ResourceResource {
 
-  
-
     @GET
     @Produces(MediaType.TEXT_XML)
@@ -64 +63 @@
     @Transactional(readOnly = true)
     public String login() {
-        return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..");
+        try {
+            Number principalID = this.getPrincipalID();
+            String remoteID = dbDispatcher.getPrincipalRemoteID(principalID);
+            return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", remoteID);
+        } catch (IOException e) {
+            return e.getMessage();
+        }
     }
 
@@ -73 +78 @@
     public void logout() throws IOException, ServletException {
         httpServletRequest.getSession().invalidate();
-        httpServletResponse.sendRedirect(context.getInitParameter("eu.dasish.annotation.backend.logout"));
+        httpServletResponse.sendRedirect(uriInfo.getBaseUri().toString() + ".."+context.getInitParameter("eu.dasish.annotation.backend.logout"));
     }
-    
-   
 }