Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions splunk/src/main/java/com/splunk/Service.java
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,26 @@ public void setToken(String value) {
this.token = value;
}

/**
* Provides a session token having <b>Splunk</b> added before token.
* This method is specifically used when user just have token value.
*
* @param value The token value
*/
public void setSplunkToken(String value) {
this.token = value.contains("Splunk") ? value : "Splunk " + value;
}

/**
* Provides a session token having <b>Bearer</b> added before token.
* This method is specifically used when user just have token value.
*
* @param value The token value
*/
public void setBearerToken(String value) {
this.token = value.contains("Splunk") || value.contains("Bearer") ? value : "Bearer " + value;
}

/**
* Returns true if this Splunk instance's version is no earlier than
* the version specified in {@code version}.
Expand Down
23 changes: 23 additions & 0 deletions splunk/src/test/java/com/splunk/ServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,29 @@ public void testLoginWithToken() {
Assert.assertEquals(s.getToken(), validToken);
}

@Test
public void testLoginWithOnlyTokenValue() {
String validToken = service.getToken();

ServiceArgs args = new ServiceArgs();
args.setHost((String) command.opts.get("host"));
args.setUsername((String) command.opts.get("username"));
args.setPassword((String) command.opts.get("password"));
args.setPort((Integer) command.opts.get("port"));
args.setScheme((String) command.opts.get("scheme"));

Service service2 = new Service(args);
service2.login();

// Manually removing Splunk keyword from preset token.
String modifiedToken = (service2.getToken().replace("Splunk", "")).trim();
service2.setSplunkToken(modifiedToken);

service2.getSettings().refresh();

Assert.assertEquals(service2.getToken(), validToken);
}

@Test
public void testLoginGetters() {
Service s = new Service("theHost");
Expand Down