From 029846bda2c53d117c09953ea0d02323eb29e5ae Mon Sep 17 00:00:00 2001 From: John Woodlock Date: Wed, 9 Jan 2013 15:19:30 +0000 Subject: [PATCH] remove super_user permission checks as they have been deleted (except for reporting_super_user) --- .../GLAccountWritePlatformService.java | 6 +- .../GLClosureWritePlatformService.java | 6 +- .../GLJournalEntryWritePlatformService.java | 4 +- .../service/DocumentWritePlatformService.java | 6 +- .../service/ClientWritePlatformService.java | 6 +- .../service/GroupWritePlatformService.java | 6 +- .../GuarantorWritePlatformService.java | 6 +- .../SavingAccountWritePlatformService.java | 4 +- .../SavingProductWritePlatformService.java | 6 +- .../DepositAccountWritePlatformService.java | 24 +++---- .../DepositProductWritePlatformService.java | 6 +- .../useradministration/domain/AppUser.java | 63 +++---------------- 12 files changed, 47 insertions(+), 96 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLAccountWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLAccountWritePlatformService.java index 0799e18e3..67e659ee5 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLAccountWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLAccountWritePlatformService.java @@ -5,13 +5,13 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface GLAccountWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'CREATE_GL_ACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_GL_ACCOUNT')") Long createGLAccount(GLAccountCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'UPDATE_GL_ACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_GL_ACCOUNT')") Long updateGLAccount(Long glAccountId, GLAccountCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'DELETE_GL_ACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_GL_ACCOUNT')") Long deleteGLAccount(Long glAccountId); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLClosureWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLClosureWritePlatformService.java index a3ddef648..7912b063f 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLClosureWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLClosureWritePlatformService.java @@ -5,13 +5,13 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface GLClosureWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'CREATE_GL_CLOSURE')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_GL_CLOSURE')") Long createGLClosure(GLClosureCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'UPDATE_GL_CLOSURE')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_GL_CLOSURE')") Long updateGLClosure(Long glClosureId, GLClosureCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'DELETE_GL_CLOSURE')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_GL_CLOSURE')") Long deleteGLClosure(Long glClosureId); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLJournalEntryWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLJournalEntryWritePlatformService.java index 4194f54c6..ae96bc04a 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLJournalEntryWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/service/GLJournalEntryWritePlatformService.java @@ -5,10 +5,10 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface GLJournalEntryWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'CREATE_JOURNAL_ENTRY')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_JOURNAL_ENTRY')") String createJournalEntry(GLJournalEntryCommand journalEntryCommand); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'REVERT_JOURNAL_ENTRY')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'REVERT_JOURNAL_ENTRY')") String revertJournalEntry(String transactionId); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/DocumentWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/DocumentWritePlatformService.java index 371e37a67..6091cfc8e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/DocumentWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/DocumentWritePlatformService.java @@ -8,13 +8,13 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface DocumentWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'CREATE_m_guarantor_external')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_m_guarantor_external')") Long createDocument(DocumentCommand documentCommand, InputStream inputStream); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'UPDATE_m_guarantor_external')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_m_guarantor_external')") CommandProcessingResult updateDocument(DocumentCommand documentCommand, InputStream inputStream); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'DELETE_m_guarantor_external')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_m_guarantor_external')") CommandProcessingResult deleteDocument(DocumentCommand documentCommand); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformService.java index 3aa44b907..e35ae98ff 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformService.java @@ -15,13 +15,13 @@ public interface ClientWritePlatformService { CommandProcessingResult deleteClient(Long clientId); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'CREATE_CLIENTIMAGE')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_CLIENTIMAGE')") CommandProcessingResult saveOrUpdateClientImage(Long clientId, String imageName, InputStream inputStream); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'CREATE_CLIENTIMAGE')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_CLIENTIMAGE')") CommandProcessingResult saveOrUpdateClientImage(Long clientId, Base64EncodedImage encodedImage); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'DELETE_CLIENTIMAGE')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_CLIENTIMAGE')") CommandProcessingResult deleteClientImage(Long clientId); CommandProcessingResult addClientNote(Long clientId, JsonCommand command); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupWritePlatformService.java index 8954c7812..957607d1b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupWritePlatformService.java @@ -6,13 +6,13 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface GroupWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'CREATE_GROUP')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_GROUP')") CommandProcessingResult createGroup(GroupCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'UPDATE_GROUP')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_GROUP')") CommandProcessingResult updateGroup(GroupCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'DELETE_GROUP')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_GROUP')") CommandProcessingResult deleteGroup(Long groupId); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformService.java index 8f5c64f76..098e09ade 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformService.java @@ -5,13 +5,13 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface GuarantorWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS','PORTFOLIO_MANAGEMENT_SUPER_USER')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS')") void createGuarantor(final Long loanId, final GuarantorCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS','PORTFOLIO_MANAGEMENT_SUPER_USER')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS')") void updateGuarantor(final Long loanId, final GuarantorCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS','PORTFOLIO_MANAGEMENT_SUPER_USER')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS')") void removeGuarantor(final Long loanId); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccount/service/SavingAccountWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccount/service/SavingAccountWritePlatformService.java index d80890007..1f5b46209 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccount/service/SavingAccountWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccount/service/SavingAccountWritePlatformService.java @@ -6,9 +6,9 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface SavingAccountWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'CREATE_SAVINGSACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_SAVINGSACCOUNT')") CommandProcessingResult createSavingAccount(SavingAccountCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'UPDATE_SAVINGSACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_SAVINGSACCOUNT')") CommandProcessingResult updateSavingAccount(SavingAccountCommand command); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccountproduct/service/SavingProductWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccountproduct/service/SavingProductWritePlatformService.java index d9732c286..a5d09245b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccountproduct/service/SavingProductWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsaccountproduct/service/SavingProductWritePlatformService.java @@ -6,12 +6,12 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface SavingProductWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'CREATE_SAVINGSPRODUCT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_SAVINGSPRODUCT')") CommandProcessingResult createSavingProduct(SavingProductCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'UPDATE_SAVINGSPRODUCT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_SAVINGSPRODUCT')") CommandProcessingResult updateSavingProduct(SavingProductCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'DELETE_SAVINGSPRODUCT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_SAVINGSPRODUCT')") CommandProcessingResult deleteSavingProduct(Long productId); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositaccount/service/DepositAccountWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositaccount/service/DepositAccountWritePlatformService.java index dedaef4e5..a26b8e64f 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositaccount/service/DepositAccountWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositaccount/service/DepositAccountWritePlatformService.java @@ -14,46 +14,46 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface DepositAccountWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'CREATE_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_DEPOSITACCOUNT')") CommandProcessingResult createDepositAccount(DepositAccountCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'UPDATE_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_DEPOSITACCOUNT')") CommandProcessingResult updateDepositAccount(DepositAccountCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'DELETE_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_DEPOSITACCOUNT')") CommandProcessingResult deleteDepositAccount(Long productId); // NOTE - took out permissions relating to doing things with deposit // accounts in the past as doesn't appear to be code for it - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'APPROVE_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'APPROVE_DEPOSITACCOUNT')") CommandProcessingResult approveDepositApplication(DepositStateTransitionApprovalCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'REJECT_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'REJECT_DEPOSITACCOUNT')") CommandProcessingResult rejectDepositApplication(DepositStateTransitionCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'WITHDRAW_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'WITHDRAW_DEPOSITACCOUNT')") CommandProcessingResult withdrawDepositApplication(DepositStateTransitionCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'APPROVALUNDO_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'APPROVALUNDO_DEPOSITACCOUNT')") CommandProcessingResult undoDepositApproval(UndoStateTransitionCommand undoCommand); /* * @PreAuthorize(value = - * "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', '')" ) + * "hasAnyRole('ALL_FUNCTIONS', '')" ) * EntityIdentifier matureDepositApplication(DepositStateTransitionCommand * command); */ - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'WITHDRAWAL_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'WITHDRAWAL_DEPOSITACCOUNT')") CommandProcessingResult withdrawDepositAccountMoney(DepositAccountWithdrawalCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER', 'INTEREST_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'INTEREST_DEPOSITACCOUNT')") CommandProcessingResult withdrawDepositAccountInterestMoney(DepositAccountWithdrawInterestCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'RENEW_DEPOSITACCOUNT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'RENEW_DEPOSITACCOUNT')") CommandProcessingResult renewDepositAccount(DepositAccountCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'PORTFOLIO_MANAGEMENT_SUPER_USER')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS')") CommandProcessingResult postInterestToDepositAccount(Collection accounts); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductWritePlatformService.java index a0e755896..5f94261b4 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savingsdepositproduct/service/DepositProductWritePlatformService.java @@ -6,12 +6,12 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface DepositProductWritePlatformService { - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'CREATE_DEPOSITPRODUCT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'CREATE_DEPOSITPRODUCT')") CommandProcessingResult createDepositProduct(DepositProductCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'UPDATE_DEPOSITPRODUCT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'UPDATE_DEPOSITPRODUCT')") CommandProcessingResult updateDepositProduct(DepositProductCommand command); - @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'ORGANISATION_ADMINISTRATION_SUPER_USER', 'DELETE_DEPOSITPRODUCT')") + @PreAuthorize(value = "hasAnyRole('ALL_FUNCTIONS', 'DELETE_DEPOSITPRODUCT')") CommandProcessingResult deleteDepositProduct(Long productId); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java index e579a01ec..9f08c80da 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java @@ -305,23 +305,23 @@ public class AppUser extends AbstractAuditableCustom implements P } public boolean canNotApproveLoanInPast() { - return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "APPROVEINPAST_LOAN", "PORTFOLIO_MANAGEMENT_SUPER_USER"); + return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "APPROVEINPAST_LOAN"); } public boolean canNotRejectLoanInPast() { - return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "REJECTINPAST_LOAN", "PORTFOLIO_MANAGEMENT_SUPER_USER"); + return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "REJECTINPAST_LOAN"); } public boolean canNotWithdrawByClientLoanInPast() { - return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "WITHDRAWINPAST_LOAN", "PORTFOLIO_MANAGEMENT_SUPER_USER"); + return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "WITHDRAWINPAST_LOAN"); } public boolean canNotDisburseLoanInPast() { - return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "DISBURSEINPAST_LOAN", "PORTFOLIO_MANAGEMENT_SUPER_USER"); + return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "DISBURSEINPAST_LOAN"); } public boolean canNotMakeRepaymentOnLoanInPast() { - return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "REPAYMENTINPAST_LOAN", "PORTFOLIO_MANAGEMENT_SUPER_USER"); + return hasNotPermissionForAnyOf("ALL_FUNCTIONS", "REPAYMENTINPAST_LOAN"); } public boolean hasNotPermissionForReport(final String reportName) { @@ -365,57 +365,8 @@ public class AppUser extends AbstractAuditableCustom implements P String matchPermission = "READ_" + entityType.toUpperCase(); if (!(hasNotPermissionForAnyOf("ALL_FUNCTIONS", "ALL_FUNCTIONS_READ", matchPermission))) return; - - String higherPermission = ""; - if (entityType.equalsIgnoreCase("CHARGE")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("CLIENT")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("CLIENTNOTE")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("CLIENTIDENTIFIER")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("CLIENTIMAGE")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("CODE")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("CURRENCY")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("DOCUMENTMAN")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("FUND")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("GROUP")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("LOANPRODUCT")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("LOAN")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("OFFICE")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("OFFICETRANSACTION")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("PERMISSION")) { - higherPermission = "USER_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("ROLE")) { - higherPermission = "USER_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("USER")) { - higherPermission = "USER_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("STAFF")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("SAVINGSPRODUCT")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("DEPOSITPRODUCT")) { - higherPermission = "ORGANISATION_ADMINISTRATION_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("DEPOSITACCOUNT")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } else if (entityType.equalsIgnoreCase("SAVINGSACCOUNT")) { - higherPermission = "PORTFOLIO_MANAGEMENT_SUPER_USER"; - } - - if (!(higherPermission.equals(""))) { - if (hasNotPermissionForAnyOf(higherPermission)) throw new NoAuthorizationException(authorizationMessage); - } + + throw new NoAuthorizationException(authorizationMessage); } private boolean hasNotPermissionTo(final String permissionCode) {