From d04d5dafbf28fa9d78fad725c824cc1fb85153fd Mon Sep 17 00:00:00 2001 From: lucio Date: Thu, 19 Jan 2023 16:16:48 +0100 Subject: [PATCH] AuthorizationProvider moved from configuration to context --- src/main/java/org/gcube/smartgears/ContextListener.java | 2 +- src/main/java/org/gcube/smartgears/ContextProvider.java | 6 ++++++ .../smartgears/application/manager/OnlineObserver.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/ContextListener.java b/src/main/java/org/gcube/smartgears/ContextListener.java index 35270ab..44df785 100644 --- a/src/main/java/org/gcube/smartgears/ContextListener.java +++ b/src/main/java/org/gcube/smartgears/ContextListener.java @@ -64,7 +64,7 @@ public class ContextListener implements ServletContextListener { } if (managers.size()>0){ observer = ApplicationManagerProvider.instance.getObserver(); - observer.setAuthorizationProvider(context.container().configuration().authorizationProvider()); + observer.setAuthorizationProvider(context.container().authorizationProvider()); observer.setApplicationManagerClasses(managers); observer.register(); context.events().subscribe(observer); diff --git a/src/main/java/org/gcube/smartgears/ContextProvider.java b/src/main/java/org/gcube/smartgears/ContextProvider.java index 25a7e5d..e98e1c6 100644 --- a/src/main/java/org/gcube/smartgears/ContextProvider.java +++ b/src/main/java/org/gcube/smartgears/ContextProvider.java @@ -9,6 +9,7 @@ import org.gcube.smartgears.context.application.ApplicationContext; import org.gcube.smartgears.context.container.ContainerContext; import org.gcube.smartgears.lifecycle.application.ApplicationLifecycle; import org.gcube.smartgears.persistence.PersistenceWriter; +import org.gcube.smartgears.security.AuthorizationProvider; /** * Embedded in an application, makes available its context as a gCube resource. @@ -92,6 +93,11 @@ public class ContextProvider { // TODO Auto-generated method stub return delegate.persistence(); } + + @Override + public AuthorizationProvider authorizationProvider() { + return delegate.authorizationProvider(); + } } } diff --git a/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java b/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java index 1a354f6..78c7fa0 100644 --- a/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java +++ b/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java @@ -103,7 +103,7 @@ public class OnlineObserver implements AppManagerObserver{ public synchronized void onStop(ApplicationContext appContext){ - for (String context :appContext.container().configuration().authorizationProvider().getContexts()) + for (String context :appContext.authorizationProvider().getContexts()) this.onRemove(context); unregister();