Add interface for AuthToken

Signed-off-by: Ryan Liang <[email protected]>
RyanL1997 · Jul 18, 2023 · a746202 · a746202
1 parent 4fdfaf7
commit a746202
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/extensions/rest/RestSendToExtensionAction.java b/server/src/main/java/org/opensearch/extensions/rest/RestSendToExtensionAction.java
@@ -256,7 +256,7 @@ public String executor() {
                                                                                                                               // an
                                                                                                                               // extensions
                                                                                                                               // uniqueId
-                        .toString(),
+                        .getTokenValue(),
                     httpVersion
                 ),
                 restExecuteOnExtensionResponseHandler

diff --git a/server/src/main/java/org/opensearch/identity/tokens/AuthToken.java b/server/src/main/java/org/opensearch/identity/tokens/AuthToken.java
@@ -14,5 +14,5 @@
  * @opensearch.experimental
  */
 public interface AuthToken {
-
+  String getTokenValue();
 }
diff --git a/server/src/main/java/org/opensearch/identity/tokens/BasicAuthToken.java b/server/src/main/java/org/opensearch/identity/tokens/BasicAuthToken.java
@@ -51,4 +51,13 @@ public void revoke() {
         this.password = "";
         this.user = "";
     }
+
+    @Override
+    public String getTokenValue() {
+        if (user == null || password == null) {
+            return null;
+        }
+        String usernamepassword = user + ":" + password;
+        return Base64.getEncoder().encodeToString(usernamepassword.getBytes(StandardCharsets.UTF_8));
+    }
 }
diff --git a/server/src/main/java/org/opensearch/identity/tokens/BearerAuthToken.java b/server/src/main/java/org/opensearch/identity/tokens/BearerAuthToken.java
@@ -58,4 +58,9 @@ public String getTokenIdentifier() {
     public String toString() {
         return "Bearer auth token with header=" + header + ", payload=" + payload + ", signature=" + signature;
     }
+
+    @Override
+    public String getTokenValue() {
+        return completeToken;
+    }
 }