Added support for using oauth token for Kafka

[nonrtric/plt/ranpm.git] / pmproducer / src / main / java / org / oran / pmproducer / oauth2 / SecurityContext.java

diff --git a/influxlogger/src/main/java/org/oran/pmlog/clients/SecurityContext.java b/pmproducer/src/main/java/org/oran/pmproducer/oauth2/SecurityContext.java
similarity index 85%
rename from influxlogger/src/main/java/org/oran/pmlog/clients/SecurityContext.java
rename to pmproducer/src/main/java/org/oran/pmproducer/oauth2/SecurityContext.java
index 5aeb4a3..936d4a9 100644 (file)
--- a/influxlogger/src/main/java/org/oran/pmlog/clients/SecurityContext.java
+++ b/pmproducer/src/main/java/org/oran/pmproducer/oauth2/SecurityContext.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2022 Nordix Foundation
+ * Copyright (C) 2023 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,13 @@
  * ========================LICENSE_END===================================
  */
 
-package org.oran.pmlog.clients;
+package org.oran.pmproducer.oauth2;
 
 import java.lang.invoke.MethodHandles;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import lombok.Getter;
 import lombok.Setter;
 
 import org.slf4j.Logger;
@@ -44,10 +45,14 @@ public class SecurityContext {
 
     private String authToken = "";
 
+    @Getter
+    private static SecurityContext instance;
+
     @Setter
     private Path authTokenFilePath;
 
-    public SecurityContext(@Value("${app.auth-token-file:}") String authTokenFilename) {
+    public SecurityContext(@Value("${app.auth-token-file}") String authTokenFilename) {
+        instance = this;
         if (!authTokenFilename.isEmpty()) {
             this.authTokenFilePath = Path.of(authTokenFilename);
         }
@@ -59,12 +64,14 @@ public class SecurityContext {
 
     public synchronized String getBearerAuthToken() {
         if (!isConfigured()) {
+            logger.warn("No configuration for auth token");
             return "";
         }
         try {
             long lastModified = authTokenFilePath.toFile().lastModified();
             if (tokenTimestamp == 0 || lastModified != this.tokenTimestamp) {
                 this.authToken = Files.readString(authTokenFilePath);
+                this.authToken = this.authToken.trim();
                 this.tokenTimestamp = lastModified;
             }
         } catch (Exception e) {