https://jira.scholarsportal.info/browse/DAT-532 CEGEP testing

scholarsportal · Sep 8, 2023 · 0bb1948 · 0bb1948
1 parent 18e02ba
commit 0bb1948
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 20 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -669,7 +669,6 @@ public String getAlias() {
     }
 
     public void setAlias(String alias) {
-        // jc set alias
         if(alias.equalsIgnoreCase("jonquiere") ||
                 alias.equalsIgnoreCase("montmorency") ||
                 alias.equalsIgnoreCase("levis") ||

diff --git a/src/main/java/edu/harvard/iq/dataverse/LoginPage.java b/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
@@ -174,15 +174,10 @@ public String login() {
 
         authReq.setIpAddress( dvRequestService.getDataverseRequest().getSourceAddress() );
         try {
-
-            logger.log(Level.FINE, "JC user redirectPage = {0}", redirectPage);
             AuthenticatedUser r = authSvc.getUpdateAuthenticatedUser(credentialsAuthProviderId, authReq);
-            logger.log(Level.FINE, "JC User authenticated: {0}", r.getEmail());
             session.setUser(r);
             String affiliation = r.getAffiliation();
-            logger.log(Level.FINE, "JC user affiliation = {0}", affiliation);
             String alias = affiliationBean.getAlias(affiliation);
-            logger.log(Level.FINE, "JC user alias = {0}", alias);
             Dataverse dv = dataverseService.findByAlias(alias);
             if (dv == null || !dv.isReleased()) {
                 alias = "";
@@ -198,16 +193,13 @@ public String login() {
                 redirectPage = redirectToRoot();
             }
 
-            logger.log(Level.FINE, "JC user redirectPage = {0}", redirectPage);
             try {            
                 redirectPage = URLDecoder.decode(redirectPage, "UTF-8");
             } catch (UnsupportedEncodingException ex) {
                 Logger.getLogger(LoginPage.class.getName()).log(Level.SEVERE, null, ex);
                 redirectPage = redirectToRoot();
             }
 
-            logger.log(Level.FINE, "JC user redirectPage = {0}", redirectPage);
-
             logger.log(Level.FINE, "Sending user to = {0}", redirectPage);
             return redirectPage + (!redirectPage.contains("?") ? "?" : "&") + "faces-redirect=true";
 

diff --git a/...rvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupServiceBean.java b/...rvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupServiceBean.java
@@ -63,11 +63,6 @@ public AffiliationGroup find(String userEmail) {
             topLevelDomain = domain;
         }
 
-        // JC - throws error because qc.ca gives multiple results
-        // cmontmorency.qc.ca , cdc.qc.ca , cmaisonneuve.qc.ca
-
-        // topleveldomain = qc.ca
-
         AffiliationGroup group = matchByTopLevelEmailDomain(topLevelDomain,domain);
 
         if (group != null) {

diff --git a/...du/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationServiceBean.java b/...du/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationServiceBean.java
@@ -66,10 +66,6 @@ public String getAlias(String userAffiliation) {
         while (enumeration.hasMoreElements()) {
             String next = enumeration.nextElement();
             String value = bundle.getString(next);
-
-            logger.log(Level.FINE, "JC next = {0}  ", next);
-            logger.log(Level.FINE, "JC value = {0}  ", value);
-
             if (value.equalsIgnoreCase(userAffiliation)) {
                 String alias = next.substring(next.indexOf(".") + 1);
                 if(alias.equalsIgnoreCase("jonquiere") ||
@@ -79,12 +75,10 @@ public String getAlias(String userAffiliation) {
                         alias.equalsIgnoreCase("maisonneuve")
                 )
                 {
-                    logger.log(Level.FINE, "JC getAlias = {0}", alias);
                     return "cegep";
                 }
                 else
                 {
-                    logger.log(Level.FINE, "JC getAlias = {0}", alias);
                     return alias;
                 }
             }