Merge branch 'master' into sharkbook.ai

WildMeOrg · Nov 1, 2023 · bec062c · bec062c
2 parents 4145ea9 + 50eab47
commit bec062c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/org/ecocean/servlet/ServletUtilities.java b/src/main/java/org/ecocean/servlet/ServletUtilities.java
@@ -521,9 +521,10 @@ public static boolean isUserAuthorizedForImportTask(ImportTask occ, HttpServletR
 
       //quick collaboration check between current user and bulk import owner
       //if(occ.getCreator() !=null && Collaboration.canCollaborate(request.getUserPrincipal().getName(), occ.getCreator().getUsername(), myShepherd.getContext()))return true;
-      Collaboration collab = Collaboration.collaborationBetweenUsers(myShepherd, request.getUserPrincipal().getName(), occ.getCreator().getUsername());
-      if(collab!=null && collab.getState()!=null && (collab.getState().equals(Collaboration.STATE_EDIT_PRIV)||collab.getState().equals(Collaboration.STATE_APPROVED)) )return true;
-
+      if(request.getUserPrincipal()!=null && request.getUserPrincipal().getName()!=null && occ.getCreator() !=null && occ.getCreator().getUsername()!=null) {
+    	  Collaboration collab = Collaboration.collaborationBetweenUsers(myShepherd, request.getUserPrincipal().getName(), occ.getCreator().getUsername());
+    	  if(collab!=null && collab.getState()!=null && (collab.getState().equals(Collaboration.STATE_EDIT_PRIV)||collab.getState().equals(Collaboration.STATE_APPROVED)) )return true;
+      }
 
       //quick orgAdminCheck
       //if this user is the orgAdmin for the bulk import's uploading user, they can see it