Shib: remove old debugging code #2916 #2939

IQSS · Mar 15, 2016 · 5c19ca0 · 5c19ca0
1 parent 7943bcc
commit 5c19ca0
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 67 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -265,31 +265,4 @@ public DvObject getDvObject() {
         }
 
     }
-
-    private Boolean debugShibboleth = null;
-
-    public boolean isDebugShibboleth() {
-        if (debugShibboleth != null) {
-            return debugShibboleth;
-        }
-        debugShibboleth = systemConfig.isDebugEnabled();
-        return debugShibboleth;
-    }
-
-    public List<String> getGroups(User user) {
-        List<String> groups = new ArrayList<>();
-        Set<Group> groupsForUser = groupService.groupsFor(user, null);
-        for (Group group : groupsForUser) {
-            groups.add(group.getDisplayName() + " (" + group.getIdentifier() + ")");
-        }
-        return groups;
-    }
-
-    public List<String> getPermissions(User user, Dataverse dataverse) {
-        List<String> permissions = new ArrayList<>();
-        for (Permission permission : permissionService.permissionsFor(user, dataverse)) {
-            permissions.add(permission.name());
-        }
-        return permissions;
-    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/Shib.java b/src/main/java/edu/harvard/iq/dataverse/Shib.java
@@ -227,23 +227,6 @@ public void init() {
         internalUserIdentifer = ShibUtil.generateFriendlyLookingUserIdentifer(usernameAssertion, emailAddress);
         logger.info("friendly looking identifer (backend will enforce uniqueness):" + internalUserIdentifer);
 
-        /**
-         * @todo Remove, longer term. For now, commenting out special logic for
-         * always showing Terms of Use for TestShib accounts. The Terms of Use
-         * workflow is captured at
-         * http://datascience.iq.harvard.edu/blog/try-out-single-sign-shibboleth-40-beta
-         */
-//        if (shibIdp.equals("https://idp.testshib.org/idp/shibboleth")) {
-//            StringBuilder sb = new StringBuilder();
-//            String freshNewShibUser = sb.append(userIdentifier).append(UUID.randomUUID()).toString();
-//            logger.info("Will create a new, unique user so the account Terms of Use will be displayed.");
-//            userIdentifier = freshNewShibUser;
-//        }
-        /**
-         * @todo Shouldn't we persist the displayName too? It still exists on
-         * the authenticateduser table.
-         */
-//        String displayName = getDisplayName(displayNameAttribute, firstNameAttribute, lastNameAttribute);
         String affiliation = shibService.getAffiliation(shibIdp, shibService.getDevShibAccountType());
         if (affiliation != null) {
             affiliationToDisplayAtConfirmation = affiliation;
@@ -270,15 +253,7 @@ public void init() {
         } else {
             state = State.PROMPT_TO_CREATE_NEW_ACCOUNT;
             displayNameToPersist = displayInfo.getTitle();
-//            firstNameToPersist = "foo";
-//            lastNameToPersist = "bar";
             emailToPersist = emailAddress;
-            /**
-             * @todo For Harvard at least, we plan to use "Harvard University"
-             * for affiliation because it's what we get from
-             * https://dataverse.harvard.edu/Shibboleth.sso/DiscoFeed
-             */
-//            affiliationToPersist = "FIXME";
             /**
              * @todo for Harvard we plan to use the value(s) from
              * eduPersonScopedAffiliation which

diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
@@ -96,8 +96,6 @@ public enum Key {
          * to from the footer.
          */
         ApplicationPrivacyPolicyUrl,
-        /** Expose debug information in the UI that users shouldn't normally see. */
-        Debug,
         /**
          * A boolean defining if indexing and search should respect the concept
          * of "permission root".

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
@@ -415,14 +415,6 @@ public boolean isShibEnabled() {
         return settingsService.isTrueForKey(SettingsServiceBean.Key.ShibEnabled, safeDefaultIfKeyNotFound);
     }
 
-    // TODO: 
-    // remove these method! 
-    // pages should be using settingsWrapper.isTrueForKey(":Debug", false) instead. -- 4.2.1
-    public boolean isDebugEnabled() {
-        boolean safeDefaultIfKeyNotFound = false;
-        return settingsService.isTrueForKey(SettingsServiceBean.Key.Debug, safeDefaultIfKeyNotFound);
-    }
-
     public boolean myDataDoesNotUsePermissionDocs() {
         boolean safeDefaultIfKeyNotFound = false;
         return settingsService.isTrueForKey(SettingsServiceBean.Key.MyDataDoesNotUseSolrPermissionDocs, safeDefaultIfKeyNotFound);

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
@@ -153,11 +153,6 @@
                 </div>
             </div>
         </nav>
-        <ui:fragment rendered="#{dataverseHeaderFragment.debugShibboleth}">
-          <h:outputText value="groups: #{dataverseHeaderFragment.getGroups(dataverseSession.user)}"/>
-          <br/>
-          <h:outputText value="permissions #{dataverseHeaderFragment.getPermissions(dataverseSession.user, dataverse)}"/>
-        </ui:fragment>
         <ui:param name="dataversePage" value="#{dataverseLinksStayOnPage == true ? '' : '/dataverse.xhtml' }"/>
 
         <!-- Header Panel -->