Changeset 5266 for DASISH


Ignore:
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.

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml

    r5203 r5266  
    363363        <netbeans.hint.license>gpl20</netbeans.hint.license> 
    364364        <plugin.license.copyrightYear>2013</plugin.license.copyrightYear>
    365         <project.version>1.4</project.version>
     365        <project.version>1.4.1</project.version>
    366366        <shibboleth.version>1.0.4</shibboleth.version>
    367367    </properties>

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java

    r5174 r5266  
    9898    }
    9999
    100     public static String welcomeString(String baseUri) {
     100    public static String welcomeString(String baseUri, String remoteID) {
    101101        String welcome = "<!DOCTYPE html><body>"
    102                 + "You are logged in.<br>"
     102                + "You are logged in as "
     103                + remoteID + ".<br>"
    103104                + "<h3>Welcome to DASISH Webannotator (DWAN)</h3><br>"
    104105                + "<a href=\"" + baseUri + "\"> To DWAN's test jsp page</a>"

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

    r5088 r5266  
    1919
    2020import eu.dasish.annotation.backend.Helpers;
     21import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.schema.ObjectFactory;
    2223import eu.dasish.annotation.schema.Principal;
    … …  
    4142public class AutheticationResource extends ResourceResource {
    4243
    43  
    44 
    4544    @GET
    4645    @Produces(MediaType.TEXT_XML)
    … …  
    6463    @Transactional(readOnly = true)
    6564    public String login() {
    66         return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..");
     65        try {
     66            Number principalID = this.getPrincipalID();
     67            String remoteID = dbDispatcher.getPrincipalRemoteID(principalID);
     68            return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", remoteID);
     69        } catch (IOException e) {
     70            return e.getMessage();
     71        }
    6772    }
    6873
    … …  
    7378    public void logout() throws IOException, ServletException {
    7479        httpServletRequest.getSession().invalidate();
    75         httpServletResponse.sendRedirect(context.getInitParameter("eu.dasish.annotation.backend.logout"));
     80        httpServletResponse.sendRedirect(uriInfo.getBaseUri().toString() + ".."+context.getInitParameter("eu.dasish.annotation.backend.logout"));
    7681    }
    77    
    78    
    7982}

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

    r5186 r5266  
    311311    public JAXBElement<Principal> updatePrincipalFromForm(@FormParam("name") String name, @FormParam("email") String email)
    312312            throws IOException {
    313 
     313       
    314314        Principal newPrincipal = new Principal();
    315315        newPrincipal.setDisplayName(name);
    … …  
    326326        public Principal apply(Map params) throws NotInDataBaseException {
    327327            Principal principal = (Principal) params.get("newPrincipal");
     328            Number principalID = (Number) params.get("principalID");
     329            String principalURI = dbDispatcher.getResourceURI(principalID, Resource.PRINCIPAL);
     330            principal.setURI(principalURI);
    328331            Number principalIDupd = dbDispatcher.updatePrincipal(principal);           
    329332            return dbDispatcher.getPrincipal(principalIDupd);

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

    r5088 r5266  
    6262        String remotePrincipal = httpServletRequest.getRemoteUser();
    6363        if (remotePrincipal != null) {
    64             if (!remotePrincipal.equals("anonymous")) {
     64            if (!remotePrincipal.equals(anonym)) {
    6565                try {
    6666                    return dbDispatcher.getPrincipalInternalIDFromRemoteID(remotePrincipal);
    6767                } catch (NotInDataBaseException e) {
    6868                    loggerServer.info(e.toString());
    69                     loggerServer.info("The record for the user with the Shibboleth id " + remotePrincipal + " will be generated now automatically.");
     69                    loggerServer.info("The record for the user with the id " + remotePrincipal + " will be generated now automatically.");
    7070                    try {
    7171                        try {

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

    r4969 r5266  
    3636    @Produces(MediaType.TEXT_HTML)
    3737    @Path("")
    38     public String login() {
    39         return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..");
     38    public String status() {
     39        String remotePrincipal= httpServletRequest.getRemoteUser();
     40        if (remotePrincipal != null) {
     41        return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..",remotePrincipal);
     42        }
     43        else {
     44           return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", "null-principal");
     45        }
    4046    }
    4147}

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml

    r5203 r5266  
    4747        <param-name>eu.dasish.annotation.backend.logout</param-name>
    4848<!--        <param-value>/ds/webannotator?shhaaDo=lO</param-value>-->
    49         <param-value>/ds/webannotator/j_spring_security_logout</param-value>
    50  <!--       <param-value>/annotator-backend/j_spring_security_logout</param-value> -->
     49<!--        <param-value>/ds/webannotatornonshibb/j_spring_security_logout</param-value>-->
     50<!--        <param-value>/ds/webannotator-basic/j_spring_security_logout</param-value>-->       
     51        <param-value>/j_spring_security_logout</param-value>
    5152    </context-param>
    5253   

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp

    r5139 r5266  
    2424        <p><a href="https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI">https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI</a></p>
    2525        <br>
    26         <h3>You are not necessarily logged in.</h3>
     26        <h3>Services for which you do not need to be logged-in</h3>
    2727        <br>
    2828        <a href="registerNonShibbolethPrincipal.html"> Register a non-shibboleth user</a> <br>
    2929        <br>
    3030        <a href="registerShibbolethPrincipal.html"> Register a shibboleth user</a> <br>
    31         <br>
     31<!--        <br>
    3232        <a href="registerShibbolethAlsoAsNonShibboleth.html"> Register an existing  shibboleth user as a non-shibboleth as well.</a> <br>
    33         <br>
     33        <br>-->
    3434        <br>
    3535        <a href="api/authentication/login"> login  </a> <br>
    … …  
    3737         
    3838        <br>
    39         <h3>You are logged in. </h3>
     39        <h3>Services for which you need to be logged in</h3>
    4040        <br>
    4141        <a href="api/authentication/logout"> logout</a> <br>
    … …  
    4949        GET <a href="api/principals/admin">api/principals/admin</a><br>
    5050        GET <a href="api/principals/00000000-0000-0000-0000-0000000000112">api/principals/00000000-0000-0000-0000-0000000000112</a> <br>
    51         GET <a href="api/principals/00000000-0000-0000-0000-0000000000112/current">api/principals/00000000-0000-0000-0000-0000000000112/current</a>  !Problem: how to ask the servlet if the given user is logged in, may be by some other running somewhere client<br>
     51        GET <a href="api/principals/00000000-0000-0000-0000-0000000000112/current">api/principals/00000000-0000-0000-0000-0000000000112/current</a><br> 
     52<!--        !Problem: how to ask the servlet if the given user is logged in, may be by some other running somewhere client<br> -->
    5253        GET <a href="api/principals/info?email=Twan.Goosen@mpi.nl">api/principals/info?email=Twan.Goosen@mpi.nl</a>  <br>
    5354        GET <a href="api/annotations?link=Sagrada_Fam%C3%ADlia">api/annotations?link=Sagrada_Fam%C3%ADlia</a>  <br>
    5455        GET <a href="api/annotations?link=Antoni_Gaud%C3%AD">api/annotations?link=Antoni_Gaud%C3%AD</a>  <br>
    55         GET <a href="api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186">api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186</a>
    56         !Comment: What is "namespace" query parameter? Must be implemented and tested <br>
     56        GET <a href="api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186">api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186</a><br>
     57<!--        !Comment: What is "namespace" query parameter? Must be implemented and tested <br>-->
    5758        GET <a href="api/annotations/00000000-0000-0000-0000-000000000022">api/annotations/00000000-0000-0000-0000-000000000022</a>  </br>
    5859        GET <a href="api/annotations/00000000-0000-0000-0000-000000000022/targets">api/annotations/00000000-0000-0000-0000-000000000022/targets</a>  </br>
    … …  
    6061        GET <a href="api/targets/00000000-0000-0000-0000-000000000032">api/targets/00000000-0000-0000-0000-000000000032</a>  <br>
    6162        GET <a href="api/targets/00000000-0000-0000-0000-000000000032/versions">api/targets/00000000-0000-0000-0000-000000000032/versions</a>   <br>
    62         GET <a href="api/cached/00000000-0000-0000-0000-000000000051/metadata">api/cached/00000000-0000-0000-0000-000000000051/metadata</a><br>
     63        GET <a href="api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/metadata">api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/metadata</a><br>
     64        GET <a href="api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/stream">api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/stream</a><br>
    6365        GET <a href="api/cached/00000000-0000-0000-0000-000000000051/content">api/cached/00000000-0000-0000-0000-000000000051/content</a><br>
    64         GET <a href="api/cached/00000000-0000-0000-0000-000000000511/stream">api/cached/00000000-0000-0000-0000-000000000511/stream</a>
     66       
    6567       
    6668        <br>

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/logout.jsp

    r5014 r5266  
    2525    <body>
    2626     You are logged out.<br>
    27      <a href="api/.."> To DWAN's main test page.</a>
     27     <a href="api/.."> To DWAN's jsp test page.</a>
    2828    </body>
    2929</html>
Note: See TracChangeset for help on using the changeset viewer.