admin check moved to UserUtils. issue #2268

jlawyerorg · Jan 5, 2024 · a3be719 · a3be719
1 parent 4f5c68f
commit a3be719
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/SplashThread.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/SplashThread.java
@@ -678,6 +678,7 @@
 import com.jdimension.jlawyer.client.settings.UserSettings;
 import com.jdimension.jlawyer.client.utils.FrameUtils;
 import com.jdimension.jlawyer.client.utils.ThreadUtils;
+import com.jdimension.jlawyer.client.utils.UserUtils;
 import com.jdimension.jlawyer.client.utils.VersionUtils;
 import com.jdimension.jlawyer.persistence.AppOptionGroupBean;
 import com.jdimension.jlawyer.persistence.AppUserBean;
@@ -1065,9 +1066,7 @@ public void run() {
 
     private void openProfileInformationDialog() {
         try {
-            JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(settings.getLookupProperties());
-            boolean currentlyAdmin = locator.lookupSecurityServiceRemote().isAdmin();
-            if (currentlyAdmin) {
+            if (UserUtils.isCurrentUserAdmin()) {
                 ProfileDialog dlg = new ProfileDialog(EditorsRegistry.getInstance().getMainWindow(), true);
                 FrameUtils.centerDialog(dlg, EditorsRegistry.getInstance().getMainWindow());
                 dlg.setVisible(true);
@@ -1082,9 +1081,7 @@ private void openProfileInformationDialog() {
 
     private void openBackupConfigurationDialog() {
         try {
-            JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(settings.getLookupProperties());
-            boolean currentlyAdmin = locator.lookupSecurityServiceRemote().isAdmin();
-            if (currentlyAdmin) {
+            if (UserUtils.isCurrentUserAdmin()) {
                 BackupConfigurationDialog dlg = new BackupConfigurationDialog(EditorsRegistry.getInstance().getMainWindow(), true);
                 FrameUtils.centerDialog(dlg, EditorsRegistry.getInstance().getMainWindow());
                 dlg.setVisible(true);

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/DocumentsBinDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/DocumentsBinDialog.java
@@ -669,6 +669,7 @@ You should also get your employer (if you work as a programmer) or school,
 import com.jdimension.jlawyer.client.settings.ClientSettings;
 import com.jdimension.jlawyer.client.settings.ServerSettings;
 import com.jdimension.jlawyer.client.utils.FileUtils;
+import com.jdimension.jlawyer.client.utils.UserUtils;
 import com.jdimension.jlawyer.persistence.ArchiveFileDocumentsBean;
 import com.jdimension.jlawyer.services.ArchiveFileServiceRemote;
 import com.jdimension.jlawyer.services.JLawyerServiceLocator;
@@ -705,10 +706,7 @@ public DocumentsBinDialog(java.awt.Frame parent, boolean modal) {
 
 
         try {
-            ClientSettings settings = ClientSettings.getInstance();
-            JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(settings.getLookupProperties());
-            boolean currentlyAdmin = locator.lookupSecurityServiceRemote().isAdmin();
-            this.cmbRetentionDays.setEnabled(currentlyAdmin);
+            this.cmbRetentionDays.setEnabled(UserUtils.isCurrentUserAdmin());
 
         } catch (Throwable t) {
             log.error("Could not determine retention days for documents bin", t);

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/ServerMonitoringDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/ServerMonitoringDialog.java
@@ -665,6 +665,7 @@
 
 import com.jdimension.jlawyer.client.settings.ClientSettings;
 import com.jdimension.jlawyer.client.settings.ServerSettings;
+import com.jdimension.jlawyer.client.utils.UserUtils;
 import com.jdimension.jlawyer.server.services.MonitoringSnapshot;
 import com.jdimension.jlawyer.services.JLawyerServiceLocator;
 import java.awt.Color;
@@ -692,12 +693,10 @@ public ServerMonitoringDialog(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
         initComponents();
 
-        boolean currentlyAdmin = false;
+        boolean currentlyAdmin = UserUtils.isCurrentUserAdmin();
 
         ClientSettings settings = ClientSettings.getInstance();
         try {
-            JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(settings.getLookupProperties());
-            currentlyAdmin = locator.lookupSecurityServiceRemote().isAdmin();
             if (!currentlyAdmin) {
                 this.cmdSave.setEnabled(false);
                 this.cmbCpuError.setEnabled(false);

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/SystemMailboxDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/SystemMailboxDialog.java
@@ -665,6 +665,7 @@
 
 import com.jdimension.jlawyer.client.settings.ClientSettings;
 import com.jdimension.jlawyer.client.settings.ServerSettings;
+import com.jdimension.jlawyer.client.utils.UserUtils;
 import com.jdimension.jlawyer.server.services.MonitoringSnapshot;
 import com.jdimension.jlawyer.services.JLawyerServiceLocator;
 import com.jdimension.jlawyer.services.SystemManagementRemote;
@@ -692,13 +693,9 @@ public SystemMailboxDialog(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
         initComponents();
 
-        boolean currentlyAdmin = false;
-
         ClientSettings settings = ClientSettings.getInstance();
         try {
-            JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(settings.getLookupProperties());
-            currentlyAdmin = locator.lookupSecurityServiceRemote().isAdmin();
-            if (!currentlyAdmin) {
+            if (!UserUtils.isCurrentUserAdmin()) {
                 this.cmdSave.setEnabled(false);
                 this.cmdTestMail.setEnabled(false);
                 this.txtPassword.setEnabled(false);

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
@@ -6082,9 +6082,7 @@ private void cmbFormTypeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
     private void cmdFormsManagerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmdFormsManagerActionPerformed
         ClientSettings settings = ClientSettings.getInstance();
         try {
-            JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(settings.getLookupProperties());
-            boolean currentlyAdmin = locator.lookupSecurityServiceRemote().isAdmin();
-            if (currentlyAdmin) {
+            if (UserUtils.isCurrentUserAdmin()) {
                 FormsManagementDialog dlg = new FormsManagementDialog(EditorsRegistry.getInstance().getMainWindow(), true);
                 FrameUtils.centerDialog(dlg, EditorsRegistry.getInstance().getMainWindow());
                 dlg.setVisible(true);