From a497ad8c4147af55a8dfa84759e4b839f22d0bfb Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Fri, 29 Dec 2023 21:05:32 +0000
Subject: [PATCH] api changes to get metrics working

---
 .../software/SPDF/config/MetricsFilter.java   | 48 ++++++++++---------
 .../software/SPDF/config/OpenApiConfig.java   | 35 ++++++++++----
 .../controller/web/MetricsController.java     |  4 +-
 3 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/src/main/java/stirling/software/SPDF/config/MetricsFilter.java b/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
index 6ee59db7..9abb68bf 100644
--- a/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
@@ -16,33 +16,35 @@ import jakarta.servlet.http.HttpServletResponse;
 @Component
 public class MetricsFilter extends OncePerRequestFilter {
 
-    private final MeterRegistry meterRegistry;
+	private final MeterRegistry meterRegistry;
 
-    @Autowired
-    public MetricsFilter(MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-    }
+	@Autowired
+	public MetricsFilter(MeterRegistry meterRegistry) {
+		this.meterRegistry = meterRegistry;
+	}
 
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-            throws ServletException, IOException {
-        String uri = request.getRequestURI();
-        
-        //System.out.println("uri="+uri + ", method=" + request.getMethod() );
-        // Ignore static resources
-        if (!(uri.startsWith("/js") || uri.startsWith("api-docs") || uri.endsWith("robots.txt") || uri.startsWith("/images") || uri.endsWith(".png") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".svg")|| uri.endsWith(".js") || uri.contains("swagger") || uri.startsWith("/api"))) {
-            Counter counter = Counter.builder("http.requests")
-                    .tag("uri", uri)
-                    .tag("method", request.getMethod())
-                    .register(meterRegistry);
+	@Override
+	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+			throws ServletException, IOException {
+		String uri = request.getRequestURI();
 
-            counter.increment();
-            //System.out.println("Counted");
-        }
+		// System.out.println("uri="+uri + ", method=" + request.getMethod() );
+		// Ignore static resources
+		if (!(uri.startsWith("/js") || uri.startsWith("/v1/api-docs") || uri.endsWith("robots.txt")
+				|| uri.startsWith("/images")  || uri.startsWith("/images")|| uri.endsWith(".png") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".map")
+				|| uri.endsWith(".svg") || uri.endsWith(".js") || uri.contains("swagger")
+				|| uri.startsWith("/api/v1/info") || uri.startsWith("/site.webmanifest")  || uri.startsWith("/fonts") || uri.startsWith("/pdfjs") )) {
+			
+			
+			
+			Counter counter = Counter.builder("http.requests").tag("uri", uri).tag("method", request.getMethod())
+					.register(meterRegistry);
 
-        filterChain.doFilter(request, response);
-    }
+			counter.increment();
+			// System.out.println("Counted");
+		}
 
-    
+		filterChain.doFilter(request, response);
+	}
 
 }
diff --git a/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java b/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
index 2583277e..5dba40d0 100644
--- a/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
@@ -1,27 +1,42 @@
 package stirling.software.SPDF.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
 public class OpenApiConfig {
 
+	@Autowired
+	ApplicationProperties applicationProperties;
+
 	@Bean
 	public OpenAPI customOpenAPI() {
-	    String version = getClass().getPackage().getImplementationVersion();
-	    if (version == null) {
-	        
-	            version = "1.0.0"; // default version if all else fails
-	        
-	    }
+		String version = getClass().getPackage().getImplementationVersion();
+		if (version == null) {
+			version = "1.0.0"; // default version if all else fails
+		}
+
+		SecurityScheme apiKeyScheme = new SecurityScheme().type(SecurityScheme.Type.APIKEY).in(SecurityScheme.In.HEADER)
+				.name("X-API-KEY");
+		if (!applicationProperties.getSecurity().getEnableLogin()) {
+			return new OpenAPI().components(new Components())
+					.info(new Info().title("Stirling PDF API").version(version).description(
+							"API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
+		} else {
+			return new OpenAPI().components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
+					.info(new Info().title("Stirling PDF API").version(version).description(
+							"API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."))
+					.addSecurityItem(new SecurityRequirement().addList("apiKey"));
+		}
 
-	    return new OpenAPI().components(new Components()).info(
-	            new Info().title("Stirling PDF API").version(version).description("API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
 	}
 
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java b/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
index 9dc4f2b7..dbb254a7 100644
--- a/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
@@ -27,8 +27,8 @@ import stirling.software.SPDF.config.StartupApplicationListener;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @RestController
-@RequestMapping("/api/v1")
-@Tag(name = "API", description = "Info APIs")
+@RequestMapping("/api/v1/info")
+@Tag(name = "Info", description = "Info APIs")
 public class MetricsController {