Revert "Fixed TPS UI system menu."

This reverts commit f979c3b436e9a12e8c71ba0abab5c892d375f945.

2 files changed, 2 insertions, 82 deletions

diff --git a/base/tps/src/org/dogtagpki/server/tps/TPSAccountService.java b/base/tps/src/org/dogtagpki/server/tps/TPSAccountService.java
deleted file mode 100644
index 73f3c5e3f..000000000
--- a/base/tps/src/org/dogtagpki/server/tps/TPSAccountService.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2016 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package org.dogtagpki.server.tps;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.apache.commons.lang.StringUtils;
-import org.dogtagpki.server.rest.AccountService;
-
-import com.netscape.certsrv.account.AccountInfo;
-import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.PKIException;
-
-/**
- * @author Endi S. Dewata
- */
-public class TPSAccountService extends AccountService {
-
-    IConfigStore configStore = CMS.getConfigStore();
-
-    @Override
-    public AccountInfo createAccountInfo() {
-
-        AccountInfo accountInfo = super.createAccountInfo();
-
-        try {
-            // determine accessible components based on roles
-            Collection<String> components = new HashSet<String>();
-
-            Collection<String> roles = accountInfo.getRoles();
-
-            if (roles.contains("Administrators")) {
-                String values = configStore.getString("target.configure.list", "");
-                if (!StringUtils.isEmpty(values)) {
-                    components.addAll(Arrays.asList(values.split(",")));
-                }
-
-                // admin always has access to general configuration and audit logging
-                components.add("Generals");
-                components.add("Audit_Logging");
-
-            }
-
-            if (roles.contains("TPS Agents")) {
-                String values = configStore.getString("target.agent_approve.list", "");
-                if (!StringUtils.isEmpty(values)) {
-                    components.addAll(Arrays.asList(values.split(",")));
-                }
-            }
-
-            accountInfo.setAttribute("components", StringUtils.join(components, ","));
-
-        } catch (EBaseException e) {
-            CMS.debug(e);
-            throw new PKIException(e);
-        }
-
-        return accountInfo;
-    }
-}
diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TPSApplication.java b/base/tps/src/org/dogtagpki/server/tps/rest/TPSApplication.java
index 09f5025f7..b63af8344 100644
--- a/base/tps/src/org/dogtagpki/server/tps/rest/TPSApplication.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/TPSApplication.java
@@ -23,6 +23,7 @@ import java.util.Set;
 import javax.ws.rs.core.Application;
 
 import org.dogtagpki.server.rest.ACLInterceptor;
+import org.dogtagpki.server.rest.AccountService;
 import org.dogtagpki.server.rest.AuditService;
 import org.dogtagpki.server.rest.AuthMethodInterceptor;
 import org.dogtagpki.server.rest.GroupService;
@@ -32,7 +33,6 @@ import org.dogtagpki.server.rest.SelfTestService;
 import org.dogtagpki.server.rest.SessionContextInterceptor;
 import org.dogtagpki.server.rest.SystemCertService;
 import org.dogtagpki.server.rest.UserService;
-import org.dogtagpki.server.tps.TPSAccountService;
 import org.dogtagpki.server.tps.config.ConfigService;
 
 /**
@@ -46,7 +46,7 @@ public class TPSApplication extends Application {
     public TPSApplication() {
 
         // account
-        classes.add(TPSAccountService.class);
+        classes.add(AccountService.class);
 
         // audit
         classes.add(AuditService.class);