Move the UserInfo into northbound security

The User Info class belongs with the northbound security API which is a factory for it Signed-off-by: Tim Ward <timothyjward@apache.org>
DataInMotion · Apr 3, 2024 · e12ff02 · e12ff02
1 parent d694802
commit e12ff02
Show file tree

Hide file tree

Showing 54 changed files with 70 additions and 73 deletions.
diff --git a/core/api/src/main/java/org/eclipse/sensinact/core/security/package-info.java b/core/api/src/main/java/org/eclipse/sensinact/core/security/package-info.java
diff --git a/distribution/features/northbound-ogc-sensorthings-feature/pom.xml b/distribution/features/northbound-ogc-sensorthings-feature/pom.xml
@@ -53,6 +53,11 @@
       <artifactId>rest.gateway</artifactId>
       <version>${sensorthings.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.sensinact.gateway.northbound.security</groupId>
+      <artifactId>security-api</artifactId>
+      <version>${sensorthings.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.sensinact.gateway.northbound.session</groupId>
       <artifactId>session-api</artifactId>

diff --git a/...ound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json b/...ound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json
@@ -8,6 +8,7 @@
     { "id": "org.eclipse.sensinact.gateway.northbound.sensorthings:filter:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.sensorthings:rest.api:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.sensorthings:rest.gateway:0.0.2-SNAPSHOT" },
+    { "id": "org.eclipse.sensinact.gateway.northbound.security:security-api:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.session:session-api:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.session:session-impl:0.0.2-SNAPSHOT" },
     { "id": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1" },

diff --git a/distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml b/distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml
@@ -27,8 +27,8 @@
   <properties>
     <sensinact.version>0.0.2-SNAPSHOT</sensinact.version>
     <sensorthings.version>0.0.2-SNAPSHOT</sensorthings.version>
-    <moquette.version>0.16</moquette.version>
-    <netty.version>4.1.77.Final</netty.version>
+    <moquette.version>0.17</moquette.version>
+    <netty.version>4.1.93.Final</netty.version>
   </properties>
 
   <dependencies>

diff --git a/...ensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json b/...ensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json
@@ -2,17 +2,17 @@
   "id": "org.eclipse.sensinact.gateway.distribution.features:northbound-ogc-sensorthings-mqtt-feature:osgifeature:0.0.2-SNAPSHOT",
   "bundles": [
     { "id": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1" },
-    { "id": "io.netty:netty-common:4.1.77.Final" },
-    { "id": "io.netty:netty-buffer:4.1.77.Final" },
-    { "id": "io.netty:netty-codec:4.1.77.Final" },
-    { "id": "io.netty:netty-codec-http:4.1.77.Final" },
-    { "id": "io.netty:netty-codec-mqtt:4.1.77.Final" },
-    { "id": "io.netty:netty-common:4.1.77.Final" },
-    { "id": "io.netty:netty-handler:4.1.77.Final" },
-    { "id": "io.netty:netty-resolver:4.1.77.Final" },
-    { "id": "io.netty:netty-transport:4.1.77.Final" },
-    { "id": "io.netty:netty-transport-classes-epoll:4.1.77.Final" },
-    { "id": "io.netty:netty-transport-native-unix-common:4.1.77.Final" },
+    { "id": "io.netty:netty-common:4.1.93.Final" },
+    { "id": "io.netty:netty-buffer:4.1.93.Final" },
+    { "id": "io.netty:netty-codec:4.1.93.Final" },
+    { "id": "io.netty:netty-codec-http:4.1.93.Final" },
+    { "id": "io.netty:netty-codec-mqtt:4.1.93.Final" },
+    { "id": "io.netty:netty-common:4.1.93.Final" },
+    { "id": "io.netty:netty-handler:4.1.93.Final" },
+    { "id": "io.netty:netty-resolver:4.1.93.Final" },
+    { "id": "io.netty:netty-transport:4.1.93.Final" },
+    { "id": "io.netty:netty-transport-classes-epoll:4.1.93.Final" },
+    { "id": "io.netty:netty-transport-native-unix-common:4.1.93.Final" },
     { "id": "org.eclipse.sensinact.gateway.northbound.sensorthings:dto:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.sensorthings:mqtt:0.0.2-SNAPSHOT" }
 ],

diff --git a/distribution/features/northbound-oidc-authenticator-feature/pom.xml b/distribution/features/northbound-oidc-authenticator-feature/pom.xml
@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.sensinact.gateway.northbound.security</groupId>
-      <artifactId>authentication-api</artifactId>
+      <artifactId>security-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/...-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json b/...-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json
@@ -1,7 +1,7 @@
 {
   "id":"org.eclipse.sensinact.gateway.distribution.features:northbound-oidc-authenticator-feature:osgifeature:0.0.1-SNAPSHOT",
   "bundles":[
-    { "id": "org.eclipse.sensinact.gateway.northbound.security:authentication-api:0.0.2-SNAPSHOT" },
+    { "id": "org.eclipse.sensinact.gateway.northbound.security:security-api:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.security:openid-connect:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.jetty:jetty-client:11.0.13" },
     { "id": "org.eclipse.jetty:jetty-alpn-client:11.0.13" },

diff --git a/distribution/features/northbound-rest-feature/pom.xml b/distribution/features/northbound-rest-feature/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.sensinact.gateway.northbound.security</groupId>
-      <artifactId>authentication-api</artifactId>
+      <artifactId>security-api</artifactId>
       <version>${rest.version}</version>
     </dependency>
     <dependency>

diff --git a/...ribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json b/...ribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json
@@ -6,7 +6,7 @@
     { "id": "org.antlr:antlr4-runtime:4.12.0" },
     { "id": "org.eclipse.sensinact.gateway.northbound.filters:ldap:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound:query-handler:0.0.2-SNAPSHOT" },
-    { "id": "org.eclipse.sensinact.gateway.northbound.security:authentication-api:0.0.2-SNAPSHOT" },
+    { "id": "org.eclipse.sensinact.gateway.northbound.security:security-api:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.session:session-api:0.0.2-SNAPSHOT" },
     { "id": "org.eclipse.sensinact.gateway.northbound.session:session-impl:0.0.2-SNAPSHOT" },
     { "id": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1" },

diff --git a/northbound/query-handler/integration-test.bndrun b/northbound/query-handler/integration-test.bndrun
@@ -44,6 +44,7 @@
 	org.eclipse.sensinact.gateway.northbound.filters.filters.core;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.query-handler;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.query-handler-tests;version='[0.0.2,0.0.3)',\
+	org.eclipse.sensinact.gateway.northbound.security.security-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.session.session-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.session.session-impl;version='[0.0.2,0.0.3)',\
 	org.gecko.emf.osgi.component.minimal;version='[6.1.0,6.1.1)',\

diff --git a/...c/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java b/...c/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java
@@ -22,7 +22,6 @@
 
 import org.eclipse.sensinact.core.push.DataUpdate;
 import org.eclipse.sensinact.core.push.dto.GenericDto;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.northbound.query.api.AbstractResultDTO;
 import org.eclipse.sensinact.northbound.query.api.EResultType;
 import org.eclipse.sensinact.northbound.query.api.IQueryHandler;
@@ -38,6 +37,7 @@
 import org.eclipse.sensinact.northbound.query.dto.result.ResultListResourcesDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.ResultListServicesDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.TypedResponse;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/.../test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java b/.../test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java
@@ -26,7 +26,6 @@
 import org.eclipse.sensinact.core.push.DataUpdate;
 import org.eclipse.sensinact.core.push.dto.BulkGenericDto;
 import org.eclipse.sensinact.core.push.dto.GenericDto;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.northbound.query.api.AbstractResultDTO;
 import org.eclipse.sensinact.northbound.query.api.EResultType;
 import org.eclipse.sensinact.northbound.query.api.IQueryHandler;
@@ -40,6 +39,7 @@
 import org.eclipse.sensinact.northbound.query.dto.result.ResultListResourcesDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.ResultListServicesDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.TypedResponse;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java b/...test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java
@@ -32,7 +32,6 @@
 import org.eclipse.sensinact.core.notification.ResourceDataNotification;
 import org.eclipse.sensinact.core.push.DataUpdate;
 import org.eclipse.sensinact.core.push.dto.GenericDto;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.gateway.geojson.GeoJsonObject;
 import org.eclipse.sensinact.northbound.query.api.EResultType;
 import org.eclipse.sensinact.northbound.query.api.IQueryHandler;
@@ -43,6 +42,7 @@
 import org.eclipse.sensinact.northbound.query.dto.result.ResponseGetDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.ResultActDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.TypedResponse;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 import org.junit.jupiter.api.AfterEach;

diff --git a/northbound/rest/integration-test.bndrun b/northbound/rest/integration-test.bndrun
@@ -78,7 +78,7 @@
 	org.eclipse.sensinact.gateway.northbound.query-handler;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.rest;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.rest-tests;version='[0.0.2,0.0.3)',\
-	org.eclipse.sensinact.gateway.northbound.security.authentication-api;version='[0.0.2,0.0.3)',\
+	org.eclipse.sensinact.gateway.northbound.security.security-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.session.session-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.session.session-impl;version='[0.0.2,0.0.3)',\
 	org.gecko.emf.osgi.component.minimal;version='[6.1.0,6.1.1)',\

diff --git a/northbound/rest/pom.xml b/northbound/rest/pom.xml
@@ -44,7 +44,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}.security</groupId>
-      <artifactId>authentication-api</artifactId>
+      <artifactId>security-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/...d/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/AuthenticationFilter.java b/...d/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/AuthenticationFilter.java
@@ -30,8 +30,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.northbound.security.api.Authenticator;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.security.api.Authenticator.Scheme;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...st/src/main/java/org/eclipse/sensinact/northbound/rest/impl/SensinactSessionProvider.java b/...st/src/main/java/org/eclipse/sensinact/northbound/rest/impl/SensinactSessionProvider.java
@@ -14,8 +14,8 @@
 
 import java.security.Principal;
 
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.northbound.rest.impl.AuthenticationFilter.UserInfoPrincipal;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 

diff --git a/...t/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java b/...t/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java
@@ -33,7 +33,6 @@
 import org.eclipse.sensinact.core.notification.ResourceDataNotification;
 import org.eclipse.sensinact.core.push.DataUpdate;
 import org.eclipse.sensinact.core.push.dto.GenericDto;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.gateway.geojson.Coordinates;
 import org.eclipse.sensinact.gateway.geojson.GeoJsonObject;
 import org.eclipse.sensinact.gateway.geojson.Point;
@@ -43,6 +42,7 @@
 import org.eclipse.sensinact.northbound.query.dto.result.ResponseGetDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.ResultActDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.TypedResponse;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 import org.junit.jupiter.api.AfterEach;

diff --git a/...est/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java b/...est/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java
@@ -25,11 +25,11 @@
 
 import org.eclipse.sensinact.core.push.DataUpdate;
 import org.eclipse.sensinact.core.push.dto.GenericDto;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.northbound.query.api.EResultType;
 import org.eclipse.sensinact.northbound.query.dto.result.ResponseGetDTO;
 import org.eclipse.sensinact.northbound.query.dto.result.TypedResponse;
 import org.eclipse.sensinact.northbound.security.api.Authenticator;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;

diff --git a/...eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java b/...eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java
@@ -28,11 +28,11 @@
 import org.eclipse.sensinact.core.notification.ResourceDataNotification;
 import org.eclipse.sensinact.core.push.DataUpdate;
 import org.eclipse.sensinact.core.push.dto.GenericDto;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.model.core.provider.ProviderPackage;
 import org.eclipse.sensinact.northbound.query.dto.notification.ResourceDataNotificationDTO;
 import org.eclipse.sensinact.northbound.query.dto.notification.ResourceLifecycleNotificationDTO;
 import org.eclipse.sensinact.northbound.rest.integration.TestUtils;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 import org.junit.jupiter.api.AfterEach;

diff --git a/northbound/security/openid-connect/integration-test.bndrun b/northbound/security/openid-connect/integration-test.bndrun
@@ -41,12 +41,9 @@
 	org.eclipse.jetty.http;version='[11.0.13,11.0.14)',\
 	org.eclipse.jetty.io;version='[11.0.13,11.0.14)',\
 	org.eclipse.jetty.util;version='[11.0.13,11.0.14)',\
-	org.eclipse.sensinact.gateway.core.annotation;version='[0.0.2,0.0.3)',\
-	org.eclipse.sensinact.gateway.core.api;version='[0.0.2,0.0.3)',\
-	org.eclipse.sensinact.gateway.core.geo-json;version='[0.0.2,0.0.3)',\
-	org.eclipse.sensinact.gateway.northbound.security.authentication-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.security.openid-connect;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.security.openid-connect-tests;version='[0.0.2,0.0.3)',\
+	org.eclipse.sensinact.gateway.northbound.security.security-api;version='[0.0.2,0.0.3)',\
 	org.mockito.junit-jupiter;version='[5.10.0,5.10.1)',\
 	org.mockito.mockito-core;version='[5.10.0,5.10.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\

diff --git a/northbound/security/openid-connect/pom.xml b/northbound/security/openid-connect/pom.xml
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>authentication-api</artifactId>
+      <artifactId>security-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/...ect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/JwsUserInfo.java b/...ect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/JwsUserInfo.java
@@ -15,7 +15,7 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import org.eclipse.sensinact.core.security.UserInfo;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;

diff --git a/.../main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/OIDCTokenValidator.java b/.../main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/OIDCTokenValidator.java
@@ -22,9 +22,9 @@
 import org.eclipse.jetty.client.util.InputStreamResponseListener;
 import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.gateway.northbound.security.oidc.Certificates.KeyInfo;
 import org.eclipse.sensinact.northbound.security.api.Authenticator;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.annotations.Activate;

diff --git a/...ava/org/eclipse/sensinact/gateway/northbound/security/oidc/integration/ValidatorTest.java b/...ava/org/eclipse/sensinact/gateway/northbound/security/oidc/integration/ValidatorTest.java
@@ -39,10 +39,10 @@
 
 import javax.crypto.spec.SecretKeySpec;
 
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.gateway.northbound.security.oidc.Certificates;
 import org.eclipse.sensinact.gateway.northbound.security.oidc.Certificates.KeyInfo;
 import org.eclipse.sensinact.northbound.security.api.Authenticator;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;

diff --git a/northbound/security/pom.xml b/northbound/security/pom.xml
@@ -26,6 +26,6 @@
 
   <modules>
       <module>openid-connect</module>
-      <module>authentication-api</module>
+      <module>security-api</module>
   </modules>
 </project>
diff --git a/...bound/security/authentication-api/pom.xml → northbound/security/security-api/pom.xml b/...bound/security/authentication-api/pom.xml → northbound/security/security-api/pom.xml
@@ -17,7 +17,7 @@
     <artifactId>security</artifactId>
     <version>0.0.2-SNAPSHOT</version>
   </parent>
-  <artifactId>authentication-api</artifactId>
+  <artifactId>security-api</artifactId>
   <name>SensiNact Northbound Security API</name>
   <description>The Security API for sensiNact gateway Northbound providers</description>
   <!-- No integration tests -->

diff --git a/...orthbound/security/api/Authenticator.java → ...orthbound/security/api/Authenticator.java b/...orthbound/security/api/Authenticator.java → ...orthbound/security/api/Authenticator.java
@@ -12,8 +12,6 @@
 **********************************************************************/
 package org.eclipse.sensinact.northbound.security.api;
 
-import org.eclipse.sensinact.core.security.UserInfo;
-
 public interface Authenticator {
 
     public UserInfo authenticate(String user, String credential);

diff --git a/...pse/sensinact/core/security/UserInfo.java → ...act/northbound/security/api/UserInfo.java b/...pse/sensinact/core/security/UserInfo.java → ...act/northbound/security/api/UserInfo.java
@@ -10,7 +10,7 @@
 * Contributors:
 *   Kentyou - initial implementation
 **********************************************************************/
-package org.eclipse.sensinact.core.security;
+package org.eclipse.sensinact.northbound.security.api;
 
 public interface UserInfo {
 

diff --git a/...northbound/security/api/package-info.java → ...northbound/security/api/package-info.java b/...northbound/security/api/package-info.java → ...northbound/security/api/package-info.java
diff --git a/northbound/sensorthings/rest.gateway/integration-test.bndrun b/northbound/sensorthings/rest.gateway/integration-test.bndrun
@@ -77,6 +77,7 @@
 	org.eclipse.sensinact.gateway.core.models.metadata;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.core.models.provider;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.filters.filters.core;version='[0.0.2,0.0.3)',\
+	org.eclipse.sensinact.gateway.northbound.security.security-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.sensorthings.dto;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.sensorthings.filter;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.sensorthings.rest.api;version='[0.0.2,0.0.3)',\

diff --git a/...n/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSessionProvider.java b/...n/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSessionProvider.java
@@ -12,7 +12,7 @@
 **********************************************************************/
 package org.eclipse.sensinact.sensorthings.sensing.rest.impl;
 
-import org.eclipse.sensinact.core.security.UserInfo;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 

diff --git a/.../org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java b/.../org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java
@@ -23,9 +23,9 @@
 import org.eclipse.sensinact.core.model.SensinactModelManager;
 import org.eclipse.sensinact.core.push.DataUpdate;
 import org.eclipse.sensinact.core.push.dto.GenericDto;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.core.twin.SensinactDigitalTwin;
 import org.eclipse.sensinact.core.twin.SensinactProvider;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 import org.eclipse.sensinact.northbound.session.SensiNactSession;
 import org.eclipse.sensinact.northbound.session.SensiNactSessionManager;
 import org.eclipse.sensinact.sensorthings.sensing.dto.Id;

diff --git a/northbound/session/session-api/pom.xml b/northbound/session/session-api/pom.xml
@@ -40,6 +40,11 @@
       <artifactId>api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.sensinact.gateway.northbound.security</groupId>
+      <artifactId>security-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/.../session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSession.java b/.../session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSession.java
@@ -22,10 +22,10 @@
 import org.eclipse.sensinact.core.notification.ClientDataListener;
 import org.eclipse.sensinact.core.notification.ClientLifecycleListener;
 import org.eclipse.sensinact.core.notification.ClientMetadataListener;
-import org.eclipse.sensinact.core.security.UserInfo;
 import org.eclipse.sensinact.core.snapshot.ICriterion;
 import org.eclipse.sensinact.core.snapshot.ProviderSnapshot;
 import org.eclipse.sensinact.core.twin.TimedValue;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 
 public interface SensiNactSession {
 

diff --git a/...n-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSessionManager.java b/...n-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSessionManager.java
@@ -14,7 +14,7 @@
 
 import java.util.List;
 
-import org.eclipse.sensinact.core.security.UserInfo;
+import org.eclipse.sensinact.northbound.security.api.UserInfo;
 
 public interface SensiNactSessionManager {