From da57832924778aff1b46f84b7af05a5ff5d4ac18 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 10 Mar 2023 16:29:44 -0700 Subject: [PATCH 01/24] [GECO-140] Adding new delete document controller to the v2 API --- .../api/v2/V2DeleteDocumentController.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java new file mode 100644 index 00000000..f7bda1cb --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -0,0 +1,33 @@ +package edu.asu.diging.gilesecosystem.web.api.v2; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import edu.asu.diging.gilesecosystem.web.core.model.IDocument; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; +import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; + +@Controller +public class V2DeleteDocumentController { + + @Autowired + private IDeleteDocumentService deleteDocumentService; + + @Autowired + private ITransactionalDocumentService documentService; + + @RequestMapping(value = "/api/v2/resources/documents/{documentId}", method = RequestMethod.DELETE, produces = "application/json;charset=UTF-8") + public ResponseEntity reprocessDocument(@PathVariable("documentId") String documentId) { + IDocument document = documentService.getDocument(documentId); + if (document == null) { + return new ResponseEntity(HttpStatus.NOT_FOUND); + } + deleteDocumentService.deleteDocument(document); + return new ResponseEntity(HttpStatus.OK); + } +} From 7e07f0e16e5e8f6eb3e04cbf80b6beff508c5c5c Mon Sep 17 00:00:00 2001 From: diya17 Date: Thu, 16 Mar 2023 11:43:12 -0700 Subject: [PATCH 02/24] [GECO-140] Making changes to the controller endpoint response and adding tests --- .../api/v2/V2DeleteDocumentController.java | 4 +- .../v2/V2DeleteDocumentControllerTest.java | 68 +++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index f7bda1cb..f68f30b7 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -22,12 +22,12 @@ public class V2DeleteDocumentController { private ITransactionalDocumentService documentService; @RequestMapping(value = "/api/v2/resources/documents/{documentId}", method = RequestMethod.DELETE, produces = "application/json;charset=UTF-8") - public ResponseEntity reprocessDocument(@PathVariable("documentId") String documentId) { + public ResponseEntity deleteDocument(@PathVariable("documentId") String documentId) { IDocument document = documentService.getDocument(documentId); if (document == null) { return new ResponseEntity(HttpStatus.NOT_FOUND); } deleteDocumentService.deleteDocument(document); - return new ResponseEntity(HttpStatus.OK); + return new ResponseEntity(HttpStatus.ACCEPTED); } } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java new file mode 100644 index 00000000..338afa98 --- /dev/null +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java @@ -0,0 +1,68 @@ +package edu.asu.diging.gilesecosystem.web.api.v2; + +import java.util.Arrays; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import edu.asu.diging.gilesecosystem.web.core.model.DocumentAccess; +import edu.asu.diging.gilesecosystem.web.core.model.IDocument; +import edu.asu.diging.gilesecosystem.web.core.model.impl.Document; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; +import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; + +public class V2DeleteDocumentControllerTest { + + @Mock + private IDeleteDocumentService deleteDocumentService; + + @Mock + private ITransactionalDocumentService documentService; + + @InjectMocks + private V2DeleteDocumentController v2DeleteDocumentController; + + private String DOCUMENT_ID = "documentId"; + private DocumentAccess access = DocumentAccess.PRIVATE; + private String FILE_ID = "fileId"; + private String UPLOAD_ID = "uploadId"; + IDocument document; + + @Before + public void setUp() { + document = createDocument(); + v2DeleteDocumentController = new V2DeleteDocumentController(); + MockitoAnnotations.initMocks(this); + } + + @Test + public void test_deleteDocument_success() { + Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); + ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID); + Assert.assertEquals(HttpStatus.ACCEPTED, response.getStatusCode()); + } + + @Test + public void test_deleteDocument_notFound() { + Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(null); + ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID); + Assert.assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); + } + + private Document createDocument() { + Document document = new Document(); + document.setId(DOCUMENT_ID); + document.setAccess(access); + document.setFileIds(Arrays.asList(FILE_ID)); + document.setUploadId(UPLOAD_ID); + document.setUploadedFileId(FILE_ID); + return document; + } +} From 1dc8fcb9a6b43343b82fbcd21e78fcd00c43af96 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 26 May 2023 17:00:28 -0700 Subject: [PATCH 03/24] [GECO-140] : Addressing review comments --- .../web/api/util/IResponseHelper.java | 10 ++++ .../web/api/util/impl/ResponseHelper.java | 48 +++++++++++++++++ .../api/v2/V2DeleteDocumentController.java | 54 ++++++++++++++++++- .../src/main/resources/config.properties | 1 + 4 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java new file mode 100644 index 00000000..f5ee4b04 --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java @@ -0,0 +1,10 @@ +package edu.asu.diging.gilesecosystem.web.api.util; + +import java.util.Map; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public interface IResponseHelper { + public abstract ResponseEntity generateResponse(Map msgs, HttpStatus status); +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java new file mode 100644 index 00000000..bb7f7059 --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java @@ -0,0 +1,48 @@ +package edu.asu.diging.gilesecosystem.web.api.util.impl; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.node.ObjectNode; + +import edu.asu.diging.gilesecosystem.septemberutil.properties.MessageType; +import edu.asu.diging.gilesecosystem.septemberutil.service.ISystemMessageHandler; +import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; + +@Component +public class ResponseHelper implements IResponseHelper { + + @Autowired + private ISystemMessageHandler messageHandler; + + @Override + public ResponseEntity generateResponse(Map msgs, + HttpStatus status) { + ObjectMapper mapper = new ObjectMapper(); + mapper.enable(SerializationFeature.INDENT_OUTPUT); + ObjectNode root = mapper.createObjectNode(); + for (String key : msgs.keySet()) { + root.put(key, msgs.get(key)); + } + + StringWriter sw = new StringWriter(); + try { + mapper.writeValue(sw, root); + } catch (IOException e) { + messageHandler.handleMessage("Could not write json.", e, MessageType.ERROR); + return new ResponseEntity( + "{\"errorMsg\": \"Could not write json result.\", \"errorCode\": \"errorCode\": \"500\" }", + HttpStatus.INTERNAL_SERVER_ERROR); + } + + return new ResponseEntity(sw.toString(), status); + } +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index f68f30b7..8e21cb37 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -1,6 +1,12 @@ package edu.asu.diging.gilesecosystem.web.api.v2; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -8,9 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import edu.asu.diging.gilesecosystem.util.properties.IPropertiesManager; +import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; +import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; +import edu.asu.diging.gilesecosystem.web.config.IUserHelper; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; +import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; +import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; @Controller public class V2DeleteDocumentController { @@ -21,13 +33,51 @@ public class V2DeleteDocumentController { @Autowired private ITransactionalDocumentService documentService; + @Autowired + private IResponseHelper responseHelper; + + @Autowired + private IPropertiesManager propertyManager; + + @Autowired + private IUserHelper userHelper; + + @Value("${giles_check_deletion_endpoint_v2}") + private String deleteEndpoint; + @RequestMapping(value = "/api/v2/resources/documents/{documentId}", method = RequestMethod.DELETE, produces = "application/json;charset=UTF-8") public ResponseEntity deleteDocument(@PathVariable("documentId") String documentId) { IDocument document = documentService.getDocument(documentId); + Map msgs = new HashMap(); if (document == null) { - return new ResponseEntity(HttpStatus.NOT_FOUND); + msgs.put("errorMsg", "Document Id: " + documentId + " does not exist."); + msgs.put("errorCode", "404"); + return responseHelper.generateResponse(msgs, HttpStatus.NOT_FOUND); } deleteDocumentService.deleteDocument(document); - return new ResponseEntity(HttpStatus.ACCEPTED); + msgs.put("checkUrl", propertyManager.getProperty(Properties.GILES_URL) + deleteEndpoint + documentId); + + return responseHelper.generateResponse(msgs, HttpStatus.OK); + } + + @RequestMapping(value = "/api/v2/files/deletion/check/{documentId}", method = RequestMethod.GET) + public ResponseEntity checkDocumentDeletion(HttpServletRequest request, + @PathVariable String documentId, CitesphereToken citesphereToken) { + IDocument document = documentService.getDocument(documentId); + String username = document.getUsername(); + Map msgs = new HashMap(); + CitesphereUser user = (CitesphereUser) citesphereToken.getPrincipal(); + String usernameInSystem = userHelper.createUsername(user.getUsername(), user.getAuthorizingClient()); + if (!usernameInSystem.equals(username)) { + msgs.put("errorMsg", "User is not authorized to check status."); + msgs.put("errorCode", "401"); + + return responseHelper.generateResponse(msgs, HttpStatus.UNAUTHORIZED); + } else if (document == null) { + msgs.put("successMessage", "Document Id: " + documentId + " is deleted."); + return responseHelper.generateResponse(msgs, HttpStatus.OK); + } + msgs.put("progressInfo", "Deletion in progress. Please check back later."); + return responseHelper.generateResponse(msgs, HttpStatus.OK); } } diff --git a/giles-eco/src/main/resources/config.properties b/giles-eco/src/main/resources/config.properties index e2ba21cd..c4c878e7 100755 --- a/giles-eco/src/main/resources/config.properties +++ b/giles-eco/src/main/resources/config.properties @@ -52,6 +52,7 @@ giles_digilib_endpoint=/rest/digilib giles_file_endpoint=/rest/files/ giles_check_upload_endpoint=/rest/files/upload/check/ giles_check_upload_endpoint_v2=/api/v2/files/upload/check/ +giles_check_deletion_endpoint_v2=/api/v2/files/deletion/check/ giles_file_content_suffix=/content # file uploads From 8fed2933b76b8a973e20c389211fadef6b92374e Mon Sep 17 00:00:00 2001 From: diya17 Date: Tue, 30 May 2023 15:28:23 -0700 Subject: [PATCH 04/24] [GECO-140] Changing the status for the deletion endpoint and adding an endpoint for polling the status --- .../api/v2/V2DeleteDocumentController.java | 25 ++++++++-------- .../web/config/IUserHelper.java | 8 ++++- .../web/config/impl/UserHelper.java | 29 +++++++++++++++++++ 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index 8e21cb37..37877fce 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -46,7 +46,7 @@ public class V2DeleteDocumentController { private String deleteEndpoint; @RequestMapping(value = "/api/v2/resources/documents/{documentId}", method = RequestMethod.DELETE, produces = "application/json;charset=UTF-8") - public ResponseEntity deleteDocument(@PathVariable("documentId") String documentId) { + public ResponseEntity deleteDocument(@PathVariable("documentId") String documentId, CitesphereToken citesphereToken) { IDocument document = documentService.getDocument(documentId); Map msgs = new HashMap(); if (document == null) { @@ -54,6 +54,9 @@ public ResponseEntity deleteDocument(@PathVariable("documentId") String msgs.put("errorCode", "404"); return responseHelper.generateResponse(msgs, HttpStatus.NOT_FOUND); } + if (!userHelper.checkUserPermission(document, citesphereToken)) { + return userHelper.generateUnauthorizedUserResponse(); + } deleteDocumentService.deleteDocument(document); msgs.put("checkUrl", propertyManager.getProperty(Properties.GILES_URL) + deleteEndpoint + documentId); @@ -64,19 +67,15 @@ public ResponseEntity deleteDocument(@PathVariable("documentId") String public ResponseEntity checkDocumentDeletion(HttpServletRequest request, @PathVariable String documentId, CitesphereToken citesphereToken) { IDocument document = documentService.getDocument(documentId); - String username = document.getUsername(); - Map msgs = new HashMap(); - CitesphereUser user = (CitesphereUser) citesphereToken.getPrincipal(); - String usernameInSystem = userHelper.createUsername(user.getUsername(), user.getAuthorizingClient()); - if (!usernameInSystem.equals(username)) { - msgs.put("errorMsg", "User is not authorized to check status."); - msgs.put("errorCode", "401"); - - return responseHelper.generateResponse(msgs, HttpStatus.UNAUTHORIZED); - } else if (document == null) { - msgs.put("successMessage", "Document Id: " + documentId + " is deleted."); - return responseHelper.generateResponse(msgs, HttpStatus.OK); + if (document == null) { + Map successMsgs = new HashMap(); + successMsgs.put("successMessage", "Document Id: " + documentId + " is deleted."); + return responseHelper.generateResponse(successMsgs, HttpStatus.OK); + } + if (!userHelper.checkUserPermission(document, citesphereToken)) { + return userHelper.generateUnauthorizedUserResponse(); } + Map msgs = new HashMap(); msgs.put("progressInfo", "Deletion in progress. Please check back later."); return responseHelper.generateResponse(msgs, HttpStatus.OK); } diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java index 237c07ba..a954cc32 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java @@ -1,7 +1,9 @@ package edu.asu.diging.gilesecosystem.web.config; +import org.springframework.http.ResponseEntity; import org.springframework.social.connect.Connection; +import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.users.User; public interface IUserHelper { @@ -10,4 +12,8 @@ public interface IUserHelper { String createUsername(String username, String providerId); -} \ No newline at end of file + public abstract boolean checkUserPermission(IDocument document, CitesphereToken citesphereToken); + + public abstract ResponseEntity generateUnauthorizedUserResponse(); + +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java index c515fab1..1646afdf 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java @@ -1,12 +1,21 @@ package edu.asu.diging.gilesecosystem.web.config.impl; +import java.util.HashMap; +import java.util.Map; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.social.connect.Connection; import org.springframework.social.connect.UserProfile; import org.springframework.stereotype.Service; +import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; +import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; +import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.users.AccountStatus; +import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; import edu.asu.diging.gilesecosystem.web.core.users.IUserManager; import edu.asu.diging.gilesecosystem.web.core.users.User; @@ -15,6 +24,9 @@ public class UserHelper implements IUserHelper { @Autowired private IUserManager userManager; + + @Autowired + private IResponseHelper responseHelper; /* (non-Javadoc) * @see edu.asu.giles.config.IUserHelper#createUser(org.springframework.social.connect.Connection) @@ -49,4 +61,21 @@ public User createUser(Connection connection) { public String createUsername(String username, String providerId) { return username + "_" + providerId; } + + @Override + public boolean checkUserPermission(IDocument document, CitesphereToken citesphereToken) { + String username = document.getUsername(); + CitesphereUser user = (CitesphereUser) citesphereToken.getPrincipal(); + String usernameInSystem = createUsername(user.getUsername(), user.getAuthorizingClient()); + + return username.equals(usernameInSystem); + } + + @Override + public ResponseEntity generateUnauthorizedUserResponse() { + Map unauthorizedMsgs = new HashMap(); + unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); + unauthorizedMsgs.put("errorCode", "401"); + return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED); + } } From 1235a6b6eba33fba04512c66ed9c35b1f2570743 Mon Sep 17 00:00:00 2001 From: diya17 Date: Tue, 30 May 2023 16:59:39 -0700 Subject: [PATCH 05/24] [GECO-140] Adding javadocs and test case changes --- .../web/config/IUserHelper.java | 14 +++++++-- .../v2/V2DeleteDocumentControllerTest.java | 29 +++++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java index a954cc32..1bd4fa17 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java @@ -11,9 +11,19 @@ public interface IUserHelper { public abstract User createUser(Connection connection); String createUsername(String username, String providerId); - + + /** + Checks whether the user associated with the provided Citesphere token has permission to access the given document. + @param document The document for which to check the user permission. + @param citesphereToken The Citesphere token for the user. + @return {@code true} if the user has permission to access the document, {@code false} otherwise. + */ public abstract boolean checkUserPermission(IDocument document, CitesphereToken citesphereToken); - + + /** + Generates a ResponseEntity with an unauthorized status code (401) and a corresponding error message. + @return The generated ResponseEntity containing the unauthorized error message. + */ public abstract ResponseEntity generateUnauthorizedUserResponse(); } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java index 338afa98..0d9dee73 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java @@ -12,6 +12,10 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import edu.asu.diging.gilesecosystem.util.properties.IPropertiesManager; +import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; +import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; +import edu.asu.diging.gilesecosystem.web.config.IUserHelper; import edu.asu.diging.gilesecosystem.web.core.model.DocumentAccess; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.model.impl.Document; @@ -26,6 +30,15 @@ public class V2DeleteDocumentControllerTest { @Mock private ITransactionalDocumentService documentService; + @Mock + private IUserHelper userHelper; + + @Mock + private IPropertiesManager propertyManager; + + @Mock + private IResponseHelper responseHelper; + @InjectMocks private V2DeleteDocumentController v2DeleteDocumentController; @@ -33,6 +46,7 @@ public class V2DeleteDocumentControllerTest { private DocumentAccess access = DocumentAccess.PRIVATE; private String FILE_ID = "fileId"; private String UPLOAD_ID = "uploadId"; + private CitesphereToken CITESPHERE_TOKEN = new CitesphereToken("71b9cc36-939d-4e28-89e9-e5bfca1b26c3"); IDocument document; @Before @@ -45,14 +59,23 @@ public void setUp() { @Test public void test_deleteDocument_success() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID); - Assert.assertEquals(HttpStatus.ACCEPTED, response.getStatusCode()); + Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(true); + ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); + Assert.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void test_deleteDocument_whenUserIsNotAuthorized() { + Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); + Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(false); + ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); + Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); } @Test public void test_deleteDocument_notFound() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(null); - ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID); + ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); Assert.assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); } From 5b0ccf3578f1cc39b2944d20dcf9a4fa124bbc4f Mon Sep 17 00:00:00 2001 From: diya17 Date: Thu, 1 Jun 2023 14:07:34 -0400 Subject: [PATCH 06/24] [GECO-140] Adding and fixing tests --- .../api/v2/V2DeleteDocumentController.java | 7 +- .../v2/V2DeleteDocumentControllerTest.java | 76 +++++++++++++ .../web/config/impl/UserHelperTest.java | 106 ++++++++++++++++-- 3 files changed, 176 insertions(+), 13 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index 37877fce..1489fdfe 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -22,7 +22,6 @@ import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; -import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; @Controller public class V2DeleteDocumentController { @@ -43,7 +42,7 @@ public class V2DeleteDocumentController { private IUserHelper userHelper; @Value("${giles_check_deletion_endpoint_v2}") - private String deleteEndpoint; + private String checkDeleteEndpoint; @RequestMapping(value = "/api/v2/resources/documents/{documentId}", method = RequestMethod.DELETE, produces = "application/json;charset=UTF-8") public ResponseEntity deleteDocument(@PathVariable("documentId") String documentId, CitesphereToken citesphereToken) { @@ -58,8 +57,8 @@ public ResponseEntity deleteDocument(@PathVariable("documentId") String return userHelper.generateUnauthorizedUserResponse(); } deleteDocumentService.deleteDocument(document); - msgs.put("checkUrl", propertyManager.getProperty(Properties.GILES_URL) + deleteEndpoint + documentId); - + msgs.put("checkUrl", propertyManager.getProperty(Properties.GILES_URL) + checkDeleteEndpoint + documentId); + return responseHelper.generateResponse(msgs, HttpStatus.OK); } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java index 0d9dee73..696c7295 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java @@ -1,6 +1,10 @@ package edu.asu.diging.gilesecosystem.web.api.v2; +import java.io.IOException; +import java.io.StringWriter; import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import org.junit.Assert; import org.junit.Before; @@ -12,6 +16,10 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.node.ObjectNode; + import edu.asu.diging.gilesecosystem.util.properties.IPropertiesManager; import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; @@ -21,6 +29,7 @@ import edu.asu.diging.gilesecosystem.web.core.model.impl.Document; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; +import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; public class V2DeleteDocumentControllerTest { @@ -54,20 +63,29 @@ public void setUp() { document = createDocument(); v2DeleteDocumentController = new V2DeleteDocumentController(); MockitoAnnotations.initMocks(this); + Mockito.when(propertyManager.getProperty(Properties.GILES_URL)).thenReturn("http://localhost:8085/giles/"); } @Test public void test_deleteDocument_success() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(true); + Map msgs = new HashMap(); + msgs.put("checkUrl", "http://localhost:8085/giles/api/v2/files/deletion/check/" + DOCUMENT_ID); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.OK)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); Assert.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assert.assertTrue(response.getBody().contains("http://localhost:8085/giles/api/v2/files/deletion/check/documentId")); } @Test public void test_deleteDocument_whenUserIsNotAuthorized() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(false); + Map unauthorizedMsgs = new HashMap(); + unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); + unauthorizedMsgs.put("errorCode", "401"); + Mockito.when(userHelper.generateUnauthorizedUserResponse()).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); } @@ -75,10 +93,47 @@ public void test_deleteDocument_whenUserIsNotAuthorized() { @Test public void test_deleteDocument_notFound() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(null); + Map msgs = new HashMap(); + msgs.put("errorMsg", "Document Id: " + DOCUMENT_ID + " does not exist."); + msgs.put("errorCode", "404"); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.NOT_FOUND)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); Assert.assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); } + @Test + public void test_checkDocumentDeletion_whenDocumentIsDeleted() { + Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(null); + Map successMsgs = new HashMap(); + successMsgs.put("successMessage", "Document Id: " + DOCUMENT_ID + " is deleted."); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(successMsgs, HttpStatus.OK)); + ResponseEntity response = v2DeleteDocumentController.checkDocumentDeletion(null, DOCUMENT_ID, CITESPHERE_TOKEN); + Assert.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void test_checkDocumentDeletion_whenDocumentIsNotDeleted() { + Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); + Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(true); + Map msgs = new HashMap(); + msgs.put("progressInfo", "Deletion in progress. Please check back later."); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.OK)); + ResponseEntity response = v2DeleteDocumentController.checkDocumentDeletion(null, DOCUMENT_ID, CITESPHERE_TOKEN); + Assert.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void test_checkDocumentDeletion_whenUserDoesNotHavePermissionToCheckDocumentStatus() { + Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); + Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(false); + Map unauthorizedMsgs = new HashMap(); + unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); + unauthorizedMsgs.put("errorCode", "401"); + Mockito.when(userHelper.generateUnauthorizedUserResponse()).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); + ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); + Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); + } + private Document createDocument() { Document document = new Document(); document.setId(DOCUMENT_ID); @@ -88,4 +143,25 @@ private Document createDocument() { document.setUploadedFileId(FILE_ID); return document; } + + private ResponseEntity generateResponse(Map msgs, + HttpStatus status) { + ObjectMapper mapper = new ObjectMapper(); + mapper.enable(SerializationFeature.INDENT_OUTPUT); + ObjectNode root = mapper.createObjectNode(); + for (String key : msgs.keySet()) { + root.put(key, msgs.get(key)); + } + + StringWriter sw = new StringWriter(); + try { + mapper.writeValue(sw, root); + } catch (IOException e) { + return new ResponseEntity( + "{\"errorMsg\": \"Could not write json result.\", \"errorCode\": \"errorCode\": \"500\" }", + HttpStatus.INTERNAL_SERVER_ERROR); + } + + return new ResponseEntity(sw.toString(), status); + } } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java index dbbdcdb8..3dc9cd41 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java @@ -1,5 +1,11 @@ package edu.asu.diging.gilesecosystem.web.config.impl; +import java.io.IOException; +import java.io.StringWriter; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -7,12 +13,24 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.social.connect.Connection; import org.springframework.social.connect.ConnectionKey; import org.springframework.social.connect.UserProfile; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.node.ObjectNode; + +import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; +import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; +import edu.asu.diging.gilesecosystem.web.core.model.DocumentAccess; +import edu.asu.diging.gilesecosystem.web.core.model.IDocument; +import edu.asu.diging.gilesecosystem.web.core.model.impl.Document; import edu.asu.diging.gilesecosystem.web.core.users.AccountStatus; +import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; import edu.asu.diging.gilesecosystem.web.core.users.IUserManager; import edu.asu.diging.gilesecosystem.web.core.users.User; @@ -22,9 +40,26 @@ public class UserHelperTest { @Mock private Connection connection; + @Mock + private IResponseHelper responseHelper; + @InjectMocks private IUserHelper helperToTest; private String USER_ID = "user_id"; + private CitesphereToken citesphereToken = new CitesphereToken("71b9cc36-939d-4e28-89e9-e5bfca1b26c3"); + private String NAME = "name"; + private String FIRST_NAME = "firstname"; + private String LAST_NAME = "lastName"; + private String EMAIL = "email"; + private String USERNAME = "username"; + private String PROVIDER_ID = "providerId"; + private String PROVIDER_USER_ID = "providerUserId"; + private String EXISTING_USERNAME = USERNAME + "_" + PROVIDER_ID; + private String NEW_USERNAME = "newuser_providerId"; + private String DOCUMENT_ID = "documentId"; + private DocumentAccess access = DocumentAccess.PRIVATE; + private String FILE_ID = "fileId"; + private String UPLOAD_ID = "uploadId"; @Before public void setUp() { @@ -61,16 +96,7 @@ public void test_createUser_userNotExisting() { @Test public void test_createUser_userExists() { - String NAME = "name"; - String FIRST_NAME = "firstname"; - String LAST_NAME = "lastName"; - String EMAIL = "email"; - String USERNAME = "username"; - String PROVIDER_ID = "providerId"; - String PROVIDER_USER_ID = "providerUserId"; - String EXISTING_USERNAME = USERNAME + "_" + PROVIDER_ID; - String NEW_USERNAME = "newuser_providerId"; UserProfile profile = new UserProfile(USER_ID, NAME, FIRST_NAME, LAST_NAME, EMAIL, USERNAME); @@ -95,4 +121,66 @@ public void test_createUser_userExists() { Assert.assertEquals(PROVIDER_USER_ID, createdUser.getUserIdOfProvider()); Assert.assertEquals(AccountStatus.ADDED, createdUser.getAccountStatus()); } + + @Test + public void test_checkUserPermission_whenUserHasPermission() { + CitesphereUser user = new CitesphereUser(); + user.setUsername("newuser"); + user.setAuthorizingClient("providerId"); + citesphereToken.setPrincipal(user); + IDocument document = createDocument(NEW_USERNAME); + Assert.assertTrue(helperToTest.checkUserPermission(document, citesphereToken)); + } + + @Test + public void test_checkUserPermission_whenUserDoesNotHavePermission() { + CitesphereUser user = new CitesphereUser(); + user.setUsername("wrongUser"); + user.setAuthorizingClient("providerId"); + citesphereToken.setPrincipal(user); + IDocument document = createDocument(NEW_USERNAME); + Assert.assertFalse(helperToTest.checkUserPermission(document, citesphereToken)); + } + + @Test + public void test_generateUnauthorizedUserResponse() { + Map unauthorizedMsgs = new HashMap(); + unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); + unauthorizedMsgs.put("errorCode", "401"); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); + ResponseEntity response = helperToTest.generateUnauthorizedUserResponse(); + Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); + } + + private Document createDocument(String username) { + Document document = new Document(); + document.setId(DOCUMENT_ID); + document.setAccess(access); + document.setFileIds(Arrays.asList(FILE_ID)); + document.setUploadId(UPLOAD_ID); + document.setUploadedFileId(FILE_ID); + document.setUsername(username); + return document; + } + + private ResponseEntity generateResponse(Map msgs, + HttpStatus status) { + ObjectMapper mapper = new ObjectMapper(); + mapper.enable(SerializationFeature.INDENT_OUTPUT); + ObjectNode root = mapper.createObjectNode(); + for (String key : msgs.keySet()) { + root.put(key, msgs.get(key)); + } + + StringWriter sw = new StringWriter(); + try { + mapper.writeValue(sw, root); + } catch (IOException e) { + return new ResponseEntity( + "{\"errorMsg\": \"Could not write json result.\", \"errorCode\": \"errorCode\": \"500\" }", + HttpStatus.INTERNAL_SERVER_ERROR); + } + + return new ResponseEntity(sw.toString(), status); + } } From 6c74ab9baaf5f3db038eb1731dd1913d47e3669b Mon Sep 17 00:00:00 2001 From: diya17 Date: Thu, 15 Jun 2023 16:42:30 -0400 Subject: [PATCH 07/24] [GECO-140] Removing generateUnauthorizedUserResponse from userHelper --- .../web/api/util/IResponseHelper.java | 9 ++++++ .../web/api/util/impl/ResponseHelper.java | 3 ++ .../api/v2/V2DeleteDocumentController.java | 10 ++++-- .../web/config/IUserHelper.java | 7 ----- .../web/config/impl/UserHelper.java | 8 ----- .../v2/V2DeleteDocumentControllerTest.java | 8 ++--- .../web/config/impl/UserHelperTest.java | 31 ------------------- 7 files changed, 24 insertions(+), 52 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java index f5ee4b04..90ba3287 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/IResponseHelper.java @@ -6,5 +6,14 @@ import org.springframework.http.ResponseEntity; public interface IResponseHelper { + /** + Generates a ResponseEntity with a JSON body based on the given map of messages and HTTP status. + + @param msgs a map of messages where the keys represent message identifiers and the values represent message content + + @param status the HTTP status code to be set in the response + + @return a ResponseEntity object with JSON content and the specified HTTP status + */ public abstract ResponseEntity generateResponse(Map msgs, HttpStatus status); } diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java index bb7f7059..768c72e8 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/util/impl/ResponseHelper.java @@ -17,6 +17,9 @@ import edu.asu.diging.gilesecosystem.septemberutil.service.ISystemMessageHandler; import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; +/** +A helper class that generates HTTP responses with JSON content. +*/ @Component public class ResponseHelper implements IResponseHelper { diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index 1489fdfe..6878da7e 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -54,7 +54,10 @@ public ResponseEntity deleteDocument(@PathVariable("documentId") String return responseHelper.generateResponse(msgs, HttpStatus.NOT_FOUND); } if (!userHelper.checkUserPermission(document, citesphereToken)) { - return userHelper.generateUnauthorizedUserResponse(); + Map unauthorizedMsgs = new HashMap(); + unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document."); + unauthorizedMsgs.put("errorCode", "401"); + return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED); } deleteDocumentService.deleteDocument(document); msgs.put("checkUrl", propertyManager.getProperty(Properties.GILES_URL) + checkDeleteEndpoint + documentId); @@ -72,7 +75,10 @@ public ResponseEntity checkDocumentDeletion(HttpServletRequest request, return responseHelper.generateResponse(successMsgs, HttpStatus.OK); } if (!userHelper.checkUserPermission(document, citesphereToken)) { - return userHelper.generateUnauthorizedUserResponse(); + Map unauthorizedMsgs = new HashMap(); + unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); + unauthorizedMsgs.put("errorCode", "401"); + return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED); } Map msgs = new HashMap(); msgs.put("progressInfo", "Deletion in progress. Please check back later."); diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java index 1bd4fa17..5ba844d0 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java @@ -19,11 +19,4 @@ public interface IUserHelper { @return {@code true} if the user has permission to access the document, {@code false} otherwise. */ public abstract boolean checkUserPermission(IDocument document, CitesphereToken citesphereToken); - - /** - Generates a ResponseEntity with an unauthorized status code (401) and a corresponding error message. - @return The generated ResponseEntity containing the unauthorized error message. - */ - public abstract ResponseEntity generateUnauthorizedUserResponse(); - } diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java index 1646afdf..9920aeb8 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java @@ -70,12 +70,4 @@ public boolean checkUserPermission(IDocument document, CitesphereToken citespher return username.equals(usernameInSystem); } - - @Override - public ResponseEntity generateUnauthorizedUserResponse() { - Map unauthorizedMsgs = new HashMap(); - unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); - unauthorizedMsgs.put("errorCode", "401"); - return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED); - } } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java index 696c7295..b243fc06 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java @@ -83,9 +83,9 @@ public void test_deleteDocument_whenUserIsNotAuthorized() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(false); Map unauthorizedMsgs = new HashMap(); - unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); + unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document."); unauthorizedMsgs.put("errorCode", "401"); - Mockito.when(userHelper.generateUnauthorizedUserResponse()).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); } @@ -128,8 +128,8 @@ public void test_checkDocumentDeletion_whenUserDoesNotHavePermissionToCheckDocum Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(false); Map unauthorizedMsgs = new HashMap(); unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); - unauthorizedMsgs.put("errorCode", "401"); - Mockito.when(userHelper.generateUnauthorizedUserResponse()).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); + unauthorizedMsgs.put("errorCode", "401"); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java index 3dc9cd41..b293f6c2 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java @@ -142,16 +142,6 @@ public void test_checkUserPermission_whenUserDoesNotHavePermission() { Assert.assertFalse(helperToTest.checkUserPermission(document, citesphereToken)); } - @Test - public void test_generateUnauthorizedUserResponse() { - Map unauthorizedMsgs = new HashMap(); - unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); - unauthorizedMsgs.put("errorCode", "401"); - Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); - ResponseEntity response = helperToTest.generateUnauthorizedUserResponse(); - Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); - } - private Document createDocument(String username) { Document document = new Document(); document.setId(DOCUMENT_ID); @@ -162,25 +152,4 @@ private Document createDocument(String username) { document.setUsername(username); return document; } - - private ResponseEntity generateResponse(Map msgs, - HttpStatus status) { - ObjectMapper mapper = new ObjectMapper(); - mapper.enable(SerializationFeature.INDENT_OUTPUT); - ObjectNode root = mapper.createObjectNode(); - for (String key : msgs.keySet()) { - root.put(key, msgs.get(key)); - } - - StringWriter sw = new StringWriter(); - try { - mapper.writeValue(sw, root); - } catch (IOException e) { - return new ResponseEntity( - "{\"errorMsg\": \"Could not write json result.\", \"errorCode\": \"errorCode\": \"500\" }", - HttpStatus.INTERNAL_SERVER_ERROR); - } - - return new ResponseEntity(sw.toString(), status); - } } From f9e97720b5c0a12ecb2e61a2406094710f6cf5b7 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 23 Jun 2023 12:28:29 -0400 Subject: [PATCH 08/24] [GECO-140] Refactoring code and and testcases --- .../api/v2/V2DeleteDocumentController.java | 6 +- .../web/config/IUserHelper.java | 2 +- .../web/config/impl/UserHelper.java | 11 +-- .../v2/V2DeleteDocumentControllerTest.java | 10 +-- .../web/config/impl/UserHelperTest.java | 67 ++++++++----------- 5 files changed, 37 insertions(+), 59 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index 6878da7e..ef93513d 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -49,11 +49,11 @@ public ResponseEntity deleteDocument(@PathVariable("documentId") String IDocument document = documentService.getDocument(documentId); Map msgs = new HashMap(); if (document == null) { - msgs.put("errorMsg", "Document Id: " + documentId + " does not exist."); + msgs.put("errorMsg", "Document with id: " + documentId + " does not exist."); msgs.put("errorCode", "404"); return responseHelper.generateResponse(msgs, HttpStatus.NOT_FOUND); } - if (!userHelper.checkUserPermission(document, citesphereToken)) { + if (!userHelper.isUserPermittedToAccessDocument(document, citesphereToken)) { Map unauthorizedMsgs = new HashMap(); unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document."); unauthorizedMsgs.put("errorCode", "401"); @@ -74,7 +74,7 @@ public ResponseEntity checkDocumentDeletion(HttpServletRequest request, successMsgs.put("successMessage", "Document Id: " + documentId + " is deleted."); return responseHelper.generateResponse(successMsgs, HttpStatus.OK); } - if (!userHelper.checkUserPermission(document, citesphereToken)) { + if (!userHelper.isUserPermittedToAccessDocument(document, citesphereToken)) { Map unauthorizedMsgs = new HashMap(); unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); unauthorizedMsgs.put("errorCode", "401"); diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java index 5ba844d0..fa17d26a 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java @@ -18,5 +18,5 @@ public interface IUserHelper { @param citesphereToken The Citesphere token for the user. @return {@code true} if the user has permission to access the document, {@code false} otherwise. */ - public abstract boolean checkUserPermission(IDocument document, CitesphereToken citesphereToken); + public abstract boolean isUserPermittedToAccessDocument(IDocument document, CitesphereToken citesphereToken); } diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java index 9920aeb8..4fe7d005 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java @@ -1,16 +1,10 @@ package edu.asu.diging.gilesecosystem.web.config.impl; -import java.util.HashMap; -import java.util.Map; - import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.social.connect.Connection; import org.springframework.social.connect.UserProfile; import org.springframework.stereotype.Service; -import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; @@ -24,9 +18,6 @@ public class UserHelper implements IUserHelper { @Autowired private IUserManager userManager; - - @Autowired - private IResponseHelper responseHelper; /* (non-Javadoc) * @see edu.asu.giles.config.IUserHelper#createUser(org.springframework.social.connect.Connection) @@ -63,7 +54,7 @@ public String createUsername(String username, String providerId) { } @Override - public boolean checkUserPermission(IDocument document, CitesphereToken citesphereToken) { + public boolean isUserPermittedToAccessDocument(IDocument document, CitesphereToken citesphereToken) { String username = document.getUsername(); CitesphereUser user = (CitesphereUser) citesphereToken.getPrincipal(); String usernameInSystem = createUsername(user.getUsername(), user.getAuthorizingClient()); diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java index b243fc06..f7e2451b 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java @@ -69,7 +69,7 @@ public void setUp() { @Test public void test_deleteDocument_success() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(true); + Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(true); Map msgs = new HashMap(); msgs.put("checkUrl", "http://localhost:8085/giles/api/v2/files/deletion/check/" + DOCUMENT_ID); Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.OK)); @@ -81,7 +81,7 @@ public void test_deleteDocument_success() { @Test public void test_deleteDocument_whenUserIsNotAuthorized() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(false); + Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(false); Map unauthorizedMsgs = new HashMap(); unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document."); unauthorizedMsgs.put("errorCode", "401"); @@ -94,7 +94,7 @@ public void test_deleteDocument_whenUserIsNotAuthorized() { public void test_deleteDocument_notFound() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(null); Map msgs = new HashMap(); - msgs.put("errorMsg", "Document Id: " + DOCUMENT_ID + " does not exist."); + msgs.put("errorMsg", "Document with id: " + DOCUMENT_ID + " does not exist."); msgs.put("errorCode", "404"); Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.NOT_FOUND)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); @@ -114,7 +114,7 @@ public void test_checkDocumentDeletion_whenDocumentIsDeleted() { @Test public void test_checkDocumentDeletion_whenDocumentIsNotDeleted() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(true); + Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(true); Map msgs = new HashMap(); msgs.put("progressInfo", "Deletion in progress. Please check back later."); Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.OK)); @@ -125,7 +125,7 @@ public void test_checkDocumentDeletion_whenDocumentIsNotDeleted() { @Test public void test_checkDocumentDeletion_whenUserDoesNotHavePermissionToCheckDocumentStatus() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.checkUserPermission(document, CITESPHERE_TOKEN)).thenReturn(false); + Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(false); Map unauthorizedMsgs = new HashMap(); unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); unauthorizedMsgs.put("errorCode", "401"); diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java index b293f6c2..e8a9dbde 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java @@ -1,10 +1,6 @@ package edu.asu.diging.gilesecosystem.web.config.impl; -import java.io.IOException; -import java.io.StringWriter; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import org.junit.Assert; import org.junit.Before; @@ -13,17 +9,10 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.social.connect.Connection; import org.springframework.social.connect.ConnectionKey; import org.springframework.social.connect.UserProfile; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.node.ObjectNode; - -import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; import edu.asu.diging.gilesecosystem.web.core.model.DocumentAccess; @@ -40,26 +29,14 @@ public class UserHelperTest { @Mock private Connection connection; - @Mock - private IResponseHelper responseHelper; - @InjectMocks private IUserHelper helperToTest; private String USER_ID = "user_id"; - private CitesphereToken citesphereToken = new CitesphereToken("71b9cc36-939d-4e28-89e9-e5bfca1b26c3"); - private String NAME = "name"; - private String FIRST_NAME = "firstname"; - private String LAST_NAME = "lastName"; - private String EMAIL = "email"; - private String USERNAME = "username"; - private String PROVIDER_ID = "providerId"; - private String PROVIDER_USER_ID = "providerUserId"; - private String EXISTING_USERNAME = USERNAME + "_" + PROVIDER_ID; - private String NEW_USERNAME = "newuser_providerId"; private String DOCUMENT_ID = "documentId"; private DocumentAccess access = DocumentAccess.PRIVATE; private String FILE_ID = "fileId"; private String UPLOAD_ID = "uploadId"; + private CitesphereToken citesphereToken = new CitesphereToken("71b9cc36-939d-4e28-89e9-e5bfca1b26c3"); @Before public void setUp() { @@ -96,7 +73,16 @@ public void test_createUser_userNotExisting() { @Test public void test_createUser_userExists() { + String NAME = "name"; + String FIRST_NAME = "firstname"; + String LAST_NAME = "lastName"; + String EMAIL = "email"; + String USERNAME = "username"; + String PROVIDER_ID = "providerId"; + String PROVIDER_USER_ID = "providerUserId"; + String EXISTING_USERNAME = USERNAME + "_" + PROVIDER_ID; + String NEW_USERNAME = "newuser_providerId"; UserProfile profile = new UserProfile(USER_ID, NAME, FIRST_NAME, LAST_NAME, EMAIL, USERNAME); @@ -123,33 +109,34 @@ public void test_createUser_userExists() { } @Test - public void test_checkUserPermission_whenUserHasPermission() { - CitesphereUser user = new CitesphereUser(); - user.setUsername("newuser"); - user.setAuthorizingClient("providerId"); - citesphereToken.setPrincipal(user); - IDocument document = createDocument(NEW_USERNAME); - Assert.assertTrue(helperToTest.checkUserPermission(document, citesphereToken)); + public void test_isUserPermittedToAccessDocument_whenUserIsAllowedToAccessDocument() { + IDocument document = createDocument(); + citesphereToken.setPrincipal(createCitesphereUser("dab")); + Assert.assertTrue(helperToTest.isUserPermittedToAccessDocument(document, citesphereToken)); } @Test - public void test_checkUserPermission_whenUserDoesNotHavePermission() { - CitesphereUser user = new CitesphereUser(); - user.setUsername("wrongUser"); - user.setAuthorizingClient("providerId"); - citesphereToken.setPrincipal(user); - IDocument document = createDocument(NEW_USERNAME); - Assert.assertFalse(helperToTest.checkUserPermission(document, citesphereToken)); + public void test_isUserPermittedToAccessDocument_whenUserIsNotAllowedToAccessDocument() { + IDocument document = createDocument(); + citesphereToken.setPrincipal(createCitesphereUser("test1")); + Assert.assertFalse(helperToTest.isUserPermittedToAccessDocument(document, citesphereToken)); } - private Document createDocument(String username) { + private Document createDocument() { Document document = new Document(); document.setId(DOCUMENT_ID); document.setAccess(access); document.setFileIds(Arrays.asList(FILE_ID)); document.setUploadId(UPLOAD_ID); document.setUploadedFileId(FILE_ID); - document.setUsername(username); + document.setUsername("dab_citesphere"); return document; } + + private CitesphereUser createCitesphereUser(String userName) { + CitesphereUser user = new CitesphereUser(); + user.setAuthorizingClient("citesphere"); + user.setUsername(userName); + return user; + } } From e515ac62b89a2419071e07807832f2e1b1122573 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 30 Jun 2023 14:51:25 -0400 Subject: [PATCH 09/24] [GECO-140] Making changes to check user access using citesphere --- .../api/v2/V2DeleteDocumentController.java | 21 ++++++++----- .../web/config/IUserHelper.java | 11 +------ .../web/config/impl/UserHelper.java | 12 -------- .../v2/V2DeleteDocumentControllerTest.java | 30 ++++++++++--------- 4 files changed, 30 insertions(+), 44 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index ef93513d..8e6b859d 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -18,10 +18,12 @@ import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; +import edu.asu.diging.gilesecosystem.web.core.citesphere.ICitesphereConnector; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; +import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; @Controller public class V2DeleteDocumentController { @@ -41,6 +43,9 @@ public class V2DeleteDocumentController { @Autowired private IUserHelper userHelper; + @Autowired + private ICitesphereConnector citesphereConnector; + @Value("${giles_check_deletion_endpoint_v2}") private String checkDeleteEndpoint; @@ -53,11 +58,11 @@ public ResponseEntity deleteDocument(@PathVariable("documentId") String msgs.put("errorCode", "404"); return responseHelper.generateResponse(msgs, HttpStatus.NOT_FOUND); } - if (!userHelper.isUserPermittedToAccessDocument(document, citesphereToken)) { + if (!citesphereConnector.hasAccess(document.getId(), ((CitesphereUser)citesphereToken.getPrincipal()).getUsername())) { Map unauthorizedMsgs = new HashMap(); - unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document."); - unauthorizedMsgs.put("errorCode", "401"); - return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED); + unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document with id " + document.getId()); + unauthorizedMsgs.put("errorCode", "403"); + return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.FORBIDDEN); } deleteDocumentService.deleteDocument(document); msgs.put("checkUrl", propertyManager.getProperty(Properties.GILES_URL) + checkDeleteEndpoint + documentId); @@ -74,11 +79,11 @@ public ResponseEntity checkDocumentDeletion(HttpServletRequest request, successMsgs.put("successMessage", "Document Id: " + documentId + " is deleted."); return responseHelper.generateResponse(successMsgs, HttpStatus.OK); } - if (!userHelper.isUserPermittedToAccessDocument(document, citesphereToken)) { + if (!citesphereConnector.hasAccess(document.getId(), ((CitesphereUser)citesphereToken.getPrincipal()).getUsername())) { Map unauthorizedMsgs = new HashMap(); - unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); - unauthorizedMsgs.put("errorCode", "401"); - return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED); + unauthorizedMsgs.put("errorMsg", "User is not authorized to check status for document id " + document.getId()); + unauthorizedMsgs.put("errorCode", "403"); + return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.FORBIDDEN); } Map msgs = new HashMap(); msgs.put("progressInfo", "Deletion in progress. Please check back later."); diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java index fa17d26a..b981db55 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java @@ -1,9 +1,7 @@ package edu.asu.diging.gilesecosystem.web.config; -import org.springframework.http.ResponseEntity; import org.springframework.social.connect.Connection; -import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.users.User; public interface IUserHelper { @@ -11,12 +9,5 @@ public interface IUserHelper { public abstract User createUser(Connection connection); String createUsername(String username, String providerId); - - /** - Checks whether the user associated with the provided Citesphere token has permission to access the given document. - @param document The document for which to check the user permission. - @param citesphereToken The Citesphere token for the user. - @return {@code true} if the user has permission to access the document, {@code false} otherwise. - */ - public abstract boolean isUserPermittedToAccessDocument(IDocument document, CitesphereToken citesphereToken); + } diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java index 4fe7d005..c515fab1 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelper.java @@ -5,11 +5,8 @@ import org.springframework.social.connect.UserProfile; import org.springframework.stereotype.Service; -import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; -import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.users.AccountStatus; -import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; import edu.asu.diging.gilesecosystem.web.core.users.IUserManager; import edu.asu.diging.gilesecosystem.web.core.users.User; @@ -52,13 +49,4 @@ public User createUser(Connection connection) { public String createUsername(String username, String providerId) { return username + "_" + providerId; } - - @Override - public boolean isUserPermittedToAccessDocument(IDocument document, CitesphereToken citesphereToken) { - String username = document.getUsername(); - CitesphereUser user = (CitesphereUser) citesphereToken.getPrincipal(); - String usernameInSystem = createUsername(user.getUsername(), user.getAuthorizingClient()); - - return username.equals(usernameInSystem); - } } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java index f7e2451b..0f7c9510 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.StringWriter; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -23,13 +24,14 @@ import edu.asu.diging.gilesecosystem.util.properties.IPropertiesManager; import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; -import edu.asu.diging.gilesecosystem.web.config.IUserHelper; +import edu.asu.diging.gilesecosystem.web.core.citesphere.ICitesphereConnector; import edu.asu.diging.gilesecosystem.web.core.model.DocumentAccess; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.model.impl.Document; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; +import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; public class V2DeleteDocumentControllerTest { @@ -39,15 +41,15 @@ public class V2DeleteDocumentControllerTest { @Mock private ITransactionalDocumentService documentService; - @Mock - private IUserHelper userHelper; - @Mock private IPropertiesManager propertyManager; @Mock private IResponseHelper responseHelper; + @Mock + private ICitesphereConnector citesphereConnector; + @InjectMocks private V2DeleteDocumentController v2DeleteDocumentController; @@ -64,12 +66,13 @@ public void setUp() { v2DeleteDocumentController = new V2DeleteDocumentController(); MockitoAnnotations.initMocks(this); Mockito.when(propertyManager.getProperty(Properties.GILES_URL)).thenReturn("http://localhost:8085/giles/"); + Mockito.when(citesphereConnector.hasAccess(Mockito.anyString(), Mockito.anyString())).thenReturn(true); + CITESPHERE_TOKEN.setPrincipal(new CitesphereUser("testUser", "oauth", new ArrayList<>())); } @Test public void test_deleteDocument_success() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(true); Map msgs = new HashMap(); msgs.put("checkUrl", "http://localhost:8085/giles/api/v2/files/deletion/check/" + DOCUMENT_ID); Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.OK)); @@ -81,13 +84,13 @@ public void test_deleteDocument_success() { @Test public void test_deleteDocument_whenUserIsNotAuthorized() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(false); + Mockito.when(citesphereConnector.hasAccess(Mockito.anyString(), Mockito.anyString())).thenReturn(false); Map unauthorizedMsgs = new HashMap(); - unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document."); + unauthorizedMsgs.put("errorMsg", "User is not authorized to delete the document with id " + document.getId()); unauthorizedMsgs.put("errorCode", "401"); - Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.FORBIDDEN)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); - Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); + Assert.assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode()); } @Test @@ -114,7 +117,6 @@ public void test_checkDocumentDeletion_whenDocumentIsDeleted() { @Test public void test_checkDocumentDeletion_whenDocumentIsNotDeleted() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(true); Map msgs = new HashMap(); msgs.put("progressInfo", "Deletion in progress. Please check back later."); Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.OK)); @@ -125,13 +127,13 @@ public void test_checkDocumentDeletion_whenDocumentIsNotDeleted() { @Test public void test_checkDocumentDeletion_whenUserDoesNotHavePermissionToCheckDocumentStatus() { Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); - Mockito.when(userHelper.isUserPermittedToAccessDocument(document, CITESPHERE_TOKEN)).thenReturn(false); + Mockito.when(citesphereConnector.hasAccess(Mockito.anyString(), Mockito.anyString())).thenReturn(false); Map unauthorizedMsgs = new HashMap(); - unauthorizedMsgs.put("errorMsg", "User is not authorized to check status."); + unauthorizedMsgs.put("errorMsg", "User is not authorized to check status for document id " + document.getId()); unauthorizedMsgs.put("errorCode", "401"); - Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.UNAUTHORIZED)); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(unauthorizedMsgs, HttpStatus.FORBIDDEN)); ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); - Assert.assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode()); + Assert.assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode()); } private Document createDocument() { From 93f7d139acb685a0b1fffa3fbd62d27c173056b4 Mon Sep 17 00:00:00 2001 From: diya17 Date: Mon, 3 Jul 2023 10:32:08 -0700 Subject: [PATCH 10/24] [GECO-140] Final changes after using citesphere connector --- .../edu/asu/diging/gilesecosystem/web/config/IUserHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java index b981db55..237c07ba 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/config/IUserHelper.java @@ -10,4 +10,4 @@ public interface IUserHelper { String createUsername(String username, String providerId); -} +} \ No newline at end of file From 753ad10dbfa0a69ff1fb5a334715520e31005980 Mon Sep 17 00:00:00 2001 From: diya17 Date: Tue, 25 Jul 2023 16:59:05 -0700 Subject: [PATCH 11/24] [GECO-140] Changing Giles Deletion API and also saving Processing requests --- .../api/v2/V2DeleteDocumentController.java | 17 ++++++++++++++++ ...kaDeletionCompletionProcessingListner.java | 19 +++++++++++++++++- .../delete/impl/DeleteDocumentService.java | 20 +++++++++++++------ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index 8e6b859d..5f27d6cb 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -1,6 +1,7 @@ package edu.asu.diging.gilesecosystem.web.api.v2; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -14,13 +15,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import edu.asu.diging.gilesecosystem.requests.RequestStatus; import edu.asu.diging.gilesecosystem.util.properties.IPropertiesManager; import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; import edu.asu.diging.gilesecosystem.web.core.citesphere.ICitesphereConnector; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; +import edu.asu.diging.gilesecosystem.web.core.model.IProcessingRequest; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalProcessingRequestService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; @@ -45,6 +49,9 @@ public class V2DeleteDocumentController { @Autowired private ICitesphereConnector citesphereConnector; + + @Autowired + private ITransactionalProcessingRequestService processingRequestService; @Value("${giles_check_deletion_endpoint_v2}") private String checkDeleteEndpoint; @@ -85,6 +92,16 @@ public ResponseEntity checkDocumentDeletion(HttpServletRequest request, unauthorizedMsgs.put("errorCode", "403"); return responseHelper.generateResponse(unauthorizedMsgs, HttpStatus.FORBIDDEN); } + if (!document.getRequestId().isEmpty()) { + List pRequests = processingRequestService.getProcRequestsByRequestId(document.getRequestId()); + for (IProcessingRequest pReq : pRequests) { + if (pReq.getRequestStatus().equals(RequestStatus.FAILED)) { + Map deletionErrorMsg = new HashMap(); + deletionErrorMsg.put("progressInfo", "There was an error in deleting the document. Please try again."); + return responseHelper.generateResponse(deletionErrorMsg, HttpStatus.INTERNAL_SERVER_ERROR); + } + } + } Map msgs = new HashMap(); msgs.put("progressInfo", "Deletion in progress. Please check back later."); return responseHelper.generateResponse(msgs, HttpStatus.OK); diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListner.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListner.java index 6edcbf51..0fac3da9 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListner.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListner.java @@ -1,6 +1,7 @@ package edu.asu.diging.gilesecosystem.web.core.kafka; import java.io.IOException; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.PropertySource; @@ -15,7 +16,10 @@ import edu.asu.diging.gilesecosystem.requests.impl.CompletedStorageDeletionRequest; import edu.asu.diging.gilesecosystem.septemberutil.properties.MessageType; import edu.asu.diging.gilesecosystem.septemberutil.service.ISystemMessageHandler; +import edu.asu.diging.gilesecosystem.util.exceptions.UnstorableObjectException; +import edu.asu.diging.gilesecosystem.web.core.model.IProcessingRequest; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalProcessingRequestService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; @PropertySource("classpath:/config.properties") @@ -30,6 +34,9 @@ public class KafkaDeletionCompletionProcessingListner { @Autowired private ITransactionalDocumentService documentService; + @Autowired + private ITransactionalProcessingRequestService processingRequestService; + @KafkaListener(id = "giles.deletion.topic.listener", topics = "${topic_delete_storage_request_complete}") public void receiveDeletionCompletedMessageMessage(String message, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) { ObjectMapper mapper = new ObjectMapper(); @@ -40,7 +47,17 @@ public void receiveDeletionCompletedMessageMessage(String message, @Header(Kafka messageHandler.handleMessage("Could not unmarshall request.", e, MessageType.ERROR); return; } - if (request.getStatus() == RequestStatus.FAILED) { + if (request.getStatus().equals(RequestStatus.FAILED)) { + List pRequests = processingRequestService.getProcRequestsByRequestId(request.getRequestId()); + for (IProcessingRequest pReq : pRequests) { + pReq.setRequestStatus(request.getStatus()); + try { + processingRequestService.save(pReq); + } catch (UnstorableObjectException e) { + // should never happen + messageHandler.handleMessage("Could not store request.", e, MessageType.ERROR); + } + } return; } deleteDocumentService.deleteDocumentAfterStorageDeletion(documentService.getDocument(request.getDocumentId())); diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java index 4fec7082..c4175bf3 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java @@ -29,6 +29,8 @@ import edu.asu.diging.gilesecosystem.web.core.files.IFilesManager; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; import edu.asu.diging.gilesecosystem.web.core.model.IFile; +import edu.asu.diging.gilesecosystem.web.core.model.IProcessingRequest; +import edu.asu.diging.gilesecosystem.web.core.model.impl.ProcessingRequest; import edu.asu.diging.gilesecosystem.web.core.service.IFileTypeHandler; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalFileService; @@ -131,19 +133,21 @@ private IRequest createRequest(IDocument document) throws GilesProcessingExcepti IStorageDeletionRequest storageDeletionRequest = null; try { String requestId = documentService.generateRequestId(REQUEST_PREFIX); - storeRequestId(requestId, document); storageDeletionRequest = requestFactory.createRequest(requestId, document.getUploadId()); + storeRequestId(requestId, document); storageDeletionRequest.setDocumentId(document.getId()); } catch (InstantiationException | IllegalAccessException e) { throw new GilesProcessingException(e); - } + } + IProcessingRequest procReq = new ProcessingRequest(); + procReq.setRequestId(storageDeletionRequest.getRequestId()); + procReq.setDocumentId(document.getId()); + procReq.setSentRequest(storageDeletionRequest); + procReq.setRequestStatus(storageDeletionRequest.getStatus()); + processingRequestService.saveNewProcessingRequest(procReq); return storageDeletionRequest; } - private String getTopic() { - return propertyManager.getProperty(Properties.KAFKA_TOPIC_STORAGE_DELETION_REQUEST); - } - private void storeRequestId(String requestId, IDocument document) { document.setRequestId(requestId); try { @@ -152,4 +156,8 @@ private void storeRequestId(String requestId, IDocument document) { messageHandler.handleMessage("Could not store document.", e, MessageType.ERROR); } } + + private String getTopic() { + return propertyManager.getProperty(Properties.KAFKA_TOPIC_STORAGE_DELETION_REQUEST); + } } From 5a472cdb724a198e3d63ed75abb2b27c2a658180 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 28 Jul 2023 16:56:41 -0700 Subject: [PATCH 12/24] [GECO-140] Changes to API and processing requests --- .../gilesecosystem/web/api/v2/V2DeleteDocumentController.java | 2 +- .../web/core/service/delete/impl/DeleteDocumentService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java index 5f27d6cb..69a6d54a 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentController.java @@ -104,6 +104,6 @@ public ResponseEntity checkDocumentDeletion(HttpServletRequest request, } Map msgs = new HashMap(); msgs.put("progressInfo", "Deletion in progress. Please check back later."); - return responseHelper.generateResponse(msgs, HttpStatus.OK); + return responseHelper.generateResponse(msgs, HttpStatus.ACCEPTED); } } diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java index c4175bf3..2ca191a2 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java @@ -140,6 +140,7 @@ private IRequest createRequest(IDocument document) throws GilesProcessingExcepti throw new GilesProcessingException(e); } IProcessingRequest procReq = new ProcessingRequest(); + procReq.setRequestId(storageDeletionRequest.getRequestId()); procReq.setDocumentId(document.getId()); procReq.setSentRequest(storageDeletionRequest); From bc32897a6106a05109af88402dd39202f31dae9f Mon Sep 17 00:00:00 2001 From: diya17 Date: Mon, 31 Jul 2023 17:00:03 -0700 Subject: [PATCH 13/24] [GECO-140] Adding storage deletion request to orm.xml --- giles-eco/src/main/resources/META-INF/hibernate/orm.xml | 3 +++ giles-eco/src/main/resources/META-INF/orm.xml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/giles-eco/src/main/resources/META-INF/hibernate/orm.xml b/giles-eco/src/main/resources/META-INF/hibernate/orm.xml index 6accaf89..88b8686e 100644 --- a/giles-eco/src/main/resources/META-INF/hibernate/orm.xml +++ b/giles-eco/src/main/resources/META-INF/hibernate/orm.xml @@ -77,6 +77,9 @@ + + + diff --git a/giles-eco/src/main/resources/META-INF/orm.xml b/giles-eco/src/main/resources/META-INF/orm.xml index 875dd4ee..fbc00116 100644 --- a/giles-eco/src/main/resources/META-INF/orm.xml +++ b/giles-eco/src/main/resources/META-INF/orm.xml @@ -28,6 +28,8 @@ + + From 0379d099f9799c7825bbf4db94588f741ff3e63b Mon Sep 17 00:00:00 2001 From: diya17 Date: Tue, 1 Aug 2023 16:51:43 -0700 Subject: [PATCH 14/24] [GECO-140] Setting request status for storage deletion in processing request --- .../web/core/service/delete/impl/DeleteDocumentService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java index 2ca191a2..bdc96d42 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java @@ -17,6 +17,7 @@ import edu.asu.diging.gilesecosystem.requests.IRequest; import edu.asu.diging.gilesecosystem.requests.IRequestFactory; import edu.asu.diging.gilesecosystem.requests.IStorageDeletionRequest; +import edu.asu.diging.gilesecosystem.requests.RequestStatus; import edu.asu.diging.gilesecosystem.requests.exceptions.MessageCreationException; import edu.asu.diging.gilesecosystem.requests.impl.StorageDeletionRequest; import edu.asu.diging.gilesecosystem.requests.kafka.IRequestProducer; @@ -136,6 +137,7 @@ private IRequest createRequest(IDocument document) throws GilesProcessingExcepti storageDeletionRequest = requestFactory.createRequest(requestId, document.getUploadId()); storeRequestId(requestId, document); storageDeletionRequest.setDocumentId(document.getId()); + storageDeletionRequest.setStatus(RequestStatus.NEW); } catch (InstantiationException | IllegalAccessException e) { throw new GilesProcessingException(e); } From ebcdfd1bd6751f95bb02f1e4b622961f219f42c8 Mon Sep 17 00:00:00 2001 From: diya17 Date: Wed, 2 Aug 2023 16:59:30 -0700 Subject: [PATCH 15/24] [GECO-140] Deleting requests for document initial commit --- .../core/files/IRequestDatabaseClient.java | 5 +++++ .../files/impl/RequestDatabaseClient.java | 22 +++++++++++++++++++ .../core/repository/RequestRepository.java | 11 ++++++++++ .../core/ITransactionalRequestService.java | 5 +++++ .../impl/TranscationalRequestService.java | 18 +++++++++++++++ .../delete/impl/DeleteDocumentService.java | 9 ++++++++ 6 files changed, 70 insertions(+) create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/repository/RequestRepository.java create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java create mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java new file mode 100644 index 00000000..81526d7f --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java @@ -0,0 +1,5 @@ +package edu.asu.diging.gilesecosystem.web.core.files; + +public interface IRequestDatabaseClient { + public void deleteRequestsByDocumentId(String documentId); +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java new file mode 100644 index 00000000..97132cb2 --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java @@ -0,0 +1,22 @@ +package edu.asu.diging.gilesecosystem.web.core.files.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import edu.asu.diging.gilesecosystem.web.core.files.IRequestDatabaseClient; +import edu.asu.diging.gilesecosystem.web.core.repository.RequestRepository; + +@Component +public class RequestDatabaseClient implements IRequestDatabaseClient { + @Autowired + private final RequestRepository requestRepository; + + @Autowired + public RequestDatabaseClient(RequestRepository requestRepository) { + this.requestRepository = requestRepository; + } + + public void deleteRequestsByDocumentId(String documentId) { + requestRepository.deleteByDocumentId(documentId); + } +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/repository/RequestRepository.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/repository/RequestRepository.java new file mode 100644 index 00000000..8e235b18 --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/repository/RequestRepository.java @@ -0,0 +1,11 @@ +package edu.asu.diging.gilesecosystem.web.core.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import edu.asu.diging.gilesecosystem.requests.impl.Request; + +@Repository +public interface RequestRepository extends JpaRepository { + void deleteByDocumentId(String documentId); +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java new file mode 100644 index 00000000..5a2b888b --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java @@ -0,0 +1,5 @@ +package edu.asu.diging.gilesecosystem.web.core.service.core; + +public interface ITransactionalRequestService { + public void deleteRequestsByDocumentId(String documentId); +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java new file mode 100644 index 00000000..73589c40 --- /dev/null +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java @@ -0,0 +1,18 @@ +package edu.asu.diging.gilesecosystem.web.core.service.core.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import edu.asu.diging.gilesecosystem.web.core.files.IRequestDatabaseClient; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalRequestService; + +@Service +public class TranscationalRequestService implements ITransactionalRequestService { + @Autowired + private IRequestDatabaseClient requestDatabaseClient; + + @Override + public void deleteRequestsByDocumentId(String documentId) { + requestDatabaseClient.deleteRequestsByDocumentId(documentId); + } +} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java index bdc96d42..3ede051a 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java @@ -36,6 +36,7 @@ import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalFileService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalProcessingRequestService; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalRequestService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalUploadService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; @@ -76,6 +77,9 @@ public class DeleteDocumentService implements IDeleteDocumentService { @Autowired private ITransactionalProcessingRequestService processingRequestService; + @Autowired + private ITransactionalRequestService requestService; + private Map fileTypes; @PostConstruct @@ -111,6 +115,7 @@ public void deleteDocument(IDocument document) { public void deleteDocumentAfterStorageDeletion(IDocument document) { processDeleteFilesOfDocument(document); processDeleteProcessingRequestsOfDocument(document); + processDeleteRequestsOfDocument(document); documentService.deleteDocument(document.getId()); processDeleteUploadOfDocument(document.getUploadId()); } @@ -163,4 +168,8 @@ private void storeRequestId(String requestId, IDocument document) { private String getTopic() { return propertyManager.getProperty(Properties.KAFKA_TOPIC_STORAGE_DELETION_REQUEST); } + + private void processDeleteRequestsOfDocument(IDocument document) { + requestService.deleteRequestsByDocumentId(document.getId()); + } } From 1001a557b0ea84db2e2a6bcc40cef19766421738 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 4 Aug 2023 16:44:54 -0700 Subject: [PATCH 16/24] [GECO-140] Deleting requests --- .../files/impl/RequestDatabaseClient.java | 12 ++++- .../v2/V2DeleteDocumentControllerTest.java | 24 ++++++++++ .../web/config/impl/UserHelperTest.java | 44 ------------------- 3 files changed, 35 insertions(+), 45 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java index 97132cb2..d897237c 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java @@ -1,13 +1,23 @@ package edu.asu.diging.gilesecosystem.web.core.files.impl; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import edu.asu.diging.gilesecosystem.util.store.objectdb.DatabaseClient; import edu.asu.diging.gilesecosystem.web.core.files.IRequestDatabaseClient; import edu.asu.diging.gilesecosystem.web.core.repository.RequestRepository; +@Transactional @Component -public class RequestDatabaseClient implements IRequestDatabaseClient { +public class RequestDatabaseClient extends DatabaseClient implements IRequestDatabaseClient { + + @PersistenceContext(unitName="entityManagerFactory") + private EntityManager em; + @Autowired private final RequestRepository requestRepository; diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java index 0f7c9510..54b8e52b 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/api/v2/V2DeleteDocumentControllerTest.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.junit.Assert; @@ -21,14 +22,18 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.node.ObjectNode; +import edu.asu.diging.gilesecosystem.requests.RequestStatus; import edu.asu.diging.gilesecosystem.util.properties.IPropertiesManager; import edu.asu.diging.gilesecosystem.web.api.util.IResponseHelper; import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.core.citesphere.ICitesphereConnector; import edu.asu.diging.gilesecosystem.web.core.model.DocumentAccess; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; +import edu.asu.diging.gilesecosystem.web.core.model.IProcessingRequest; import edu.asu.diging.gilesecosystem.web.core.model.impl.Document; +import edu.asu.diging.gilesecosystem.web.core.model.impl.ProcessingRequest; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalProcessingRequestService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.properties.Properties; import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; @@ -50,6 +55,9 @@ public class V2DeleteDocumentControllerTest { @Mock private ICitesphereConnector citesphereConnector; + @Mock + private ITransactionalProcessingRequestService processingRequestService; + @InjectMocks private V2DeleteDocumentController v2DeleteDocumentController; @@ -136,6 +144,21 @@ public void test_checkDocumentDeletion_whenUserDoesNotHavePermissionToCheckDocum Assert.assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode()); } + @Test + public void test_checkDocumentDeletion_whenDeletionFailed() { + Mockito.when(documentService.getDocument(DOCUMENT_ID)).thenReturn(document); + Map msgs = new HashMap(); + msgs.put("progressInfo", "Deletion in progress. Please check back later."); + Mockito.when(responseHelper.generateResponse(Mockito.anyMap(), Mockito.any(HttpStatus.class))).thenReturn(generateResponse(msgs, HttpStatus.INTERNAL_SERVER_ERROR)); + IProcessingRequest procRequest = new ProcessingRequest(); + procRequest.setRequestStatus(RequestStatus.FAILED); + List procList = new ArrayList(); + procList.add(procRequest); + Mockito.when(processingRequestService.getProcRequestsByRequestId(Mockito.anyString())).thenReturn(procList); + ResponseEntity response = v2DeleteDocumentController.deleteDocument(DOCUMENT_ID, CITESPHERE_TOKEN); + Assert.assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); + } + private Document createDocument() { Document document = new Document(); document.setId(DOCUMENT_ID); @@ -143,6 +166,7 @@ private Document createDocument() { document.setFileIds(Arrays.asList(FILE_ID)); document.setUploadId(UPLOAD_ID); document.setUploadedFileId(FILE_ID); + document.setRequestId("REQ123"); return document; } diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java index e8a9dbde..dbbdcdb8 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/config/impl/UserHelperTest.java @@ -1,7 +1,5 @@ package edu.asu.diging.gilesecosystem.web.config.impl; -import java.util.Arrays; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -13,13 +11,8 @@ import org.springframework.social.connect.ConnectionKey; import org.springframework.social.connect.UserProfile; -import edu.asu.diging.gilesecosystem.web.config.CitesphereToken; import edu.asu.diging.gilesecosystem.web.config.IUserHelper; -import edu.asu.diging.gilesecosystem.web.core.model.DocumentAccess; -import edu.asu.diging.gilesecosystem.web.core.model.IDocument; -import edu.asu.diging.gilesecosystem.web.core.model.impl.Document; import edu.asu.diging.gilesecosystem.web.core.users.AccountStatus; -import edu.asu.diging.gilesecosystem.web.core.users.CitesphereUser; import edu.asu.diging.gilesecosystem.web.core.users.IUserManager; import edu.asu.diging.gilesecosystem.web.core.users.User; @@ -32,11 +25,6 @@ public class UserHelperTest { @InjectMocks private IUserHelper helperToTest; private String USER_ID = "user_id"; - private String DOCUMENT_ID = "documentId"; - private DocumentAccess access = DocumentAccess.PRIVATE; - private String FILE_ID = "fileId"; - private String UPLOAD_ID = "uploadId"; - private CitesphereToken citesphereToken = new CitesphereToken("71b9cc36-939d-4e28-89e9-e5bfca1b26c3"); @Before public void setUp() { @@ -107,36 +95,4 @@ public void test_createUser_userExists() { Assert.assertEquals(PROVIDER_USER_ID, createdUser.getUserIdOfProvider()); Assert.assertEquals(AccountStatus.ADDED, createdUser.getAccountStatus()); } - - @Test - public void test_isUserPermittedToAccessDocument_whenUserIsAllowedToAccessDocument() { - IDocument document = createDocument(); - citesphereToken.setPrincipal(createCitesphereUser("dab")); - Assert.assertTrue(helperToTest.isUserPermittedToAccessDocument(document, citesphereToken)); - } - - @Test - public void test_isUserPermittedToAccessDocument_whenUserIsNotAllowedToAccessDocument() { - IDocument document = createDocument(); - citesphereToken.setPrincipal(createCitesphereUser("test1")); - Assert.assertFalse(helperToTest.isUserPermittedToAccessDocument(document, citesphereToken)); - } - - private Document createDocument() { - Document document = new Document(); - document.setId(DOCUMENT_ID); - document.setAccess(access); - document.setFileIds(Arrays.asList(FILE_ID)); - document.setUploadId(UPLOAD_ID); - document.setUploadedFileId(FILE_ID); - document.setUsername("dab_citesphere"); - return document; - } - - private CitesphereUser createCitesphereUser(String userName) { - CitesphereUser user = new CitesphereUser(); - user.setAuthorizingClient("citesphere"); - user.setUsername(userName); - return user; - } } From 8b50bf9a4d29ba7b588ad2eaf3c126a938f91aae Mon Sep 17 00:00:00 2001 From: diya17 Date: Mon, 7 Aug 2023 16:24:54 -0400 Subject: [PATCH 17/24] [GECO-140] Modifying request client to use spring data and modifying tests for service --- .../core/files/impl/RequestDatabaseClient.java | 16 ++-------------- .../delete/impl/DeleteDocumentServiceTest.java | 4 ++++ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java index d897237c..89d51056 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java @@ -1,30 +1,18 @@ package edu.asu.diging.gilesecosystem.web.core.files.impl; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import edu.asu.diging.gilesecosystem.util.store.objectdb.DatabaseClient; import edu.asu.diging.gilesecosystem.web.core.files.IRequestDatabaseClient; import edu.asu.diging.gilesecosystem.web.core.repository.RequestRepository; @Transactional @Component -public class RequestDatabaseClient extends DatabaseClient implements IRequestDatabaseClient { - - @PersistenceContext(unitName="entityManagerFactory") - private EntityManager em; +public class RequestDatabaseClient implements IRequestDatabaseClient { @Autowired - private final RequestRepository requestRepository; - - @Autowired - public RequestDatabaseClient(RequestRepository requestRepository) { - this.requestRepository = requestRepository; - } + private RequestRepository requestRepository; public void deleteRequestsByDocumentId(String documentId) { requestRepository.deleteByDocumentId(documentId); diff --git a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/service/delete/impl/DeleteDocumentServiceTest.java b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/service/delete/impl/DeleteDocumentServiceTest.java index 7e236758..cb2c8652 100644 --- a/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/service/delete/impl/DeleteDocumentServiceTest.java +++ b/giles-eco/src/test/java/edu/asu/diging/gilesecosystem/web/service/delete/impl/DeleteDocumentServiceTest.java @@ -33,6 +33,7 @@ import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalFileService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalProcessingRequestService; +import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalRequestService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalUploadService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.delete.impl.DeleteDocumentService; @@ -69,6 +70,9 @@ public class DeleteDocumentServiceTest { @Mock private ITransactionalProcessingRequestService processingRequestService; + @Mock + private ITransactionalRequestService requestService; + @InjectMocks private IDeleteDocumentService factoryToTest; From 984f9f5948bc4b493a98ed0e23dbb4de336d31e0 Mon Sep 17 00:00:00 2001 From: Julia Damerow Date: Fri, 29 Mar 2024 16:08:15 -0400 Subject: [PATCH 18/24] Fix path to jsp --- .../gilesecosystem/web/web/admin/RegisteredAppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java index 3b8d4788..17914b8d 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java @@ -36,6 +36,6 @@ public String showApp(Model model, @PathVariable String id) { model.addAttribute("providerName", providerRegistry.getProviderName(app.getProviderId())); model.addAttribute("app", app); - return "admin/apps/app"; + return "admin/app"; } } From da5e90c9338ca07b974b2d820a16b53c84c3a11a Mon Sep 17 00:00:00 2001 From: Julia Damerow Date: Fri, 29 Mar 2024 17:07:07 -0400 Subject: [PATCH 19/24] undo change --- .../gilesecosystem/web/web/admin/RegisteredAppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java index 17914b8d..3b8d4788 100755 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/web/admin/RegisteredAppController.java @@ -36,6 +36,6 @@ public String showApp(Model model, @PathVariable String id) { model.addAttribute("providerName", providerRegistry.getProviderName(app.getProviderId())); model.addAttribute("app", app); - return "admin/app"; + return "admin/apps/app"; } } From 540321427a90422c1827e9563bb26e8bd670e257 Mon Sep 17 00:00:00 2001 From: diya17 Date: Wed, 10 Apr 2024 14:15:03 -0700 Subject: [PATCH 20/24] Merge branch 'story/GECO-139' into story/GECO-140 --- .../delete/impl/DeleteDocumentService.java | 47 +- .../WEB-INF/views/uploads/showDocument.jsp | 44 +- .../main/webapp/resources/notify/animate.css | 3623 +++++++++++++++++ .../resources/notify/bootstrap-notify.min.js | 2 + 4 files changed, 3659 insertions(+), 57 deletions(-) create mode 100644 giles-eco/src/main/webapp/resources/notify/animate.css create mode 100644 giles-eco/src/main/webapp/resources/notify/bootstrap-notify.min.js diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java index 93f5e1a0..92513f87 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java @@ -1,11 +1,5 @@ package edu.asu.diging.gilesecosystem.web.core.service.delete.impl; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +7,6 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import edu.asu.diging.gilesecosystem.requests.FileType; import edu.asu.diging.gilesecosystem.requests.IRequest; import edu.asu.diging.gilesecosystem.requests.IRequestFactory; import edu.asu.diging.gilesecosystem.requests.IStorageDeletionRequest; @@ -26,13 +19,7 @@ import edu.asu.diging.gilesecosystem.util.exceptions.UnstorableObjectException; import edu.asu.diging.gilesecosystem.util.properties.IPropertiesManager; import edu.asu.diging.gilesecosystem.web.core.exceptions.GilesProcessingException; -import edu.asu.diging.gilesecosystem.web.core.files.IDocumentDatabaseClient; -import edu.asu.diging.gilesecosystem.web.core.files.IFilesManager; import edu.asu.diging.gilesecosystem.web.core.model.IDocument; -import edu.asu.diging.gilesecosystem.web.core.model.IFile; -import edu.asu.diging.gilesecosystem.web.core.model.IProcessingRequest; -import edu.asu.diging.gilesecosystem.web.core.model.impl.ProcessingRequest; -import edu.asu.diging.gilesecosystem.web.core.service.IFileTypeHandler; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalFileService; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalProcessingRequestService; @@ -76,27 +63,9 @@ public class DeleteDocumentService implements IDeleteDocumentService { @Autowired private ITransactionalProcessingRequestService processingRequestService; - - @Autowired - private ITransactionalRequestService requestService; - - private Map fileTypes; - + @PostConstruct public void init() { - fileTypes = new HashMap(); - - // register what content types should be treated as what file type - Map ctxMap = ctx.getBeansOfType(IFileTypeHandler.class); - Iterator> iter = ctxMap.entrySet().iterator(); - - while(iter.hasNext()){ - Entry handlerEntry = iter.next(); - IFileTypeHandler handler = (IFileTypeHandler) handlerEntry.getValue(); - for (String type : handler.getHandledFileTypes()) { - fileTypes.put(type, handler.getHandledFileType()); - } - } requestFactory.config(StorageDeletionRequest.class); } @@ -104,25 +73,17 @@ public void init() { @Async public void initiateDeletion(IDocument document) throws GilesProcessingException, MessageCreationException { IRequest storageDeletionRequest = createRequest(document); - requestProducer.sendRequest(storageDeletionRequest, getTopic()); + requestProducer.sendRequest(storageDeletionRequest, propertyManager.getProperty(Properties.KAFKA_TOPIC_STORAGE_DELETION_REQUEST)); } @Override public void completeDeletion(IDocument document) { - deleteFiles(document); - deleteProcessingRequests(document); + fileService.deleteFiles(document.getId()); + processingRequestService.deleteRequestsByDocumentId(document.getId()); documentService.deleteDocument(document.getId()); deleteUpload(document.getUploadId()); } - private void deleteProcessingRequests(IDocument document) { - processingRequestService.deleteRequestsByDocumentId(document.getId()); - } - - private void deleteFiles(IDocument document) { - fileService.deleteFiles(document.getId()); - } - private void deleteUpload(String uploadId) { // if an upload has multiple documents and only one of the documents is deleted the upload does not have to be deleted. if(documentService.getDocumentsByUploadId(uploadId).isEmpty()) { diff --git a/giles-eco/src/main/webapp/WEB-INF/views/uploads/showDocument.jsp b/giles-eco/src/main/webapp/WEB-INF/views/uploads/showDocument.jsp index ae9d0442..6f43ba3c 100755 --- a/giles-eco/src/main/webapp/WEB-INF/views/uploads/showDocument.jsp +++ b/giles-eco/src/main/webapp/WEB-INF/views/uploads/showDocument.jsp @@ -1,5 +1,6 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%> +
  1. Upload
    2. @@ -176,18 +177,33 @@ diff --git a/giles-eco/src/main/webapp/resources/notify/animate.css b/giles-eco/src/main/webapp/resources/notify/animate.css new file mode 100644 index 00000000..b74a0214 --- /dev/null +++ b/giles-eco/src/main/webapp/resources/notify/animate.css @@ -0,0 +1,3623 @@ +@charset "UTF-8"; + +/*! + * animate.css -http://daneden.me/animate + * Version - 3.7.0 + * Licensed under the MIT license - http://opensource.org/licenses/MIT + * + * Copyright (c) 2018 Daniel Eden + */ + +@-webkit-keyframes bounce { + from, + 20%, + 53%, + 80%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 40%, + 43% { + -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + -webkit-transform: translate3d(0, -30px, 0); + transform: translate3d(0, -30px, 0); + } + + 70% { + -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + -webkit-transform: translate3d(0, -15px, 0); + transform: translate3d(0, -15px, 0); + } + + 90% { + -webkit-transform: translate3d(0, -4px, 0); + transform: translate3d(0, -4px, 0); + } +} + +@keyframes bounce { + from, + 20%, + 53%, + 80%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 40%, + 43% { + -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + -webkit-transform: translate3d(0, -30px, 0); + transform: translate3d(0, -30px, 0); + } + + 70% { + -webkit-animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + -webkit-transform: translate3d(0, -15px, 0); + transform: translate3d(0, -15px, 0); + } + + 90% { + -webkit-transform: translate3d(0, -4px, 0); + transform: translate3d(0, -4px, 0); + } +} + +.bounce { + -webkit-animation-name: bounce; + animation-name: bounce; + -webkit-transform-origin: center bottom; + transform-origin: center bottom; +} + +@-webkit-keyframes flash { + from, + 50%, + to { + opacity: 1; + } + + 25%, + 75% { + opacity: 0; + } +} + +@keyframes flash { + from, + 50%, + to { + opacity: 1; + } + + 25%, + 75% { + opacity: 0; + } +} + +.flash { + -webkit-animation-name: flash; + animation-name: flash; +} + +/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */ + +@-webkit-keyframes pulse { + from { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } + + 50% { + -webkit-transform: scale3d(1.05, 1.05, 1.05); + transform: scale3d(1.05, 1.05, 1.05); + } + + to { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +@keyframes pulse { + from { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } + + 50% { + -webkit-transform: scale3d(1.05, 1.05, 1.05); + transform: scale3d(1.05, 1.05, 1.05); + } + + to { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +.pulse { + -webkit-animation-name: pulse; + animation-name: pulse; +} + +@-webkit-keyframes rubberBand { + from { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } + + 30% { + -webkit-transform: scale3d(1.25, 0.75, 1); + transform: scale3d(1.25, 0.75, 1); + } + + 40% { + -webkit-transform: scale3d(0.75, 1.25, 1); + transform: scale3d(0.75, 1.25, 1); + } + + 50% { + -webkit-transform: scale3d(1.15, 0.85, 1); + transform: scale3d(1.15, 0.85, 1); + } + + 65% { + -webkit-transform: scale3d(0.95, 1.05, 1); + transform: scale3d(0.95, 1.05, 1); + } + + 75% { + -webkit-transform: scale3d(1.05, 0.95, 1); + transform: scale3d(1.05, 0.95, 1); + } + + to { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +@keyframes rubberBand { + from { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } + + 30% { + -webkit-transform: scale3d(1.25, 0.75, 1); + transform: scale3d(1.25, 0.75, 1); + } + + 40% { + -webkit-transform: scale3d(0.75, 1.25, 1); + transform: scale3d(0.75, 1.25, 1); + } + + 50% { + -webkit-transform: scale3d(1.15, 0.85, 1); + transform: scale3d(1.15, 0.85, 1); + } + + 65% { + -webkit-transform: scale3d(0.95, 1.05, 1); + transform: scale3d(0.95, 1.05, 1); + } + + 75% { + -webkit-transform: scale3d(1.05, 0.95, 1); + transform: scale3d(1.05, 0.95, 1); + } + + to { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +.rubberBand { + -webkit-animation-name: rubberBand; + animation-name: rubberBand; +} + +@-webkit-keyframes shake { + from, + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 10%, + 30%, + 50%, + 70%, + 90% { + -webkit-transform: translate3d(-10px, 0, 0); + transform: translate3d(-10px, 0, 0); + } + + 20%, + 40%, + 60%, + 80% { + -webkit-transform: translate3d(10px, 0, 0); + transform: translate3d(10px, 0, 0); + } +} + +@keyframes shake { + from, + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 10%, + 30%, + 50%, + 70%, + 90% { + -webkit-transform: translate3d(-10px, 0, 0); + transform: translate3d(-10px, 0, 0); + } + + 20%, + 40%, + 60%, + 80% { + -webkit-transform: translate3d(10px, 0, 0); + transform: translate3d(10px, 0, 0); + } +} + +.shake { + -webkit-animation-name: shake; + animation-name: shake; +} + +@-webkit-keyframes headShake { + 0% { + -webkit-transform: translateX(0); + transform: translateX(0); + } + + 6.5% { + -webkit-transform: translateX(-6px) rotateY(-9deg); + transform: translateX(-6px) rotateY(-9deg); + } + + 18.5% { + -webkit-transform: translateX(5px) rotateY(7deg); + transform: translateX(5px) rotateY(7deg); + } + + 31.5% { + -webkit-transform: translateX(-3px) rotateY(-5deg); + transform: translateX(-3px) rotateY(-5deg); + } + + 43.5% { + -webkit-transform: translateX(2px) rotateY(3deg); + transform: translateX(2px) rotateY(3deg); + } + + 50% { + -webkit-transform: translateX(0); + transform: translateX(0); + } +} + +@keyframes headShake { + 0% { + -webkit-transform: translateX(0); + transform: translateX(0); + } + + 6.5% { + -webkit-transform: translateX(-6px) rotateY(-9deg); + transform: translateX(-6px) rotateY(-9deg); + } + + 18.5% { + -webkit-transform: translateX(5px) rotateY(7deg); + transform: translateX(5px) rotateY(7deg); + } + + 31.5% { + -webkit-transform: translateX(-3px) rotateY(-5deg); + transform: translateX(-3px) rotateY(-5deg); + } + + 43.5% { + -webkit-transform: translateX(2px) rotateY(3deg); + transform: translateX(2px) rotateY(3deg); + } + + 50% { + -webkit-transform: translateX(0); + transform: translateX(0); + } +} + +.headShake { + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; + -webkit-animation-name: headShake; + animation-name: headShake; +} + +@-webkit-keyframes swing { + 20% { + -webkit-transform: rotate3d(0, 0, 1, 15deg); + transform: rotate3d(0, 0, 1, 15deg); + } + + 40% { + -webkit-transform: rotate3d(0, 0, 1, -10deg); + transform: rotate3d(0, 0, 1, -10deg); + } + + 60% { + -webkit-transform: rotate3d(0, 0, 1, 5deg); + transform: rotate3d(0, 0, 1, 5deg); + } + + 80% { + -webkit-transform: rotate3d(0, 0, 1, -5deg); + transform: rotate3d(0, 0, 1, -5deg); + } + + to { + -webkit-transform: rotate3d(0, 0, 1, 0deg); + transform: rotate3d(0, 0, 1, 0deg); + } +} + +@keyframes swing { + 20% { + -webkit-transform: rotate3d(0, 0, 1, 15deg); + transform: rotate3d(0, 0, 1, 15deg); + } + + 40% { + -webkit-transform: rotate3d(0, 0, 1, -10deg); + transform: rotate3d(0, 0, 1, -10deg); + } + + 60% { + -webkit-transform: rotate3d(0, 0, 1, 5deg); + transform: rotate3d(0, 0, 1, 5deg); + } + + 80% { + -webkit-transform: rotate3d(0, 0, 1, -5deg); + transform: rotate3d(0, 0, 1, -5deg); + } + + to { + -webkit-transform: rotate3d(0, 0, 1, 0deg); + transform: rotate3d(0, 0, 1, 0deg); + } +} + +.swing { + -webkit-transform-origin: top center; + transform-origin: top center; + -webkit-animation-name: swing; + animation-name: swing; +} + +@-webkit-keyframes tada { + from { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } + + 10%, + 20% { + -webkit-transform: scale3d(0.9, 0.9, 0.9) rotate3d(0, 0, 1, -3deg); + transform: scale3d(0.9, 0.9, 0.9) rotate3d(0, 0, 1, -3deg); + } + + 30%, + 50%, + 70%, + 90% { + -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg); + transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg); + } + + 40%, + 60%, + 80% { + -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg); + transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg); + } + + to { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +@keyframes tada { + from { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } + + 10%, + 20% { + -webkit-transform: scale3d(0.9, 0.9, 0.9) rotate3d(0, 0, 1, -3deg); + transform: scale3d(0.9, 0.9, 0.9) rotate3d(0, 0, 1, -3deg); + } + + 30%, + 50%, + 70%, + 90% { + -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg); + transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg); + } + + 40%, + 60%, + 80% { + -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg); + transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg); + } + + to { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +.tada { + -webkit-animation-name: tada; + animation-name: tada; +} + +/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */ + +@-webkit-keyframes wobble { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 15% { + -webkit-transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg); + transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg); + } + + 30% { + -webkit-transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg); + transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg); + } + + 45% { + -webkit-transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg); + transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg); + } + + 60% { + -webkit-transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg); + transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg); + } + + 75% { + -webkit-transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg); + transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes wobble { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 15% { + -webkit-transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg); + transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg); + } + + 30% { + -webkit-transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg); + transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg); + } + + 45% { + -webkit-transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg); + transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg); + } + + 60% { + -webkit-transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg); + transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg); + } + + 75% { + -webkit-transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg); + transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.wobble { + -webkit-animation-name: wobble; + animation-name: wobble; +} + +@-webkit-keyframes jello { + from, + 11.1%, + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 22.2% { + -webkit-transform: skewX(-12.5deg) skewY(-12.5deg); + transform: skewX(-12.5deg) skewY(-12.5deg); + } + + 33.3% { + -webkit-transform: skewX(6.25deg) skewY(6.25deg); + transform: skewX(6.25deg) skewY(6.25deg); + } + + 44.4% { + -webkit-transform: skewX(-3.125deg) skewY(-3.125deg); + transform: skewX(-3.125deg) skewY(-3.125deg); + } + + 55.5% { + -webkit-transform: skewX(1.5625deg) skewY(1.5625deg); + transform: skewX(1.5625deg) skewY(1.5625deg); + } + + 66.6% { + -webkit-transform: skewX(-0.78125deg) skewY(-0.78125deg); + transform: skewX(-0.78125deg) skewY(-0.78125deg); + } + + 77.7% { + -webkit-transform: skewX(0.390625deg) skewY(0.390625deg); + transform: skewX(0.390625deg) skewY(0.390625deg); + } + + 88.8% { + -webkit-transform: skewX(-0.1953125deg) skewY(-0.1953125deg); + transform: skewX(-0.1953125deg) skewY(-0.1953125deg); + } +} + +@keyframes jello { + from, + 11.1%, + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + 22.2% { + -webkit-transform: skewX(-12.5deg) skewY(-12.5deg); + transform: skewX(-12.5deg) skewY(-12.5deg); + } + + 33.3% { + -webkit-transform: skewX(6.25deg) skewY(6.25deg); + transform: skewX(6.25deg) skewY(6.25deg); + } + + 44.4% { + -webkit-transform: skewX(-3.125deg) skewY(-3.125deg); + transform: skewX(-3.125deg) skewY(-3.125deg); + } + + 55.5% { + -webkit-transform: skewX(1.5625deg) skewY(1.5625deg); + transform: skewX(1.5625deg) skewY(1.5625deg); + } + + 66.6% { + -webkit-transform: skewX(-0.78125deg) skewY(-0.78125deg); + transform: skewX(-0.78125deg) skewY(-0.78125deg); + } + + 77.7% { + -webkit-transform: skewX(0.390625deg) skewY(0.390625deg); + transform: skewX(0.390625deg) skewY(0.390625deg); + } + + 88.8% { + -webkit-transform: skewX(-0.1953125deg) skewY(-0.1953125deg); + transform: skewX(-0.1953125deg) skewY(-0.1953125deg); + } +} + +.jello { + -webkit-animation-name: jello; + animation-name: jello; + -webkit-transform-origin: center; + transform-origin: center; +} + +@-webkit-keyframes heartBeat { + 0% { + -webkit-transform: scale(1); + transform: scale(1); + } + + 14% { + -webkit-transform: scale(1.3); + transform: scale(1.3); + } + + 28% { + -webkit-transform: scale(1); + transform: scale(1); + } + + 42% { + -webkit-transform: scale(1.3); + transform: scale(1.3); + } + + 70% { + -webkit-transform: scale(1); + transform: scale(1); + } +} + +@keyframes heartBeat { + 0% { + -webkit-transform: scale(1); + transform: scale(1); + } + + 14% { + -webkit-transform: scale(1.3); + transform: scale(1.3); + } + + 28% { + -webkit-transform: scale(1); + transform: scale(1); + } + + 42% { + -webkit-transform: scale(1.3); + transform: scale(1.3); + } + + 70% { + -webkit-transform: scale(1); + transform: scale(1); + } +} + +.heartBeat { + -webkit-animation-name: heartBeat; + animation-name: heartBeat; + -webkit-animation-duration: 1.3s; + animation-duration: 1.3s; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; +} + +@-webkit-keyframes bounceIn { + from, + 20%, + 40%, + 60%, + 80%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + 0% { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } + + 20% { + -webkit-transform: scale3d(1.1, 1.1, 1.1); + transform: scale3d(1.1, 1.1, 1.1); + } + + 40% { + -webkit-transform: scale3d(0.9, 0.9, 0.9); + transform: scale3d(0.9, 0.9, 0.9); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(1.03, 1.03, 1.03); + transform: scale3d(1.03, 1.03, 1.03); + } + + 80% { + -webkit-transform: scale3d(0.97, 0.97, 0.97); + transform: scale3d(0.97, 0.97, 0.97); + } + + to { + opacity: 1; + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +@keyframes bounceIn { + from, + 20%, + 40%, + 60%, + 80%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + 0% { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } + + 20% { + -webkit-transform: scale3d(1.1, 1.1, 1.1); + transform: scale3d(1.1, 1.1, 1.1); + } + + 40% { + -webkit-transform: scale3d(0.9, 0.9, 0.9); + transform: scale3d(0.9, 0.9, 0.9); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(1.03, 1.03, 1.03); + transform: scale3d(1.03, 1.03, 1.03); + } + + 80% { + -webkit-transform: scale3d(0.97, 0.97, 0.97); + transform: scale3d(0.97, 0.97, 0.97); + } + + to { + opacity: 1; + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); + } +} + +.bounceIn { + -webkit-animation-duration: 0.75s; + animation-duration: 0.75s; + -webkit-animation-name: bounceIn; + animation-name: bounceIn; +} + +@-webkit-keyframes bounceInDown { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + 0% { + opacity: 0; + -webkit-transform: translate3d(0, -3000px, 0); + transform: translate3d(0, -3000px, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(0, 25px, 0); + transform: translate3d(0, 25px, 0); + } + + 75% { + -webkit-transform: translate3d(0, -10px, 0); + transform: translate3d(0, -10px, 0); + } + + 90% { + -webkit-transform: translate3d(0, 5px, 0); + transform: translate3d(0, 5px, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes bounceInDown { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + 0% { + opacity: 0; + -webkit-transform: translate3d(0, -3000px, 0); + transform: translate3d(0, -3000px, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(0, 25px, 0); + transform: translate3d(0, 25px, 0); + } + + 75% { + -webkit-transform: translate3d(0, -10px, 0); + transform: translate3d(0, -10px, 0); + } + + 90% { + -webkit-transform: translate3d(0, 5px, 0); + transform: translate3d(0, 5px, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.bounceInDown { + -webkit-animation-name: bounceInDown; + animation-name: bounceInDown; +} + +@-webkit-keyframes bounceInLeft { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + 0% { + opacity: 0; + -webkit-transform: translate3d(-3000px, 0, 0); + transform: translate3d(-3000px, 0, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(25px, 0, 0); + transform: translate3d(25px, 0, 0); + } + + 75% { + -webkit-transform: translate3d(-10px, 0, 0); + transform: translate3d(-10px, 0, 0); + } + + 90% { + -webkit-transform: translate3d(5px, 0, 0); + transform: translate3d(5px, 0, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes bounceInLeft { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + 0% { + opacity: 0; + -webkit-transform: translate3d(-3000px, 0, 0); + transform: translate3d(-3000px, 0, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(25px, 0, 0); + transform: translate3d(25px, 0, 0); + } + + 75% { + -webkit-transform: translate3d(-10px, 0, 0); + transform: translate3d(-10px, 0, 0); + } + + 90% { + -webkit-transform: translate3d(5px, 0, 0); + transform: translate3d(5px, 0, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.bounceInLeft { + -webkit-animation-name: bounceInLeft; + animation-name: bounceInLeft; +} + +@-webkit-keyframes bounceInRight { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + from { + opacity: 0; + -webkit-transform: translate3d(3000px, 0, 0); + transform: translate3d(3000px, 0, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(-25px, 0, 0); + transform: translate3d(-25px, 0, 0); + } + + 75% { + -webkit-transform: translate3d(10px, 0, 0); + transform: translate3d(10px, 0, 0); + } + + 90% { + -webkit-transform: translate3d(-5px, 0, 0); + transform: translate3d(-5px, 0, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes bounceInRight { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + from { + opacity: 0; + -webkit-transform: translate3d(3000px, 0, 0); + transform: translate3d(3000px, 0, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(-25px, 0, 0); + transform: translate3d(-25px, 0, 0); + } + + 75% { + -webkit-transform: translate3d(10px, 0, 0); + transform: translate3d(10px, 0, 0); + } + + 90% { + -webkit-transform: translate3d(-5px, 0, 0); + transform: translate3d(-5px, 0, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.bounceInRight { + -webkit-animation-name: bounceInRight; + animation-name: bounceInRight; +} + +@-webkit-keyframes bounceInUp { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + from { + opacity: 0; + -webkit-transform: translate3d(0, 3000px, 0); + transform: translate3d(0, 3000px, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(0, -20px, 0); + transform: translate3d(0, -20px, 0); + } + + 75% { + -webkit-transform: translate3d(0, 10px, 0); + transform: translate3d(0, 10px, 0); + } + + 90% { + -webkit-transform: translate3d(0, -5px, 0); + transform: translate3d(0, -5px, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes bounceInUp { + from, + 60%, + 75%, + 90%, + to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + } + + from { + opacity: 0; + -webkit-transform: translate3d(0, 3000px, 0); + transform: translate3d(0, 3000px, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(0, -20px, 0); + transform: translate3d(0, -20px, 0); + } + + 75% { + -webkit-transform: translate3d(0, 10px, 0); + transform: translate3d(0, 10px, 0); + } + + 90% { + -webkit-transform: translate3d(0, -5px, 0); + transform: translate3d(0, -5px, 0); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.bounceInUp { + -webkit-animation-name: bounceInUp; + animation-name: bounceInUp; +} + +@-webkit-keyframes bounceOut { + 20% { + -webkit-transform: scale3d(0.9, 0.9, 0.9); + transform: scale3d(0.9, 0.9, 0.9); + } + + 50%, + 55% { + opacity: 1; + -webkit-transform: scale3d(1.1, 1.1, 1.1); + transform: scale3d(1.1, 1.1, 1.1); + } + + to { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } +} + +@keyframes bounceOut { + 20% { + -webkit-transform: scale3d(0.9, 0.9, 0.9); + transform: scale3d(0.9, 0.9, 0.9); + } + + 50%, + 55% { + opacity: 1; + -webkit-transform: scale3d(1.1, 1.1, 1.1); + transform: scale3d(1.1, 1.1, 1.1); + } + + to { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } +} + +.bounceOut { + -webkit-animation-duration: 0.75s; + animation-duration: 0.75s; + -webkit-animation-name: bounceOut; + animation-name: bounceOut; +} + +@-webkit-keyframes bounceOutDown { + 20% { + -webkit-transform: translate3d(0, 10px, 0); + transform: translate3d(0, 10px, 0); + } + + 40%, + 45% { + opacity: 1; + -webkit-transform: translate3d(0, -20px, 0); + transform: translate3d(0, -20px, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, 2000px, 0); + transform: translate3d(0, 2000px, 0); + } +} + +@keyframes bounceOutDown { + 20% { + -webkit-transform: translate3d(0, 10px, 0); + transform: translate3d(0, 10px, 0); + } + + 40%, + 45% { + opacity: 1; + -webkit-transform: translate3d(0, -20px, 0); + transform: translate3d(0, -20px, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, 2000px, 0); + transform: translate3d(0, 2000px, 0); + } +} + +.bounceOutDown { + -webkit-animation-name: bounceOutDown; + animation-name: bounceOutDown; +} + +@-webkit-keyframes bounceOutLeft { + 20% { + opacity: 1; + -webkit-transform: translate3d(20px, 0, 0); + transform: translate3d(20px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(-2000px, 0, 0); + transform: translate3d(-2000px, 0, 0); + } +} + +@keyframes bounceOutLeft { + 20% { + opacity: 1; + -webkit-transform: translate3d(20px, 0, 0); + transform: translate3d(20px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(-2000px, 0, 0); + transform: translate3d(-2000px, 0, 0); + } +} + +.bounceOutLeft { + -webkit-animation-name: bounceOutLeft; + animation-name: bounceOutLeft; +} + +@-webkit-keyframes bounceOutRight { + 20% { + opacity: 1; + -webkit-transform: translate3d(-20px, 0, 0); + transform: translate3d(-20px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(2000px, 0, 0); + transform: translate3d(2000px, 0, 0); + } +} + +@keyframes bounceOutRight { + 20% { + opacity: 1; + -webkit-transform: translate3d(-20px, 0, 0); + transform: translate3d(-20px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(2000px, 0, 0); + transform: translate3d(2000px, 0, 0); + } +} + +.bounceOutRight { + -webkit-animation-name: bounceOutRight; + animation-name: bounceOutRight; +} + +@-webkit-keyframes bounceOutUp { + 20% { + -webkit-transform: translate3d(0, -10px, 0); + transform: translate3d(0, -10px, 0); + } + + 40%, + 45% { + opacity: 1; + -webkit-transform: translate3d(0, 20px, 0); + transform: translate3d(0, 20px, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, -2000px, 0); + transform: translate3d(0, -2000px, 0); + } +} + +@keyframes bounceOutUp { + 20% { + -webkit-transform: translate3d(0, -10px, 0); + transform: translate3d(0, -10px, 0); + } + + 40%, + 45% { + opacity: 1; + -webkit-transform: translate3d(0, 20px, 0); + transform: translate3d(0, 20px, 0); + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, -2000px, 0); + transform: translate3d(0, -2000px, 0); + } +} + +.bounceOutUp { + -webkit-animation-name: bounceOutUp; + animation-name: bounceOutUp; +} + +@-webkit-keyframes fadeIn { + from { + opacity: 0; + } + + to { + opacity: 1; + } +} + +@keyframes fadeIn { + from { + opacity: 0; + } + + to { + opacity: 1; + } +} + +.fadeIn { + -webkit-animation-name: fadeIn; + animation-name: fadeIn; +} + +@-webkit-keyframes fadeInDown { + from { + opacity: 0; + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInDown { + from { + opacity: 0; + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInDown { + -webkit-animation-name: fadeInDown; + animation-name: fadeInDown; +} + +@-webkit-keyframes fadeInDownBig { + from { + opacity: 0; + -webkit-transform: translate3d(0, -2000px, 0); + transform: translate3d(0, -2000px, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInDownBig { + from { + opacity: 0; + -webkit-transform: translate3d(0, -2000px, 0); + transform: translate3d(0, -2000px, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInDownBig { + -webkit-animation-name: fadeInDownBig; + animation-name: fadeInDownBig; +} + +@-webkit-keyframes fadeInLeft { + from { + opacity: 0; + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInLeft { + from { + opacity: 0; + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInLeft { + -webkit-animation-name: fadeInLeft; + animation-name: fadeInLeft; +} + +@-webkit-keyframes fadeInLeftBig { + from { + opacity: 0; + -webkit-transform: translate3d(-2000px, 0, 0); + transform: translate3d(-2000px, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInLeftBig { + from { + opacity: 0; + -webkit-transform: translate3d(-2000px, 0, 0); + transform: translate3d(-2000px, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInLeftBig { + -webkit-animation-name: fadeInLeftBig; + animation-name: fadeInLeftBig; +} + +@-webkit-keyframes fadeInRight { + from { + opacity: 0; + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInRight { + from { + opacity: 0; + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInRight { + -webkit-animation-name: fadeInRight; + animation-name: fadeInRight; +} + +@-webkit-keyframes fadeInRightBig { + from { + opacity: 0; + -webkit-transform: translate3d(2000px, 0, 0); + transform: translate3d(2000px, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInRightBig { + from { + opacity: 0; + -webkit-transform: translate3d(2000px, 0, 0); + transform: translate3d(2000px, 0, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInRightBig { + -webkit-animation-name: fadeInRightBig; + animation-name: fadeInRightBig; +} + +@-webkit-keyframes fadeInUp { + from { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInUp { + from { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInUp { + -webkit-animation-name: fadeInUp; + animation-name: fadeInUp; +} + +@-webkit-keyframes fadeInUpBig { + from { + opacity: 0; + -webkit-transform: translate3d(0, 2000px, 0); + transform: translate3d(0, 2000px, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes fadeInUpBig { + from { + opacity: 0; + -webkit-transform: translate3d(0, 2000px, 0); + transform: translate3d(0, 2000px, 0); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.fadeInUpBig { + -webkit-animation-name: fadeInUpBig; + animation-name: fadeInUpBig; +} + +@-webkit-keyframes fadeOut { + from { + opacity: 1; + } + + to { + opacity: 0; + } +} + +@keyframes fadeOut { + from { + opacity: 1; + } + + to { + opacity: 0; + } +} + +.fadeOut { + -webkit-animation-name: fadeOut; + animation-name: fadeOut; +} + +@-webkit-keyframes fadeOutDown { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } +} + +@keyframes fadeOutDown { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } +} + +.fadeOutDown { + -webkit-animation-name: fadeOutDown; + animation-name: fadeOutDown; +} + +@-webkit-keyframes fadeOutDownBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, 2000px, 0); + transform: translate3d(0, 2000px, 0); + } +} + +@keyframes fadeOutDownBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, 2000px, 0); + transform: translate3d(0, 2000px, 0); + } +} + +.fadeOutDownBig { + -webkit-animation-name: fadeOutDownBig; + animation-name: fadeOutDownBig; +} + +@-webkit-keyframes fadeOutLeft { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } +} + +@keyframes fadeOutLeft { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } +} + +.fadeOutLeft { + -webkit-animation-name: fadeOutLeft; + animation-name: fadeOutLeft; +} + +@-webkit-keyframes fadeOutLeftBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(-2000px, 0, 0); + transform: translate3d(-2000px, 0, 0); + } +} + +@keyframes fadeOutLeftBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(-2000px, 0, 0); + transform: translate3d(-2000px, 0, 0); + } +} + +.fadeOutLeftBig { + -webkit-animation-name: fadeOutLeftBig; + animation-name: fadeOutLeftBig; +} + +@-webkit-keyframes fadeOutRight { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } +} + +@keyframes fadeOutRight { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } +} + +.fadeOutRight { + -webkit-animation-name: fadeOutRight; + animation-name: fadeOutRight; +} + +@-webkit-keyframes fadeOutRightBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(2000px, 0, 0); + transform: translate3d(2000px, 0, 0); + } +} + +@keyframes fadeOutRightBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(2000px, 0, 0); + transform: translate3d(2000px, 0, 0); + } +} + +.fadeOutRightBig { + -webkit-animation-name: fadeOutRightBig; + animation-name: fadeOutRightBig; +} + +@-webkit-keyframes fadeOutUp { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + } +} + +@keyframes fadeOutUp { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + } +} + +.fadeOutUp { + -webkit-animation-name: fadeOutUp; + animation-name: fadeOutUp; +} + +@-webkit-keyframes fadeOutUpBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, -2000px, 0); + transform: translate3d(0, -2000px, 0); + } +} + +@keyframes fadeOutUpBig { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(0, -2000px, 0); + transform: translate3d(0, -2000px, 0); + } +} + +.fadeOutUpBig { + -webkit-animation-name: fadeOutUpBig; + animation-name: fadeOutUpBig; +} + +@-webkit-keyframes flip { + from { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) + rotate3d(0, 1, 0, -360deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) rotate3d(0, 1, 0, -360deg); + -webkit-animation-timing-function: ease-out; + animation-timing-function: ease-out; + } + + 40% { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -190deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -190deg); + -webkit-animation-timing-function: ease-out; + animation-timing-function: ease-out; + } + + 50% { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -170deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -170deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + 80% { + -webkit-transform: perspective(400px) scale3d(0.95, 0.95, 0.95) translate3d(0, 0, 0) + rotate3d(0, 1, 0, 0deg); + transform: perspective(400px) scale3d(0.95, 0.95, 0.95) translate3d(0, 0, 0) + rotate3d(0, 1, 0, 0deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + to { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) + rotate3d(0, 1, 0, 0deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) rotate3d(0, 1, 0, 0deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } +} + +@keyframes flip { + from { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) + rotate3d(0, 1, 0, -360deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) rotate3d(0, 1, 0, -360deg); + -webkit-animation-timing-function: ease-out; + animation-timing-function: ease-out; + } + + 40% { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -190deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -190deg); + -webkit-animation-timing-function: ease-out; + animation-timing-function: ease-out; + } + + 50% { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -170deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px) + rotate3d(0, 1, 0, -170deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + 80% { + -webkit-transform: perspective(400px) scale3d(0.95, 0.95, 0.95) translate3d(0, 0, 0) + rotate3d(0, 1, 0, 0deg); + transform: perspective(400px) scale3d(0.95, 0.95, 0.95) translate3d(0, 0, 0) + rotate3d(0, 1, 0, 0deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + to { + -webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) + rotate3d(0, 1, 0, 0deg); + transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) rotate3d(0, 1, 0, 0deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } +} + +.animated.flip { + -webkit-backface-visibility: visible; + backface-visibility: visible; + -webkit-animation-name: flip; + animation-name: flip; +} + +@-webkit-keyframes flipInX { + from { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + opacity: 0; + } + + 40% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + 60% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg); + transform: perspective(400px) rotate3d(1, 0, 0, 10deg); + opacity: 1; + } + + 80% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg); + transform: perspective(400px) rotate3d(1, 0, 0, -5deg); + } + + to { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } +} + +@keyframes flipInX { + from { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + opacity: 0; + } + + 40% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + 60% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg); + transform: perspective(400px) rotate3d(1, 0, 0, 10deg); + opacity: 1; + } + + 80% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg); + transform: perspective(400px) rotate3d(1, 0, 0, -5deg); + } + + to { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } +} + +.flipInX { + -webkit-backface-visibility: visible !important; + backface-visibility: visible !important; + -webkit-animation-name: flipInX; + animation-name: flipInX; +} + +@-webkit-keyframes flipInY { + from { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + opacity: 0; + } + + 40% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -20deg); + transform: perspective(400px) rotate3d(0, 1, 0, -20deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + 60% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 10deg); + transform: perspective(400px) rotate3d(0, 1, 0, 10deg); + opacity: 1; + } + + 80% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -5deg); + transform: perspective(400px) rotate3d(0, 1, 0, -5deg); + } + + to { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } +} + +@keyframes flipInY { + from { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + opacity: 0; + } + + 40% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -20deg); + transform: perspective(400px) rotate3d(0, 1, 0, -20deg); + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; + } + + 60% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 10deg); + transform: perspective(400px) rotate3d(0, 1, 0, 10deg); + opacity: 1; + } + + 80% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -5deg); + transform: perspective(400px) rotate3d(0, 1, 0, -5deg); + } + + to { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } +} + +.flipInY { + -webkit-backface-visibility: visible !important; + backface-visibility: visible !important; + -webkit-animation-name: flipInY; + animation-name: flipInY; +} + +@-webkit-keyframes flipOutX { + from { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } + + 30% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + opacity: 1; + } + + to { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + opacity: 0; + } +} + +@keyframes flipOutX { + from { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } + + 30% { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + transform: perspective(400px) rotate3d(1, 0, 0, -20deg); + opacity: 1; + } + + to { + -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + transform: perspective(400px) rotate3d(1, 0, 0, 90deg); + opacity: 0; + } +} + +.flipOutX { + -webkit-animation-duration: 0.75s; + animation-duration: 0.75s; + -webkit-animation-name: flipOutX; + animation-name: flipOutX; + -webkit-backface-visibility: visible !important; + backface-visibility: visible !important; +} + +@-webkit-keyframes flipOutY { + from { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } + + 30% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -15deg); + transform: perspective(400px) rotate3d(0, 1, 0, -15deg); + opacity: 1; + } + + to { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + opacity: 0; + } +} + +@keyframes flipOutY { + from { + -webkit-transform: perspective(400px); + transform: perspective(400px); + } + + 30% { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -15deg); + transform: perspective(400px) rotate3d(0, 1, 0, -15deg); + opacity: 1; + } + + to { + -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + transform: perspective(400px) rotate3d(0, 1, 0, 90deg); + opacity: 0; + } +} + +.flipOutY { + -webkit-animation-duration: 0.75s; + animation-duration: 0.75s; + -webkit-backface-visibility: visible !important; + backface-visibility: visible !important; + -webkit-animation-name: flipOutY; + animation-name: flipOutY; +} + +@-webkit-keyframes lightSpeedIn { + from { + -webkit-transform: translate3d(100%, 0, 0) skewX(-30deg); + transform: translate3d(100%, 0, 0) skewX(-30deg); + opacity: 0; + } + + 60% { + -webkit-transform: skewX(20deg); + transform: skewX(20deg); + opacity: 1; + } + + 80% { + -webkit-transform: skewX(-5deg); + transform: skewX(-5deg); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes lightSpeedIn { + from { + -webkit-transform: translate3d(100%, 0, 0) skewX(-30deg); + transform: translate3d(100%, 0, 0) skewX(-30deg); + opacity: 0; + } + + 60% { + -webkit-transform: skewX(20deg); + transform: skewX(20deg); + opacity: 1; + } + + 80% { + -webkit-transform: skewX(-5deg); + transform: skewX(-5deg); + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.lightSpeedIn { + -webkit-animation-name: lightSpeedIn; + animation-name: lightSpeedIn; + -webkit-animation-timing-function: ease-out; + animation-timing-function: ease-out; +} + +@-webkit-keyframes lightSpeedOut { + from { + opacity: 1; + } + + to { + -webkit-transform: translate3d(100%, 0, 0) skewX(30deg); + transform: translate3d(100%, 0, 0) skewX(30deg); + opacity: 0; + } +} + +@keyframes lightSpeedOut { + from { + opacity: 1; + } + + to { + -webkit-transform: translate3d(100%, 0, 0) skewX(30deg); + transform: translate3d(100%, 0, 0) skewX(30deg); + opacity: 0; + } +} + +.lightSpeedOut { + -webkit-animation-name: lightSpeedOut; + animation-name: lightSpeedOut; + -webkit-animation-timing-function: ease-in; + animation-timing-function: ease-in; +} + +@-webkit-keyframes rotateIn { + from { + -webkit-transform-origin: center; + transform-origin: center; + -webkit-transform: rotate3d(0, 0, 1, -200deg); + transform: rotate3d(0, 0, 1, -200deg); + opacity: 0; + } + + to { + -webkit-transform-origin: center; + transform-origin: center; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +@keyframes rotateIn { + from { + -webkit-transform-origin: center; + transform-origin: center; + -webkit-transform: rotate3d(0, 0, 1, -200deg); + transform: rotate3d(0, 0, 1, -200deg); + opacity: 0; + } + + to { + -webkit-transform-origin: center; + transform-origin: center; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +.rotateIn { + -webkit-animation-name: rotateIn; + animation-name: rotateIn; +} + +@-webkit-keyframes rotateInDownLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, -45deg); + transform: rotate3d(0, 0, 1, -45deg); + opacity: 0; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +@keyframes rotateInDownLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, -45deg); + transform: rotate3d(0, 0, 1, -45deg); + opacity: 0; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +.rotateInDownLeft { + -webkit-animation-name: rotateInDownLeft; + animation-name: rotateInDownLeft; +} + +@-webkit-keyframes rotateInDownRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, 45deg); + transform: rotate3d(0, 0, 1, 45deg); + opacity: 0; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +@keyframes rotateInDownRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, 45deg); + transform: rotate3d(0, 0, 1, 45deg); + opacity: 0; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +.rotateInDownRight { + -webkit-animation-name: rotateInDownRight; + animation-name: rotateInDownRight; +} + +@-webkit-keyframes rotateInUpLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, 45deg); + transform: rotate3d(0, 0, 1, 45deg); + opacity: 0; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +@keyframes rotateInUpLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, 45deg); + transform: rotate3d(0, 0, 1, 45deg); + opacity: 0; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +.rotateInUpLeft { + -webkit-animation-name: rotateInUpLeft; + animation-name: rotateInUpLeft; +} + +@-webkit-keyframes rotateInUpRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, -90deg); + transform: rotate3d(0, 0, 1, -90deg); + opacity: 0; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +@keyframes rotateInUpRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, -90deg); + transform: rotate3d(0, 0, 1, -90deg); + opacity: 0; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +.rotateInUpRight { + -webkit-animation-name: rotateInUpRight; + animation-name: rotateInUpRight; +} + +@-webkit-keyframes rotateOut { + from { + -webkit-transform-origin: center; + transform-origin: center; + opacity: 1; + } + + to { + -webkit-transform-origin: center; + transform-origin: center; + -webkit-transform: rotate3d(0, 0, 1, 200deg); + transform: rotate3d(0, 0, 1, 200deg); + opacity: 0; + } +} + +@keyframes rotateOut { + from { + -webkit-transform-origin: center; + transform-origin: center; + opacity: 1; + } + + to { + -webkit-transform-origin: center; + transform-origin: center; + -webkit-transform: rotate3d(0, 0, 1, 200deg); + transform: rotate3d(0, 0, 1, 200deg); + opacity: 0; + } +} + +.rotateOut { + -webkit-animation-name: rotateOut; + animation-name: rotateOut; +} + +@-webkit-keyframes rotateOutDownLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, 45deg); + transform: rotate3d(0, 0, 1, 45deg); + opacity: 0; + } +} + +@keyframes rotateOutDownLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, 45deg); + transform: rotate3d(0, 0, 1, 45deg); + opacity: 0; + } +} + +.rotateOutDownLeft { + -webkit-animation-name: rotateOutDownLeft; + animation-name: rotateOutDownLeft; +} + +@-webkit-keyframes rotateOutDownRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, -45deg); + transform: rotate3d(0, 0, 1, -45deg); + opacity: 0; + } +} + +@keyframes rotateOutDownRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, -45deg); + transform: rotate3d(0, 0, 1, -45deg); + opacity: 0; + } +} + +.rotateOutDownRight { + -webkit-animation-name: rotateOutDownRight; + animation-name: rotateOutDownRight; +} + +@-webkit-keyframes rotateOutUpLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, -45deg); + transform: rotate3d(0, 0, 1, -45deg); + opacity: 0; + } +} + +@keyframes rotateOutUpLeft { + from { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: left bottom; + transform-origin: left bottom; + -webkit-transform: rotate3d(0, 0, 1, -45deg); + transform: rotate3d(0, 0, 1, -45deg); + opacity: 0; + } +} + +.rotateOutUpLeft { + -webkit-animation-name: rotateOutUpLeft; + animation-name: rotateOutUpLeft; +} + +@-webkit-keyframes rotateOutUpRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, 90deg); + transform: rotate3d(0, 0, 1, 90deg); + opacity: 0; + } +} + +@keyframes rotateOutUpRight { + from { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + opacity: 1; + } + + to { + -webkit-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate3d(0, 0, 1, 90deg); + transform: rotate3d(0, 0, 1, 90deg); + opacity: 0; + } +} + +.rotateOutUpRight { + -webkit-animation-name: rotateOutUpRight; + animation-name: rotateOutUpRight; +} + +@-webkit-keyframes hinge { + 0% { + -webkit-transform-origin: top left; + transform-origin: top left; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; + } + + 20%, + 60% { + -webkit-transform: rotate3d(0, 0, 1, 80deg); + transform: rotate3d(0, 0, 1, 80deg); + -webkit-transform-origin: top left; + transform-origin: top left; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; + } + + 40%, + 80% { + -webkit-transform: rotate3d(0, 0, 1, 60deg); + transform: rotate3d(0, 0, 1, 60deg); + -webkit-transform-origin: top left; + transform-origin: top left; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; + opacity: 1; + } + + to { + -webkit-transform: translate3d(0, 700px, 0); + transform: translate3d(0, 700px, 0); + opacity: 0; + } +} + +@keyframes hinge { + 0% { + -webkit-transform-origin: top left; + transform-origin: top left; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; + } + + 20%, + 60% { + -webkit-transform: rotate3d(0, 0, 1, 80deg); + transform: rotate3d(0, 0, 1, 80deg); + -webkit-transform-origin: top left; + transform-origin: top left; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; + } + + 40%, + 80% { + -webkit-transform: rotate3d(0, 0, 1, 60deg); + transform: rotate3d(0, 0, 1, 60deg); + -webkit-transform-origin: top left; + transform-origin: top left; + -webkit-animation-timing-function: ease-in-out; + animation-timing-function: ease-in-out; + opacity: 1; + } + + to { + -webkit-transform: translate3d(0, 700px, 0); + transform: translate3d(0, 700px, 0); + opacity: 0; + } +} + +.hinge { + -webkit-animation-duration: 2s; + animation-duration: 2s; + -webkit-animation-name: hinge; + animation-name: hinge; +} + +@-webkit-keyframes jackInTheBox { + from { + opacity: 0; + -webkit-transform: scale(0.1) rotate(30deg); + transform: scale(0.1) rotate(30deg); + -webkit-transform-origin: center bottom; + transform-origin: center bottom; + } + + 50% { + -webkit-transform: rotate(-10deg); + transform: rotate(-10deg); + } + + 70% { + -webkit-transform: rotate(3deg); + transform: rotate(3deg); + } + + to { + opacity: 1; + -webkit-transform: scale(1); + transform: scale(1); + } +} + +@keyframes jackInTheBox { + from { + opacity: 0; + -webkit-transform: scale(0.1) rotate(30deg); + transform: scale(0.1) rotate(30deg); + -webkit-transform-origin: center bottom; + transform-origin: center bottom; + } + + 50% { + -webkit-transform: rotate(-10deg); + transform: rotate(-10deg); + } + + 70% { + -webkit-transform: rotate(3deg); + transform: rotate(3deg); + } + + to { + opacity: 1; + -webkit-transform: scale(1); + transform: scale(1); + } +} + +.jackInTheBox { + -webkit-animation-name: jackInTheBox; + animation-name: jackInTheBox; +} + +/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */ + +@-webkit-keyframes rollIn { + from { + opacity: 0; + -webkit-transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg); + transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes rollIn { + from { + opacity: 0; + -webkit-transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg); + transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg); + } + + to { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.rollIn { + -webkit-animation-name: rollIn; + animation-name: rollIn; +} + +/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */ + +@-webkit-keyframes rollOut { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg); + transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg); + } +} + +@keyframes rollOut { + from { + opacity: 1; + } + + to { + opacity: 0; + -webkit-transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg); + transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg); + } +} + +.rollOut { + -webkit-animation-name: rollOut; + animation-name: rollOut; +} + +@-webkit-keyframes zoomIn { + from { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } + + 50% { + opacity: 1; + } +} + +@keyframes zoomIn { + from { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } + + 50% { + opacity: 1; + } +} + +.zoomIn { + -webkit-animation-name: zoomIn; + animation-name: zoomIn; +} + +@-webkit-keyframes zoomInDown { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -1000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -1000px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +@keyframes zoomInDown { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -1000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -1000px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +.zoomInDown { + -webkit-animation-name: zoomInDown; + animation-name: zoomInDown; +} + +@-webkit-keyframes zoomInLeft { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(-1000px, 0, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(-1000px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(10px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(10px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +@keyframes zoomInLeft { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(-1000px, 0, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(-1000px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(10px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(10px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +.zoomInLeft { + -webkit-animation-name: zoomInLeft; + animation-name: zoomInLeft; +} + +@-webkit-keyframes zoomInRight { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(1000px, 0, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(1000px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(-10px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(-10px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +@keyframes zoomInRight { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(1000px, 0, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(1000px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(-10px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(-10px, 0, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +.zoomInRight { + -webkit-animation-name: zoomInRight; + animation-name: zoomInRight; +} + +@-webkit-keyframes zoomInUp { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 1000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 1000px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +@keyframes zoomInUp { + from { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 1000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 1000px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + 60% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +.zoomInUp { + -webkit-animation-name: zoomInUp; + animation-name: zoomInUp; +} + +@-webkit-keyframes zoomOut { + from { + opacity: 1; + } + + 50% { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } + + to { + opacity: 0; + } +} + +@keyframes zoomOut { + from { + opacity: 1; + } + + 50% { + opacity: 0; + -webkit-transform: scale3d(0.3, 0.3, 0.3); + transform: scale3d(0.3, 0.3, 0.3); + } + + to { + opacity: 0; + } +} + +.zoomOut { + -webkit-animation-name: zoomOut; + animation-name: zoomOut; +} + +@-webkit-keyframes zoomOutDown { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + to { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 2000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 2000px, 0); + -webkit-transform-origin: center bottom; + transform-origin: center bottom; + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +@keyframes zoomOutDown { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + to { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 2000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 2000px, 0); + -webkit-transform-origin: center bottom; + transform-origin: center bottom; + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +.zoomOutDown { + -webkit-animation-name: zoomOutDown; + animation-name: zoomOutDown; +} + +@-webkit-keyframes zoomOutLeft { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(42px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(42px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: scale(0.1) translate3d(-2000px, 0, 0); + transform: scale(0.1) translate3d(-2000px, 0, 0); + -webkit-transform-origin: left center; + transform-origin: left center; + } +} + +@keyframes zoomOutLeft { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(42px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(42px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: scale(0.1) translate3d(-2000px, 0, 0); + transform: scale(0.1) translate3d(-2000px, 0, 0); + -webkit-transform-origin: left center; + transform-origin: left center; + } +} + +.zoomOutLeft { + -webkit-animation-name: zoomOutLeft; + animation-name: zoomOutLeft; +} + +@-webkit-keyframes zoomOutRight { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(-42px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(-42px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: scale(0.1) translate3d(2000px, 0, 0); + transform: scale(0.1) translate3d(2000px, 0, 0); + -webkit-transform-origin: right center; + transform-origin: right center; + } +} + +@keyframes zoomOutRight { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(-42px, 0, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(-42px, 0, 0); + } + + to { + opacity: 0; + -webkit-transform: scale(0.1) translate3d(2000px, 0, 0); + transform: scale(0.1) translate3d(2000px, 0, 0); + -webkit-transform-origin: right center; + transform-origin: right center; + } +} + +.zoomOutRight { + -webkit-animation-name: zoomOutRight; + animation-name: zoomOutRight; +} + +@-webkit-keyframes zoomOutUp { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + to { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -2000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -2000px, 0); + -webkit-transform-origin: center bottom; + transform-origin: center bottom; + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +@keyframes zoomOutUp { + 40% { + opacity: 1; + -webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0); + -webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19); + } + + to { + opacity: 0; + -webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -2000px, 0); + transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -2000px, 0); + -webkit-transform-origin: center bottom; + transform-origin: center bottom; + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1); + } +} + +.zoomOutUp { + -webkit-animation-name: zoomOutUp; + animation-name: zoomOutUp; +} + +@-webkit-keyframes slideInDown { + from { + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes slideInDown { + from { + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.slideInDown { + -webkit-animation-name: slideInDown; + animation-name: slideInDown; +} + +@-webkit-keyframes slideInLeft { + from { + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes slideInLeft { + from { + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.slideInLeft { + -webkit-animation-name: slideInLeft; + animation-name: slideInLeft; +} + +@-webkit-keyframes slideInRight { + from { + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes slideInRight { + from { + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.slideInRight { + -webkit-animation-name: slideInRight; + animation-name: slideInRight; +} + +@-webkit-keyframes slideInUp { + from { + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +@keyframes slideInUp { + from { + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + visibility: visible; + } + + to { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.slideInUp { + -webkit-animation-name: slideInUp; + animation-name: slideInUp; +} + +@-webkit-keyframes slideOutDown { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } +} + +@keyframes slideOutDown { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } +} + +.slideOutDown { + -webkit-animation-name: slideOutDown; + animation-name: slideOutDown; +} + +@-webkit-keyframes slideOutLeft { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } +} + +@keyframes slideOutLeft { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } +} + +.slideOutLeft { + -webkit-animation-name: slideOutLeft; + animation-name: slideOutLeft; +} + +@-webkit-keyframes slideOutRight { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } +} + +@keyframes slideOutRight { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } +} + +.slideOutRight { + -webkit-animation-name: slideOutRight; + animation-name: slideOutRight; +} + +@-webkit-keyframes slideOutUp { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + } +} + +@keyframes slideOutUp { + from { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } + + to { + visibility: hidden; + -webkit-transform: translate3d(0, -100%, 0); + transform: translate3d(0, -100%, 0); + } +} + +.slideOutUp { + -webkit-animation-name: slideOutUp; + animation-name: slideOutUp; +} + +.animated { + -webkit-animation-duration: 1s; + animation-duration: 1s; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; +} + +.animated.infinite { + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; +} + +.animated.delay-1s { + -webkit-animation-delay: 1s; + animation-delay: 1s; +} + +.animated.delay-2s { + -webkit-animation-delay: 2s; + animation-delay: 2s; +} + +.animated.delay-3s { + -webkit-animation-delay: 3s; + animation-delay: 3s; +} + +.animated.delay-4s { + -webkit-animation-delay: 4s; + animation-delay: 4s; +} + +.animated.delay-5s { + -webkit-animation-delay: 5s; + animation-delay: 5s; +} + +.animated.fast { + -webkit-animation-duration: 800ms; + animation-duration: 800ms; +} + +.animated.faster { + -webkit-animation-duration: 500ms; + animation-duration: 500ms; +} + +.animated.slow { + -webkit-animation-duration: 2s; + animation-duration: 2s; +} + +.animated.slower { + -webkit-animation-duration: 3s; + animation-duration: 3s; +} + +@media (print), (prefers-reduced-motion) { + .animated { + -webkit-animation: unset !important; + animation: unset !important; + -webkit-transition: none !important; + transition: none !important; + } +} \ No newline at end of file diff --git a/giles-eco/src/main/webapp/resources/notify/bootstrap-notify.min.js b/giles-eco/src/main/webapp/resources/notify/bootstrap-notify.min.js new file mode 100644 index 00000000..f5ad385a --- /dev/null +++ b/giles-eco/src/main/webapp/resources/notify/bootstrap-notify.min.js @@ -0,0 +1,2 @@ +/* Project: Bootstrap Growl = v3.1.3 | Description: Turns standard Bootstrap alerts into "Growl-like" notifications. | Author: Mouse0270 aka Robert McIntosh | License: MIT License | Website: https://github.com/mouse0270/bootstrap-growl */ +!function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t("object"==typeof exports?require("jquery"):jQuery)}(function(t){function e(e,i,n){var i={content:{message:"object"==typeof i?i.message:i,title:i.title?i.title:"",icon:i.icon?i.icon:"",url:i.url?i.url:"#",target:i.target?i.target:"-"}};n=t.extend(!0,{},i,n),this.settings=t.extend(!0,{},s,n),this._defaults=s,"-"==this.settings.content.target&&(this.settings.content.target=this.settings.url_target),this.animations={start:"webkitAnimationStart oanimationstart MSAnimationStart animationstart",end:"webkitAnimationEnd oanimationend MSAnimationEnd animationend"},"number"==typeof this.settings.offset&&(this.settings.offset={x:this.settings.offset,y:this.settings.offset}),this.init()}var s={element:"body",position:null,type:"info",allow_dismiss:!0,newest_on_top:!1,showProgressbar:!1,placement:{from:"top",align:"right"},offset:20,spacing:10,z_index:1031,delay:5e3,timer:1e3,url_target:"_blank",mouse_over:null,animate:{enter:"animated fadeInDown",exit:"animated fadeOutUp"},onShow:null,onShown:null,onClose:null,onClosed:null,icon_type:"class",template:''};String.format=function(){for(var t=arguments[0],e=1;e .progress-bar').removeClass("progress-bar-"+t.settings.type),t.settings.type=i[e],this.$ele.addClass("alert-"+i[e]).find('[data-notify="progressbar"] > .progress-bar').addClass("progress-bar-"+i[e]);break;case"icon":var n=this.$ele.find('[data-notify="icon"]');"class"==t.settings.icon_type.toLowerCase()?n.removeClass(t.settings.content.icon).addClass(i[e]):(n.is("img")||n.find("img"),n.attr("src",i[e]));break;case"progress":var a=t.settings.delay-t.settings.delay*(i[e]/100);this.$ele.data("notify-delay",a),this.$ele.find('[data-notify="progressbar"] > div').attr("aria-valuenow",i[e]).css("width",i[e]+"%");break;case"url":this.$ele.find('[data-notify="url"]').attr("href",i[e]);break;case"target":this.$ele.find('[data-notify="url"]').attr("target",i[e]);break;default:this.$ele.find('[data-notify="'+e+'"]').html(i[e])}var o=this.$ele.outerHeight()+parseInt(t.settings.spacing)+parseInt(t.settings.offset.y);t.reposition(o)},close:function(){t.close()}}},buildNotify:function(){var e=this.settings.content;this.$ele=t(String.format(this.settings.template,this.settings.type,e.title,e.message,e.url,e.target)),this.$ele.attr("data-notify-position",this.settings.placement.from+"-"+this.settings.placement.align),this.settings.allow_dismiss||this.$ele.find('[data-notify="dismiss"]').css("display","none"),(this.settings.delay<=0&&!this.settings.showProgressbar||!this.settings.showProgressbar)&&this.$ele.find('[data-notify="progressbar"]').remove()},setIcon:function(){"class"==this.settings.icon_type.toLowerCase()?this.$ele.find('[data-notify="icon"]').addClass(this.settings.content.icon):this.$ele.find('[data-notify="icon"]').is("img")?this.$ele.find('[data-notify="icon"]').attr("src",this.settings.content.icon):this.$ele.find('[data-notify="icon"]').append('Notify Icon')},styleURL:function(){this.$ele.find('[data-notify="url"]').css({backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)",height:"100%",left:"0px",position:"absolute",top:"0px",width:"100%",zIndex:this.settings.z_index+1}),this.$ele.find('[data-notify="dismiss"]').css({position:"absolute",right:"10px",top:"5px",zIndex:this.settings.z_index+2})},placement:function(){var e=this,s=this.settings.offset.y,i={display:"inline-block",margin:"0px auto",position:this.settings.position?this.settings.position:"body"===this.settings.element?"fixed":"absolute",transition:"all .5s ease-in-out",zIndex:this.settings.z_index},n=!1,a=this.settings;switch(t('[data-notify-position="'+this.settings.placement.from+"-"+this.settings.placement.align+'"]:not([data-closing="true"])').each(function(){return s=Math.max(s,parseInt(t(this).css(a.placement.from))+parseInt(t(this).outerHeight())+parseInt(a.spacing))}),1==this.settings.newest_on_top&&(s=this.settings.offset.y),i[this.settings.placement.from]=s+"px",this.settings.placement.align){case"left":case"right":i[this.settings.placement.align]=this.settings.offset.x+"px";break;case"center":i.left=0,i.right=0}this.$ele.css(i).addClass(this.settings.animate.enter),t.each(Array("webkit","moz","o","ms",""),function(t,s){e.$ele[0].style[s+"AnimationIterationCount"]=1}),t(this.settings.element).append(this.$ele),1==this.settings.newest_on_top&&(s=parseInt(s)+parseInt(this.settings.spacing)+this.$ele.outerHeight(),this.reposition(s)),t.isFunction(e.settings.onShow)&&e.settings.onShow.call(this.$ele),this.$ele.one(this.animations.start,function(){n=!0}).one(this.animations.end,function(){t.isFunction(e.settings.onShown)&&e.settings.onShown.call(this)}),setTimeout(function(){n||t.isFunction(e.settings.onShown)&&e.settings.onShown.call(this)},600)},bind:function(){var e=this;if(this.$ele.find('[data-notify="dismiss"]').on("click",function(){e.close()}),this.$ele.mouseover(function(){t(this).data("data-hover","true")}).mouseout(function(){t(this).data("data-hover","false")}),this.$ele.data("data-hover","false"),this.settings.delay>0){e.$ele.data("notify-delay",e.settings.delay);var s=setInterval(function(){var t=parseInt(e.$ele.data("notify-delay"))-e.settings.timer;if("false"===e.$ele.data("data-hover")&&"pause"==e.settings.mouse_over||"pause"!=e.settings.mouse_over){var i=(e.settings.delay-t)/e.settings.delay*100;e.$ele.data("notify-delay",t),e.$ele.find('[data-notify="progressbar"] > div').attr("aria-valuenow",i).css("width",i+"%")}t<=-e.settings.timer&&(clearInterval(s),e.close())},e.settings.timer)}},close:function(){var e=this,s=parseInt(this.$ele.css(this.settings.placement.from)),i=!1;this.$ele.data("closing","true").addClass(this.settings.animate.exit),e.reposition(s),t.isFunction(e.settings.onClose)&&e.settings.onClose.call(this.$ele),this.$ele.one(this.animations.start,function(){i=!0}).one(this.animations.end,function(){t(this).remove(),t.isFunction(e.settings.onClosed)&&e.settings.onClosed.call(this)}),setTimeout(function(){i||(e.$ele.remove(),e.settings.onClosed&&e.settings.onClosed(e.$ele))},600)},reposition:function(e){var s=this,i='[data-notify-position="'+this.settings.placement.from+"-"+this.settings.placement.align+'"]:not([data-closing="true"])',n=this.$ele.nextAll(i);1==this.settings.newest_on_top&&(n=this.$ele.prevAll(i)),n.each(function(){t(this).css(s.settings.placement.from,e),e=parseInt(e)+parseInt(s.settings.spacing)+t(this).outerHeight()})}}),t.notify=function(t,s){var i=new e(this,t,s);return i.notify},t.notifyDefaults=function(e){return s=t.extend(!0,{},s,e)},t.notifyClose=function(e){"undefined"==typeof e||"all"==e?t("[data-notify]").find('[data-notify="dismiss"]').trigger("click"):t('[data-notify-position="'+e+'"]').find('[data-notify="dismiss"]').trigger("click")}}); \ No newline at end of file From bb4d6a2f0d3e51a5b6cbe320fafd218c24ef8ba9 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 12 Apr 2024 11:04:49 -0700 Subject: [PATCH 21/24] Update delete document service --- .../delete/impl/DeleteDocumentService.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java index dc218bb4..b3791484 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/delete/impl/DeleteDocumentService.java @@ -32,48 +32,48 @@ @Service public class DeleteDocumentService implements IDeleteDocumentService { - + public final static String REQUEST_PREFIX = "DELREQ"; - + @Autowired private IRequestFactory requestFactory; - + @Autowired private ApplicationContext ctx; - + @Autowired private ISystemMessageHandler messageHandler; - + @Autowired private IRequestProducer requestProducer; - + @Autowired private IPropertiesManager propertyManager; - + @Autowired private ITransactionalFileService fileService; - + @Autowired private ITransactionalUploadService uploadService; - + @Autowired private ITransactionalDocumentService documentService; - + @Autowired private ITransactionalProcessingRequestService processingRequestService; - + @PostConstruct public void init() { requestFactory.config(StorageDeletionRequest.class); } - + @Override @Async public void initiateDeletion(IDocument document) throws GilesProcessingException, MessageCreationException { IRequest storageDeletionRequest = createRequest(document); requestProducer.sendRequest(storageDeletionRequest, propertyManager.getProperty(Properties.KAFKA_TOPIC_STORAGE_DELETION_REQUEST)); } - + @Override public void completeDeletion(IDocument document) { fileService.deleteFiles(document.getId()); @@ -81,14 +81,14 @@ public void completeDeletion(IDocument document) { documentService.deleteDocument(document.getId()); deleteUpload(document.getUploadId()); } - + private void deleteUpload(String uploadId) { // if an upload has multiple documents and only one of the documents is deleted the upload does not have to be deleted. if(documentService.getDocumentsByUploadId(uploadId).isEmpty()) { uploadService.deleteUpload(uploadId); } } - + private IRequest createRequest(IDocument document) throws GilesProcessingException { IStorageDeletionRequest storageDeletionRequest = null; try { @@ -101,7 +101,7 @@ private IRequest createRequest(IDocument document) throws GilesProcessingExcepti } return storageDeletionRequest; } - + private void storeRequestId(String requestId, IDocument document) { document.setRequestId(requestId); try { From 8e2d05e671a732f2dcc58b71d5e60964fc8883c4 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 12 Apr 2024 11:07:51 -0700 Subject: [PATCH 22/24] [GECO-140] Update kafka --- ...aDeletionCompletionProcessingListener.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java index efc864de..b6e38628 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java @@ -1,7 +1,6 @@ package edu.asu.diging.gilesecosystem.web.core.kafka; import java.io.IOException; -import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.PropertySource; @@ -16,10 +15,7 @@ import edu.asu.diging.gilesecosystem.requests.impl.CompletedStorageDeletionRequest; import edu.asu.diging.gilesecosystem.septemberutil.properties.MessageType; import edu.asu.diging.gilesecosystem.septemberutil.service.ISystemMessageHandler; -import edu.asu.diging.gilesecosystem.util.exceptions.UnstorableObjectException; -import edu.asu.diging.gilesecosystem.web.core.model.IProcessingRequest; import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalDocumentService; -import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalProcessingRequestService; import edu.asu.diging.gilesecosystem.web.core.service.delete.IDeleteDocumentService; @PropertySource("classpath:/config.properties") @@ -34,9 +30,6 @@ public class KafkaDeletionCompletionProcessingListener { @Autowired private ITransactionalDocumentService documentService; - @Autowired - private ITransactionalProcessingRequestService processingRequestService; - @KafkaListener(id = "giles.deletion.topic.listener", topics = "${topic_delete_storage_request_complete}") public void receiveDeletionCompletedMessage(String message, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) { ObjectMapper mapper = new ObjectMapper(); @@ -47,19 +40,9 @@ public void receiveDeletionCompletedMessage(String message, @Header(KafkaHeaders messageHandler.handleMessage("Could not unmarshall request.", e, MessageType.ERROR); return; } - if (request.getStatus().equals(RequestStatus.FAILED)) { - List pRequests = processingRequestService.getProcRequestsByRequestId(request.getRequestId()); - for (IProcessingRequest pReq : pRequests) { - pReq.setRequestStatus(request.getStatus()); - try { - processingRequestService.save(pReq); - } catch (UnstorableObjectException e) { - // should never happen - messageHandler.handleMessage("Could not store request.", e, MessageType.ERROR); - } - } + if (request.getStatus() == RequestStatus.FAILED) { return; } deleteDocumentService.completeDeletion(documentService.getDocument(request.getDocumentId())); } -} +} \ No newline at end of file From 78f7f383f9758c294b49b6d0d496c85b995094d5 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 12 Apr 2024 11:12:56 -0700 Subject: [PATCH 23/24] [GECO-140] : Update deletion completion --- .../core/kafka/KafkaDeletionCompletionProcessingListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java index b6e38628..a1865aea 100644 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java +++ b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/kafka/KafkaDeletionCompletionProcessingListener.java @@ -45,4 +45,4 @@ public void receiveDeletionCompletedMessage(String message, @Header(KafkaHeaders } deleteDocumentService.completeDeletion(documentService.getDocument(request.getDocumentId())); } -} \ No newline at end of file +} From 9736973633bb60148d23226fc7d863ea6eb25d29 Mon Sep 17 00:00:00 2001 From: diya17 Date: Fri, 12 Apr 2024 12:54:22 -0700 Subject: [PATCH 24/24] [GECO-140] Removing unused files --- .../core/files/IRequestDatabaseClient.java | 5 ----- .../files/impl/RequestDatabaseClient.java | 20 ------------------- .../core/ITransactionalRequestService.java | 5 ----- .../impl/TranscationalRequestService.java | 18 ----------------- 4 files changed, 48 deletions(-) delete mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java delete mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java delete mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java delete mode 100644 giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java deleted file mode 100644 index 81526d7f..00000000 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/IRequestDatabaseClient.java +++ /dev/null @@ -1,5 +0,0 @@ -package edu.asu.diging.gilesecosystem.web.core.files; - -public interface IRequestDatabaseClient { - public void deleteRequestsByDocumentId(String documentId); -} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java deleted file mode 100644 index 89d51056..00000000 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/files/impl/RequestDatabaseClient.java +++ /dev/null @@ -1,20 +0,0 @@ -package edu.asu.diging.gilesecosystem.web.core.files.impl; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import edu.asu.diging.gilesecosystem.web.core.files.IRequestDatabaseClient; -import edu.asu.diging.gilesecosystem.web.core.repository.RequestRepository; - -@Transactional -@Component -public class RequestDatabaseClient implements IRequestDatabaseClient { - - @Autowired - private RequestRepository requestRepository; - - public void deleteRequestsByDocumentId(String documentId) { - requestRepository.deleteByDocumentId(documentId); - } -} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java deleted file mode 100644 index 5a2b888b..00000000 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/ITransactionalRequestService.java +++ /dev/null @@ -1,5 +0,0 @@ -package edu.asu.diging.gilesecosystem.web.core.service.core; - -public interface ITransactionalRequestService { - public void deleteRequestsByDocumentId(String documentId); -} diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java deleted file mode 100644 index 73589c40..00000000 --- a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/core/impl/TranscationalRequestService.java +++ /dev/null @@ -1,18 +0,0 @@ -package edu.asu.diging.gilesecosystem.web.core.service.core.impl; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import edu.asu.diging.gilesecosystem.web.core.files.IRequestDatabaseClient; -import edu.asu.diging.gilesecosystem.web.core.service.core.ITransactionalRequestService; - -@Service -public class TranscationalRequestService implements ITransactionalRequestService { - @Autowired - private IRequestDatabaseClient requestDatabaseClient; - - @Override - public void deleteRequestsByDocumentId(String documentId) { - requestDatabaseClient.deleteRequestsByDocumentId(documentId); - } -}