From 29f8a0d30ec53f1f86d015ac925f8dbcb3209a41 Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Mon, 21 Jan 2019 10:19:04 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/branches/data-access/storagehub-webapp/1.0@176696 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../access/storagehub/services/WorkspaceManager.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java index 518c67f..605a864 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java @@ -105,6 +105,14 @@ public class WorkspaceManager { try{ long start = System.currentTimeMillis(); ses = repository.getRepository().login(CredentialHandler.getAdminCredentials(context)); + + //TODO: remove it when users will be created via storageHub + String user = AuthorizationProvider.instance.get().getClient().getId(); + org.gcube.common.storagehub.model.Path trashPath = Paths.append(Utils.getWorkspacePath(), Constants.TRASH_ROOT_FOLDER_NAME); + if (!ses.nodeExists(trashPath.toPath())) { + Utils.createFolderInternally(ses, ses.getNode(Utils.getWorkspacePath().toPath()) , Constants.TRASH_ROOT_FOLDER_NAME, "trash of "+user, false, user, null); + } + log.trace("time to connect to repo {}",(System.currentTimeMillis()-start)); Node node = ses.getNode(absolutePath.toPath()); authChecker.checkReadAuthorizationControl(ses, node.getIdentifier()); @@ -215,10 +223,6 @@ public class WorkspaceManager { ses = repository.getRepository().login(CredentialHandler.getAdminCredentials(context)); log.info("time to connect to repo {}",(System.currentTimeMillis()-start)); - if (!ses.nodeExists(trashPath.toPath())) { - Utils.createFolderInternally(ses, ses.getNode(Utils.getWorkspacePath().toPath()) , Constants.TRASH_ROOT_FOLDER_NAME, "trash of "+user, false, user, null); - } - Node folder = ses.getNode(trashPath.toPath()); item = node2Item.getItem(folder, excludes); }catch(RepositoryException re ){