develop

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'com.flexcodelabs'
-version = '0.0.46'
+version = '0.0.47'
 description = 'Flextuma App'
 
 java {

src/main/java/com/flexcodelabs/flextuma/core/services/BaseService.java

@@ -98,7 +98,7 @@ protected void checkPermission(String requiredPermission) {
 
 		boolean isAuthorized = authorities.contains("SUPER_ADMIN") ||
 				authorities.contains(requiredPermission) ||
-				(!isAdminEntity() && authorities.contains("ALL"));
+				(!isAdminEntity() && (authorities.contains("ALL") || requiredPermission.equals("ALL")));
 
 		if (!isAuthorized) {
 			throw new AccessDeniedException("You have no permission to access " + getEntityPlural());
@@ -469,7 +469,7 @@ protected void prepareEntityForPersistence(Object entity) {
 		}
 	}
 
-	private T findAccessibleById(UUID id) {
+	protected T findAccessibleById(UUID id) {
 		Specification<T> spec = buildTenantSpec()
 				.and((root, query, cb) -> cb.equal(root.get("id"), id));
 		return getRepositoryAsExecutor().findOne(spec)

src/main/java/com/flexcodelabs/flextuma/modules/sms/services/SmsConnectorService.java

@@ -25,22 +25,22 @@ protected JpaRepository<SmsConnector, UUID> getRepository() {
 
     @Override
     protected String getReadPermission() {
-        return SmsConnector.READ;
+        return "ALL";
     }
 
     @Override
     protected String getAddPermission() {
-        return SmsConnector.ADD;
+        return "ALL";
     }
 
     @Override
     protected String getUpdatePermission() {
-        return SmsConnector.UPDATE;
+        return "ALL";
     }
 
     @Override
     protected String getDeletePermission() {
-        return SmsConnector.DELETE;
+        return "ALL";
     }
 
     @Override
@@ -112,9 +112,7 @@ protected void validateDelete(SmsConnector entity) {
     @Override
     public SmsConnector update(UUID id, SmsConnector entity) {
         checkPermission(getUpdatePermission());
-        SmsConnector existing = getRepository().findById(id)
-                .orElseThrow(() -> new org.springframework.web.server.ResponseStatusException(
-                        org.springframework.http.HttpStatus.NOT_FOUND, getEntitySingular() + " not found"));
+        SmsConnector existing = findAccessibleById(id);
 
         if (!Boolean.TRUE.equals(isAdminPermission())
                 && (existing.getProvider() + "_SYSTEM").equalsIgnoreCase(existing.getProvider())) {

src/test/java/com/flexcodelabs/flextuma/core/services/BaseServiceTest.java

@@ -85,14 +85,16 @@ public void setName(String name) {
     }
 
     class TestService extends BaseService<TestEntity> {
+        private String readPermission = "READ";
+
         @Override
         protected JpaRepository<TestEntity, UUID> getRepository() {
             return repository;
         }
 
         @Override
         protected String getReadPermission() {
-            return "READ";
+            return readPermission;
         }
 
         @Override
@@ -173,6 +175,16 @@ void checkPermission_shouldAllowAllForNonAdminEntities() {
         assertDoesNotThrow(() -> service.findAll());
     }
 
+    @Test
+    void checkPermission_shouldAllowTheAllPolicyForAuthenticatedNonAdminEntities() {
+        service.readPermission = "ALL";
+        mockPermissions(Set.of());
+        when(currentUserResolver.getCurrentUser()).thenReturn(Optional.empty());
+        when(executor.findAll(any(Specification.class))).thenReturn(List.of());
+
+        assertDoesNotThrow(() -> service.findAll());
+    }
+
     @Test
     @SuppressWarnings("unchecked")
     void getEntityFields_shouldReturnFieldDTOs() {