X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pmproducer%2Fsrc%2Fmain%2Fjava%2Forg%2Foran%2Fpmproducer%2Foauth2%2FSecurityContext.java;fp=pmproducer%2Fsrc%2Fmain%2Fjava%2Forg%2Foran%2Fpmproducer%2Fclients%2FSecurityContext.java;h=936d4a9c4434b0e7955ca81df1ce74997c383928;hb=298969556b0f84de745a67e994a590d8b2a3de13;hp=5b774476e49875fe573ab738cdc862b4b48c405c;hpb=ebd1c0b01fb80f1313678c777d4b1cb46800c23d;p=nonrtric%2Fplt%2Franpm.git

diff --git a/pmproducer/src/main/java/org/oran/pmproducer/clients/SecurityContext.java b/pmproducer/src/main/java/org/oran/pmproducer/oauth2/SecurityContext.java
similarity index 87%
rename from pmproducer/src/main/java/org/oran/pmproducer/clients/SecurityContext.java
rename to pmproducer/src/main/java/org/oran/pmproducer/oauth2/SecurityContext.java
index 5b77447..936d4a9 100644
--- a/pmproducer/src/main/java/org/oran/pmproducer/clients/SecurityContext.java
+++ b/pmproducer/src/main/java/org/oran/pmproducer/oauth2/SecurityContext.java
@@ -18,12 +18,13 @@
  * ========================LICENSE_END===================================
  */
 
-package org.oran.pmproducer.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) {