- Fix NPE exceptions

geosolutions-it · Jul 9, 2024 · 23a046c · 23a046c
1 parent 863d55a
commit 23a046c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/...n/java/it/geosolutions/geostore/services/rest/security/keycloak/KeyCloakLoginService.java b/...n/java/it/geosolutions/geostore/services/rest/security/keycloak/KeyCloakLoginService.java
@@ -101,7 +101,7 @@ public Response doInternalRedirect(
             token = getAccessToken();
             refreshToken = getRefreshAccessToken();
         }
-        return buildCallbackResponse(token, refreshToken, provider);
+        return buildCallbackResponse(response, token, refreshToken, provider);
     }
 
     private KeycloakTokenDetails getDetails() {

diff --git a/...src/main/java/it/geosolutions/geostore/services/rest/security/oauth2/DiscoveryClient.java b/...src/main/java/it/geosolutions/geostore/services/rest/security/oauth2/DiscoveryClient.java
@@ -108,21 +108,16 @@ public void autofill(OAuth2Configuration conf) {
                                 s -> {
                                     @SuppressWarnings("unchecked")
                                     List<String> scopes = (List<String>) s;
-
-                                    // Get existing scopes from conf and split into a Set
-                                    Set<String> mergedScopes = new HashSet<>();
-                                    mergedScopes.addAll(Arrays.asList(conf.getScopes().split(",")));
-
-                                    // Add new scopes from the response to the set
-                                    mergedScopes.addAll(scopes);
-
-                                    // Update the configuration with the merged scopes
-                                    conf.setScopes(String.join(",", mergedScopes));
+                                    conf.setScopes(collectScopes(scopes));
                                 });
             }
         }
     }
 
+    private String collectScopes(List<String> scopes) {
+        return String.join(",", scopes);
+    }
+
     protected String getUserinfoEndpointAttrName() {
         return USERINFO_ENDPOINT_ATTR_NAME;
     }

diff --git a/.../main/java/it/geosolutions/geostore/services/rest/security/oauth2/Oauth2LoginService.java b/.../main/java/it/geosolutions/geostore/services/rest/security/oauth2/Oauth2LoginService.java
@@ -43,11 +43,11 @@ public Response doInternalRedirect(
             HttpServletRequest request, HttpServletResponse response, String provider) {
         String token = getAccessToken();
         String refreshToken = getRefreshAccessToken();
-        return buildCallbackResponse(token, refreshToken, provider);
+        return buildCallbackResponse(response, token, refreshToken, provider);
     }
 
     protected Response.ResponseBuilder getCallbackResponseBuilder(
-            String token, String refreshToken, String provider) {
+            HttpServletResponse response, String token, String refreshToken, String provider) {
         Response.ResponseBuilder result = new ResponseBuilderImpl();
         IdPConfiguration configuration = configuration(provider);
         LOGGER.info("Callback Provider: {}", provider);
@@ -84,7 +84,7 @@ protected Response.ResponseBuilder getCallbackResponseBuilder(
                                                 + e.getMessage());
             }
         } else {
-            LOGGER.error("No access token found on callback request.");
+            LOGGER.error("No access token found on callback request: {}", response.getStatus());
             result =
                     Response.status(Response.Status.INTERNAL_SERVER_ERROR)
                             .entity("No access token found.");
@@ -104,8 +104,10 @@ protected TokenStorage tokenStorage() {
         return GeoStoreContext.bean(TokenStorage.class);
     }
 
-    protected Response buildCallbackResponse(String token, String refreshToken, String provider) {
-        Response.ResponseBuilder result = getCallbackResponseBuilder(token, refreshToken, provider);
+    protected Response buildCallbackResponse(
+            HttpServletResponse response, String token, String refreshToken, String provider) {
+        Response.ResponseBuilder result =
+                getCallbackResponseBuilder(response, token, refreshToken, provider);
         return result.build();
     }
 

diff --git a/...ions/geostore/services/rest/security/oauth2/openid_connect/OpenIdConnectLoginService.java b/...ions/geostore/services/rest/security/oauth2/openid_connect/OpenIdConnectLoginService.java
@@ -98,6 +98,6 @@ public Response doInternalRedirect(
         }
         assert requestAttributes != null;
         requestAttributes.setAttribute(PROVIDER_KEY, provider, 0);
-        return buildCallbackResponse(token, refreshToken, provider);
+        return buildCallbackResponse(response, token, refreshToken, provider);
     }
 }