Commit bc5e93d5 authored by Bhushan Rade's avatar Bhushan Rade
Browse files

resolved conflicts

parent 9af3cc16
Pipeline #11295 passed with stages
in 15 minutes and 2 seconds
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<java.version>8</java.version> <java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<os-core-lib-ibm.version>0.3.6-SNAPSHOT</os-core-lib-ibm.version> <os-core-lib-ibm.version>0.3.8-SNAPSHOT</os-core-lib-ibm.version>
</properties> </properties>
<repositories> <repositories>
......
...@@ -21,17 +21,19 @@ public class IBMTestUtils extends TestUtils { ...@@ -21,17 +21,19 @@ public class IBMTestUtils extends TestUtils {
@Override @Override
public synchronized String getAdminToken() throws Exception { public synchronized String getAdminToken() throws Exception {
if(Strings.isNullOrEmpty(adminToken)) { if(Strings.isNullOrEmpty(adminToken)) {
adminToken = IdentityClient.getTokenForUserWithAccess(); adminToken = IdentityClient.getTokenForUserWithAdminsAccess();
} }
return adminToken; return "Bearer " + adminToken;
} }
@Override @Override
public synchronized String getEditorToken() throws Exception { public synchronized String getEditorToken() throws Exception {
if(Strings.isNullOrEmpty(editorToken)) { if(Strings.isNullOrEmpty(editorToken)) {
editorToken = IdentityClient.getTokenForUserWithAccess(); editorToken = IdentityClient.getTokenForUserWithEditorsAccess();
} }
return editorToken; return "Bearer " + editorToken;
} }
@Override @Override
...@@ -39,7 +41,9 @@ public class IBMTestUtils extends TestUtils { ...@@ -39,7 +41,9 @@ public class IBMTestUtils extends TestUtils {
if(Strings.isNullOrEmpty(noAccessToken)) { if(Strings.isNullOrEmpty(noAccessToken)) {
noAccessToken = IdentityClient.getTokenForUserWithNoAccess(); noAccessToken = IdentityClient.getTokenForUserWithNoAccess();
} }
return noAccessToken;
return "Bearer " + noAccessToken;
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment