UFAL/Clarinuserregistration nullpoint exception (#941)

* check if current user is defined

* removed empty line

* throw RESTAuthorizationException

Author: Paurikova2

dspace-api/src/main/java/org/dspace/content/clarin/ClarinLicenseResourceUserAllowanceServiceImpl.java

@@ -164,7 +164,7 @@ private void authorizeClruaAction(Context context, List<ClarinLicenseResourceUse
         }
 
         UUID userRegistrationEpersonUUID = clrua.getUserRegistration().getPersonID();
-        if (currentUser.getID().equals(userRegistrationEpersonUUID)) {
+        if (Objects.nonNull(currentUser) && currentUser.getID().equals(userRegistrationEpersonUUID)) {
             return;
         }
 

dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CLRUAUUserRegistrationLinkRepository.java

@@ -12,6 +12,7 @@
 import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 
+import org.dspace.app.rest.exception.RESTAuthorizationException;
 import org.dspace.app.rest.model.ClarinLicenseResourceUserAllowanceRest;
 import org.dspace.app.rest.model.ClarinUserRegistrationRest;
 import org.dspace.app.rest.projection.Projection;
@@ -39,11 +40,16 @@ public class CLRUAUUserRegistrationLinkRepository extends AbstractDSpaceRestRepo
     public ClarinUserRegistrationRest getUserRegistration(@Nullable HttpServletRequest request,
                                                      Integer clruaID,
                                                      @Nullable Pageable optionalPageable,
-                                                     Projection projection) throws SQLException, AuthorizeException {
+                                                     Projection projection)
+            throws SQLException, RESTAuthorizationException {
         Context context = obtainContext();
 
-        ClarinLicenseResourceUserAllowance clarinLicenseResourceUserAllowance =
-                clarinLicenseResourceUserAllowanceService.find(context, clruaID);
+        ClarinLicenseResourceUserAllowance clarinLicenseResourceUserAllowance;
+        try {
+            clarinLicenseResourceUserAllowance = clarinLicenseResourceUserAllowanceService.find(context, clruaID);
+        } catch (AuthorizeException e) {
+            throw new RESTAuthorizationException(e);
+        }
         if (Objects.isNull(clarinLicenseResourceUserAllowance)) {
             throw new ResourceNotFoundException("The ClarinLicenseResourceUserAllowance for id: " + clruaID +
                     " couldn't be found");

dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CLRUAUserMetadataLinkRepository.java

@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.dspace.app.rest.exception.RESTAuthorizationException;
 import org.dspace.app.rest.model.ClarinLicenseResourceUserAllowanceRest;
 import org.dspace.app.rest.model.ClarinUserMetadataRest;
 import org.dspace.app.rest.projection.Projection;
@@ -42,11 +43,16 @@ public class CLRUAUserMetadataLinkRepository extends AbstractDSpaceRestRepositor
     public Page<ClarinUserMetadataRest> getUserMetadata(@Nullable HttpServletRequest request,
                                                         Integer clruaID,
                                                         @Nullable Pageable optionalPageable,
-                                                        Projection projection) throws SQLException, AuthorizeException {
+                                                        Projection projection)
+            throws SQLException, RESTAuthorizationException {
         Context context = obtainContext();
-
-        ClarinLicenseResourceUserAllowance clarinLicenseResourceUserAllowance =
-                clarinLicenseResourceUserAllowanceService.find(context, clruaID);
+        ClarinLicenseResourceUserAllowance clarinLicenseResourceUserAllowance;
+        try {
+            clarinLicenseResourceUserAllowance =
+                    clarinLicenseResourceUserAllowanceService.find(context, clruaID);
+        } catch (AuthorizeException e) {
+            throw new RESTAuthorizationException(e);
+        }
         if (Objects.isNull(clarinLicenseResourceUserAllowance)) {
             throw new ResourceNotFoundException("The ClarinLicenseResourceUserAllowance for if: " + clruaID +
                     " couldn't be found");