Merge pull request #385 from geosolutions-it/oidc_okta_testing

Improvements with OKTA OIDC provider integration
geosolutions-it · Nov 6, 2024 · c4d3b18 · c4d3b18
2 parents 8830b56 + d5668d9
commit c4d3b18
Show file tree

Hide file tree

Showing 4 changed files with 652 additions and 97 deletions.
diff --git a/src/modules/rest/impl/pom.xml b/src/modules/rest/impl/pom.xml
@@ -255,6 +255,22 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- JUnit 5 -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.9.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Mockito for JUnit 5 -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>4.8.0</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -288,8 +304,15 @@
                             </executions>
                         </plugin>
             -->
+            <!-- Maven Surefire Plugin -->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M7</version>
+                <configuration>
+                    <useModulePath>false</useModulePath>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
-
 </project>
diff --git a/...mpl/src/main/java/it/geosolutions/geostore/services/rest/impl/RESTSessionServiceImpl.java b/...mpl/src/main/java/it/geosolutions/geostore/services/rest/impl/RESTSessionServiceImpl.java
@@ -189,7 +189,9 @@ private SessionToken toSessionToken(String accessToken, UserSession sessionToken
     @Override
     public SessionToken refresh(SecurityContext sc, String sessionId, String refreshToken) {
         String provider =
-                (String) RequestContextHolder.getRequestAttributes().getAttribute(PROVIDER_KEY, 0);
+                (String)
+                        Objects.requireNonNull(RequestContextHolder.getRequestAttributes())
+                                .getAttribute(PROVIDER_KEY, 0);
         SessionServiceDelegate delegate = getDelegate(provider);
         return delegate.refresh(refreshToken, sessionId);
     }