Skip to content
Snippets Groups Projects
Commit d313d3e9 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

GMS client improvements

parent a625faa5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 400 additions and 421 deletions
.gitignore
+ 1
− 3
View file @ d313d3e9
...@@ -54,12 +54,10 @@ nbactions.xml ...@@ -54,12 +54,10 @@ nbactions.xml
### VS Code ### ### VS Code ###
.vscode/ .vscode/
/gms-ui/target/
/gms/nbactions-release-profile.xml /gms/nbactions-release-profile.xml
/gms-client/gms-client-lib/target/
/gms-client/gms-cli/target/
/gms/node/ /gms/node/
**/target/*
nb-configuration.xml nb-configuration.xml
dependency-reduced-pom.xml dependency-reduced-pom.xml
......
gms-client/gms-cli/gms.properties
+ 4
− 2
View file @ d313d3e9
base_url=http://localhost:8082/gms/ws/jwt gms_url=http://localhost:8082/gms/ws/jwt
token=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjM0ZmU4MDcwMDVhNTcxMTYifQ.eyJpc3MiOiJzc28uaWEyLmluYWYuaXQiLCJzdWIiOiIyMzg2IiwiaWF0IjoxNTg3NjU5NzYxLCJleHAiOjE1ODc3NDYxNjEsImF1ZCI6ImdtcyJ9.KcXRAciG3ApqlE8MFM8VYW9WAX3hEZb7Vk8jB9uJtWsOMU48ha_Ybb4k_f0nrD2jhOxwaNn2QMxWZuflwCf1N-KiCj5Ff9f8xKOrrXZrl-w1H3_dwtMlIS8t2b0-w0WwRJ7UIhrwVBzmCcWinD3qJhFPzyO2pi-A4aXV57RpJ68VXfALQXeHK0sslrf-RgAU3xWYOgjGTUoGB5BQYC9huA_bZ0eV1HFcancs9pDdoTusqZs8OkPFCJbo7-L5eibsuykqnLHztYdCcP2Vtvtwb0pww-ofWZblIHzoMI8i-ipnfLJETG8Dpc7FrhjCYLw3AEGZg4U1wYTeqG3HRbPXSQ client_id=gms_cli
client_secret=gms
rap_url=http://localhost/rap-ia2
gms-client/gms-cli/pom.xml
+ 1
− 1
View file @ d313d3e9
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>gms-client-lib</artifactId> <artifactId>gms-client</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java
+ 16
− 12
View file @ d313d3e9
package it.inaf.ia2.gms.cli; package it.inaf.ia2.gms.cli;
import it.inaf.ia2.client.ClientException;
import it.inaf.ia2.gms.client.GmsClient; import it.inaf.ia2.gms.client.GmsClient;
import it.inaf.ia2.gms.client.GmsClientBuilder;
import it.inaf.ia2.gms.client.model.Permission; import it.inaf.ia2.gms.client.model.Permission;
import it.inaf.ia2.rap.client.RapClient;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
...@@ -61,7 +62,11 @@ public class CLI { ...@@ -61,7 +62,11 @@ public class CLI {
default: default:
verifyConfigLoaded(); verifyConfigLoaded();
createClient(); createClient();
parseCommand(); try {
parseCommand();
} catch (ClientException ex) {
System.err.println(ex.getMessage());
}
commandParsed = true; commandParsed = true;
break; break;
} }
...@@ -96,17 +101,16 @@ public class CLI { ...@@ -96,17 +101,16 @@ public class CLI {
} }
private void createClient() { private void createClient() {
GmsClientBuilder clientBuilder = new GmsClientBuilder()
.setGmsBaseUrl(gmsBaseUrl); client = new GmsClient(gmsBaseUrl);
if (token != null) { if (token != null) {
client = clientBuilder.build();
client.setAccessToken(token); client.setAccessToken(token);
} else { } else {
client = clientBuilder.setClientId(clientId) RapClient rapClient = new RapClient(rapBaseUrl)
.setClientSecret(clientSecret) .setClientId(clientId)
.setRapBaseUrl(rapBaseUrl) .setClientSecret(clientSecret);
.build(); client.setAccessToken(rapClient.getAccessTokenFromClientCredentials());
} }
} }
...@@ -118,7 +122,7 @@ public class CLI { ...@@ -118,7 +122,7 @@ public class CLI {
} }
Properties properties = new Properties(); Properties properties = new Properties();
try (InputStream in = new FileInputStream(config)) { try ( InputStream in = new FileInputStream(config)) {
properties.load(in); properties.load(in);
} catch (IOException ex) { } catch (IOException ex) {
throw new UncheckedIOException(ex); throw new UncheckedIOException(ex);
...@@ -141,7 +145,7 @@ public class CLI { ...@@ -141,7 +145,7 @@ public class CLI {
System.exit(1); System.exit(1);
} }
try (InputStream in = new FileInputStream(tokenFile)) { try ( InputStream in = new FileInputStream(tokenFile)) {
java.util.Scanner s = new java.util.Scanner(in).useDelimiter("\\A"); java.util.Scanner s = new java.util.Scanner(in).useDelimiter("\\A");
token = s.next().trim(); token = s.next().trim();
} catch (IOException ex) { } catch (IOException ex) {
......
gms-client/gms-client-lib/pom.xml deleted 100644 → 0
+ 0
− 32
View file @ a625faa5
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>it.inaf.ia2</groupId>
<artifactId>gms-client-lib</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>12</maven.compiler.source>
<maven.compiler.target>12</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.23.4</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/GmsClient.java deleted 100644 → 0
+ 0
− 91
View file @ a625faa5
package it.inaf.ia2.gms.client;
import it.inaf.ia2.gms.client.call.AddInvitedRegistrationCall;
import it.inaf.ia2.gms.client.call.HttpClientWrapper;
import it.inaf.ia2.gms.client.call.AddMemberCall;
import it.inaf.ia2.gms.client.call.AddPermissionCall;
import it.inaf.ia2.gms.client.call.CreateGroupCall;
import it.inaf.ia2.gms.client.call.DeleteGroupCall;
import it.inaf.ia2.gms.client.call.GetGroupPermissionsCall;
import it.inaf.ia2.gms.client.call.GetMemberEmailAddresses;
import it.inaf.ia2.gms.client.call.GetUserGroupsCall;
import it.inaf.ia2.gms.client.call.GetUserPermissionsCall;
import it.inaf.ia2.gms.client.call.ListGroupsCall;
import it.inaf.ia2.gms.client.call.RemoveMemberCall;
import it.inaf.ia2.gms.client.call.RemovePermissionCall;
import it.inaf.ia2.gms.client.call.SetPermissionCall;
import it.inaf.ia2.gms.client.model.GroupPermission;
import it.inaf.ia2.gms.client.model.Permission;
import it.inaf.ia2.gms.client.model.UserPermission;
import java.util.List;
import java.util.Map;
public class GmsClient {
private final HttpClientWrapper httpClientWrapper;
GmsClient(HttpClientWrapper httpClientWrapper) {
this.httpClientWrapper = httpClientWrapper;
}
public GmsClient setAccessToken(String accessToken) {
httpClientWrapper.setAccessToken(accessToken);
return this;
}
public List<String> getMyGroups(String prefix) {
return new GetUserGroupsCall(httpClientWrapper).getUserGroups(prefix);
}
public List<String> listGroups(String prefix) {
return new ListGroupsCall(httpClientWrapper).listGroups(prefix);
}
public List<String> getUserGroups(String userId, String prefix) {
return new GetUserGroupsCall(httpClientWrapper).getUserGroups(userId, prefix);
}
public void createGroup(String completeGroupName, boolean leaf) {
new CreateGroupCall(httpClientWrapper).createGroup(completeGroupName, leaf);
}
public void deleteGroup(String completeGroupName) {
new DeleteGroupCall(httpClientWrapper).deleteGroup(completeGroupName);
}
public void addMember(String completeGroupName, String userId) {
new AddMemberCall(httpClientWrapper).addMember(completeGroupName, userId);
}
public void removeMember(String completeGroupName, String userId) {
new RemoveMemberCall(httpClientWrapper).removeMember(completeGroupName, userId);
}
public void addPermission(String completeGroupName, String userId, Permission permission) {
new AddPermissionCall(httpClientWrapper).addPermission(completeGroupName, userId, permission);
}
public void setPermission(String completeGroupName, String userId, Permission permission) {
new SetPermissionCall(httpClientWrapper).setPermission(completeGroupName, userId, permission);
}
public void removePermission(String completeGroupName, String userId) {
new RemovePermissionCall(httpClientWrapper).removePermission(completeGroupName, userId);
}
public List<UserPermission> getUserPermissions(String userId) {
return new GetUserPermissionsCall(httpClientWrapper).getUserPermissions(userId);
}
public List<GroupPermission> getGroupPermissions(String groupId) {
return new GetGroupPermissionsCall(httpClientWrapper).getGroupPermissions(groupId);
}
public void addInvitedRegistration(String token, String email, Map<String, Permission> groupsPermissions) {
new AddInvitedRegistrationCall(httpClientWrapper).addInvitedRegistration(token, email, groupsPermissions);
}
public List<String> getMemberEmailAddresses(String groupId, Permission permission) {
return new GetMemberEmailAddresses(httpClientWrapper).getMemberEmailAddresses(groupId, permission);
}
}
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/GmsClientBuilder.java deleted 100644 → 0
+ 0
− 40
View file @ a625faa5
package it.inaf.ia2.gms.client;
import it.inaf.ia2.gms.client.call.HttpClientWrapper;
public class GmsClientBuilder {
private String gmsBaseUrl;
private String rapBaseUrl;
private String clientId;
private String clientSecret;
public GmsClientBuilder setGmsBaseUrl(String gmsBaseUrl) {
this.gmsBaseUrl = gmsBaseUrl;
return this;
}
public GmsClientBuilder setRapBaseUrl(String rapBaseUrl) {
this.rapBaseUrl = rapBaseUrl;
return this;
}
public GmsClientBuilder setClientId(String clientId) {
this.clientId = clientId;
return this;
}
public GmsClientBuilder setClientSecret(String clientSecret) {
this.clientSecret = clientSecret;
return this;
}
public GmsClient build() {
HttpClientWrapper clientWrapper = new HttpClientWrapper(gmsBaseUrl);
if (rapBaseUrl != null && clientId != null && clientSecret != null) {
clientWrapper.setRapBaseUrl(rapBaseUrl)
.setClientId(clientId).setClientSecret(clientSecret);
}
return new GmsClient(clientWrapper);
}
}
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/BaseGmsCall.java deleted 100644 → 0
+ 0
− 44
View file @ a625faa5
package it.inaf.ia2.gms.client.call;
import java.io.InputStream;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpRequest.Builder;
import java.net.http.HttpResponse;
import java.util.Scanner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class BaseGmsCall {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseGmsCall.class);
protected final HttpClientWrapper clientWrapper;
public BaseGmsCall(HttpClientWrapper clientWrapper) {
this.clientWrapper = clientWrapper;
}
protected HttpClient getClient() {
return clientWrapper.getClient();
}
protected Builder newHttpRequest(String endpoint) {
return clientWrapper.newHttpRequest(endpoint);
}
protected static void logServerError(HttpRequest request, HttpResponse<String> response) {
LOGGER.error("Error while reading " + request.uri()
+ "\nServer response status code is " + response.statusCode()
+ "\nServer response text is " + response.body());
}
protected static void logServerErrorInputStream(HttpRequest request, HttpResponse<InputStream> response) {
Scanner s = new Scanner(response.body()).useDelimiter("\\A");
String responseBody = s.hasNext() ? s.next() : "";
String error = "Error while reading " + request.uri()
+ "\nServer response status code is " + response.statusCode()
+ "\nServer response text is " + responseBody;
LOGGER.error(error);
}
}
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/DeleteGroupCall.java deleted 100644 → 0
+ 0
− 28
View file @ a625faa5
package it.inaf.ia2.gms.client.call;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
public class DeleteGroupCall extends BaseGmsCall {
public DeleteGroupCall(HttpClientWrapper clientWrapper) {
super(clientWrapper);
}
public boolean deleteGroup(String completeGroupName) {
HttpRequest groupsRequest = newHttpRequest(completeGroupName)
.header("Accept", "text/plain")
.DELETE()
.build();
return getClient().sendAsync(groupsRequest, HttpResponse.BodyHandlers.ofInputStream())
.thenApply(response -> {
if (response.statusCode() == 204) {
return true;
}
logServerErrorInputStream(groupsRequest, response);
throw new IllegalStateException("Unable to delete group");
}).join();
}
}
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/HttpClientWrapper.java deleted 100644 → 0
+ 0
− 105
View file @ a625faa5
package it.inaf.ia2.gms.client.call;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpRequest.Builder;
import java.net.http.HttpResponse;
import java.util.Base64;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class HttpClientWrapper {
private final String baseGmsUri;
private final HttpClient client;
private String rapBaseUrl;
private String clientId;
private String clientSecret;
private String accessToken;
public HttpClientWrapper(String baseGmsUri) {
String uri = baseGmsUri;
if (!uri.endsWith("/")) {
uri += "/";
}
this.baseGmsUri = uri;
this.client = HttpClient.newBuilder()
.followRedirects(HttpClient.Redirect.ALWAYS)
.build();
}
public HttpClientWrapper setAccessToken(String accessToken) {
this.accessToken = accessToken;
return this;
}
public HttpClientWrapper setRapBaseUrl(String rapBaseUrl) {
if (!rapBaseUrl.endsWith("/")) {
rapBaseUrl += "/";
}
this.rapBaseUrl = rapBaseUrl;
return this;
}
public HttpClientWrapper setClientId(String clientId) {
this.clientId = clientId;
return this;
}
public HttpClientWrapper setClientSecret(String clientSecret) {
this.clientSecret = clientSecret;
return this;
}
Builder newHttpRequest(String endpoint) {
if (accessToken == null) {
accessToken = getAccessTokenFromClientCredentials();
}
return HttpRequest.newBuilder()
.uri(URI.create(baseGmsUri + endpoint))
.header("Authorization", "Bearer " + accessToken);
}
private String getAccessTokenFromClientCredentials() {
if (rapBaseUrl == null || clientId == null || clientSecret == null) {
throw new IllegalStateException("Access token is null and client credentials are not configured");
}
String basicAuthHeader = clientId + ":" + clientSecret;
HttpRequest tokenRequest = HttpRequest.newBuilder()
.uri(URI.create(rapBaseUrl + "auth/oauth2/token"))
.header("Authorization", "Basic " + Base64.getEncoder().encodeToString(basicAuthHeader.getBytes()))
.header("Accept", "application/json")
.header("Content-Type", "application/x-www-form-urlencoded")
.POST(HttpRequest.BodyPublishers.ofString("grant_type=client_credentials"))
.build();
return client.sendAsync(tokenRequest, HttpResponse.BodyHandlers.ofString())
.thenApply(response -> {
if (response.statusCode() == 200) {
return getAccessTokenFromResponse(response.body());
}
BaseGmsCall.logServerError(tokenRequest, response);
throw new IllegalStateException("Unable to retrieve access token");
}).join();
}
protected String getAccessTokenFromResponse(String body) {
Pattern codePattern = Pattern.compile(".*\"access_token\":\\s*\"([^\"]+).*");
Matcher matcher = codePattern.matcher(body);
if (matcher.find()) {
return matcher.group(1);
}
throw new IllegalStateException("Unable to extract access token from body");
}
HttpClient getClient() {
return client;
}
}
gms-client/gms-client-lib/src/test/java/it/inaf/ia2/gms/client/call/HttpClientWrapperTest.java deleted 100644 → 0
+ 0
− 15
View file @ a625faa5
package it.inaf.ia2.gms.client.call;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
public class HttpClientWrapperTest {
@Test
public void testExtractAccessToken() {
String response = "{\"access_token\":\"TEST_TOKEN\",\"token_type\":\"Bearer\",\"expires_in\":3600}";
HttpClientWrapper clientWrapper = new HttpClientWrapper("http://localhost");
assertEquals("TEST_TOKEN", clientWrapper.getAccessTokenFromResponse(response));
}
}
gms-client/gms-client-lib/src/test/java/it/inaf/ia2/gms/client/call/MockedHttpClientWrapper.java deleted 100644 → 0
+ 0
− 18
View file @ a625faa5
package it.inaf.ia2.gms.client.call;
import java.net.http.HttpClient;
public class MockedHttpClientWrapper extends HttpClientWrapper {
private final HttpClient mockedClient;
public MockedHttpClientWrapper(String baseGmsUri, HttpClient mockedClient) {
super(baseGmsUri);
this.mockedClient = mockedClient;
}
@Override
HttpClient getClient() {
return mockedClient;
}
}
gms-client/gms-client/pom.xml 0 → 100644
+ 85
− 0
View file @ d313d3e9
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>it.inaf.ia2</groupId>
<artifactId>gms-client</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
<junit-jupiter.version>5.6.0</junit-jupiter.version>
<mockito.version>3.5.13</mockito.version>
</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rap-client</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/GmsClient.java 0 → 100644
+ 159
− 0
View file @ d313d3e9
package it.inaf.ia2.gms.client;
import com.fasterxml.jackson.databind.ObjectMapper;
import it.inaf.ia2.client.BaseClient;
import it.inaf.ia2.gms.client.call.AddInvitedRegistrationCall;
import it.inaf.ia2.gms.client.call.AddMemberCall;
import it.inaf.ia2.gms.client.call.AddPermissionCall;
import it.inaf.ia2.gms.client.call.CreateGroupCall;
import it.inaf.ia2.gms.client.call.DeleteGroupCall;
import it.inaf.ia2.gms.client.call.GetGroupPermissionsCall;
import it.inaf.ia2.gms.client.call.GetMemberEmailAddresses;
import it.inaf.ia2.gms.client.call.GetUserGroupsCall;
import it.inaf.ia2.gms.client.call.GetUserPermissionsCall;
import it.inaf.ia2.gms.client.call.ListGroupsCall;
import it.inaf.ia2.gms.client.call.RemoveMemberCall;
import it.inaf.ia2.gms.client.call.RemovePermissionCall;
import it.inaf.ia2.gms.client.call.SetPermissionCall;
import it.inaf.ia2.gms.client.model.GroupPermission;
import it.inaf.ia2.gms.client.model.Permission;
import it.inaf.ia2.gms.client.model.UserPermission;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
public class GmsClient extends BaseClient {
private static final ObjectMapper MAPPER = new ObjectMapper();
private String accessToken;
public GmsClient(String gmsBaseUri) {
super(gmsBaseUri);
}
public GmsClient setAccessToken(String accessToken) {
this.accessToken = accessToken;
return this;
}
public List<String> getMyGroups(String prefix) {
return new GetUserGroupsCall(this).getUserGroups(prefix);
}
@Override
public HttpRequest.Builder newRequest(String endpoint) {
if (accessToken == null) {
throw new IllegalStateException("Access token is null");
}
return super.newRequest(getUri(endpoint))
.setHeader("Authorization", "Bearer " + accessToken);
}
@Override
public HttpRequest.Builder newRequest(URI uri) {
if (accessToken == null) {
throw new IllegalStateException("Access token is null");
}
return super.newRequest(uri)
.setHeader("Authorization", "Bearer " + accessToken);
}
@Override
protected <T> String getInvalidStatusCodeExceptionMessage(HttpRequest request, HttpResponse<T> response) {
return response.headers().firstValue("Content-Type")
.map(contentType -> {
try {
if (contentType.startsWith("text/plain")) {
String errorResponseBody = null;
if (response.body() instanceof String) {
errorResponseBody = (String) response.body();
} else if (response.body() instanceof InputStream) {
errorResponseBody = new String(((InputStream) response.body()).readAllBytes(), StandardCharsets.UTF_8);
}
if (errorResponseBody != null && !errorResponseBody.isBlank()) {
return errorResponseBody;
}
} else if (contentType.startsWith("application/json")
|| contentType.startsWith("text/json")) {
Map<String, Object> errorResponseBody = null;
if (response.body() instanceof String) {
errorResponseBody = MAPPER.readValue((String) response.body(), Map.class);
} else if (response.body() instanceof InputStream) {
errorResponseBody = MAPPER.readValue((InputStream) response.body(), Map.class);
}
if (errorResponseBody != null && errorResponseBody.containsKey("error")) {
return (String) errorResponseBody.get("error");
}
}
} catch (IOException ex) {
}
return null;
}).orElse(super.getInvalidStatusCodeExceptionMessage(request, response));
}
public List<String> listGroups(String prefix) {
return new ListGroupsCall(this).listGroups(prefix);
}
public List<String> getUserGroups(String userId) {
return new GetUserGroupsCall(this).getUserGroups(userId);
}
public List<String> getUserGroups(String userId, String prefix) {
return new GetUserGroupsCall(this).getUserGroups(userId, prefix);
}
public void createGroup(String completeGroupName, boolean leaf) {
new CreateGroupCall(this).createGroup(completeGroupName, leaf);
}
public void deleteGroup(String completeGroupName) {
new DeleteGroupCall(this).deleteGroup(completeGroupName);
}
public void addMember(String completeGroupName, String userId) {
new AddMemberCall(this).addMember(completeGroupName, userId);
}
public void removeMember(String completeGroupName, String userId) {
new RemoveMemberCall(this).removeMember(completeGroupName, userId);
}
public String addPermission(String completeGroupName, String userId, Permission permission) {
return new AddPermissionCall(this).addPermission(completeGroupName, userId, permission);
}
public String setPermission(String completeGroupName, String userId, Permission permission) {
return new SetPermissionCall(this).setPermission(completeGroupName, userId, permission);
}
public void removePermission(String completeGroupName, String userId) {
new RemovePermissionCall(this).removePermission(completeGroupName, userId);
}
public List<UserPermission> getUserPermissions(String userId) {
return new GetUserPermissionsCall(this).getUserPermissions(userId);
}
public List<GroupPermission> getGroupPermissions(String groupId) {
return new GetGroupPermissionsCall(this).getGroupPermissions(groupId);
}
public void addInvitedRegistration(String token, String email, Map<String, Permission> groupsPermissions) {
new AddInvitedRegistrationCall(this).addInvitedRegistration(token, email, groupsPermissions);
}
public List<String> getMemberEmailAddresses(String groupId, Permission permission) {
return new GetMemberEmailAddresses(this).getMemberEmailAddresses(groupId, permission);
}
public Object call(HttpRequest groupsRequest, HttpResponse.BodyHandler<InputStream> ofInputStream) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
}
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/AddInvitedRegistrationCall.java → gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddInvitedRegistrationCall.java
+ 10
− 14
View file @ d313d3e9
package it.inaf.ia2.gms.client.call; package it.inaf.ia2.gms.client.call;
import it.inaf.ia2.client.BaseCall;
import it.inaf.ia2.gms.client.GmsClient;
import it.inaf.ia2.gms.client.model.Permission; import it.inaf.ia2.gms.client.model.Permission;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse.BodyHandlers;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
...@@ -10,10 +13,10 @@ import java.util.Base64; ...@@ -10,10 +13,10 @@ import java.util.Base64;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class AddInvitedRegistrationCall extends BaseGmsCall { public class AddInvitedRegistrationCall extends BaseCall<GmsClient> {
public AddInvitedRegistrationCall(HttpClientWrapper clientWrapper) { public AddInvitedRegistrationCall(GmsClient client) {
super(clientWrapper); super(client);
} }
public void addInvitedRegistration(String token, String email, Map<String, Permission> groupsPermissions) { public void addInvitedRegistration(String token, String email, Map<String, Permission> groupsPermissions) {
...@@ -29,20 +32,13 @@ public class AddInvitedRegistrationCall extends BaseGmsCall { ...@@ -29,20 +32,13 @@ public class AddInvitedRegistrationCall extends BaseGmsCall {
.stream().map(e -> e.getKey() + " " + e.getValue()) .stream().map(e -> e.getKey() + " " + e.getValue())
.collect(Collectors.toList())); .collect(Collectors.toList()));
HttpRequest groupsRequest = newHttpRequest(endpoint) HttpRequest groupsRequest = client.newRequest(endpoint)
.header("Accept", "text/plain") .header("Accept", "text/plain")
.header("Content-Type", "application/x-www-form-urlencoded") .header("Content-Type", "application/x-www-form-urlencoded")
.POST(HttpRequest.BodyPublishers.ofString(bodyParams)) .POST(BodyPublishers.ofString(bodyParams))
.build(); .build();
getClient().sendAsync(groupsRequest, HttpResponse.BodyHandlers.ofInputStream()) client.call(groupsRequest, BodyHandlers.ofInputStream(), 201, res -> true);
.thenApply(response -> {
if (response.statusCode() == 201) {
return true;
}
logServerErrorInputStream(groupsRequest, response);
throw new IllegalStateException("Unable to create invited registration");
}).join();
} }
private String getTokenHash(String token) { private String getTokenHash(String token) {
......
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/AddMemberCall.java → gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddMemberCall.java
+ 30
− 0
View file @ d313d3e9
package it.inaf.ia2.gms.client.call; package it.inaf.ia2.gms.client.call;
import it.inaf.ia2.client.BaseCall;
import it.inaf.ia2.gms.client.GmsClient;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
import java.net.http.HttpRequest.BodyPublishers; import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers;
public class AddMemberCall extends BaseGmsCall { public class AddMemberCall extends BaseCall<GmsClient> {
public AddMemberCall(HttpClientWrapper clientWrapper) { public AddMemberCall(GmsClient client) {
super(clientWrapper); super(client);
} }
public boolean addMember(String completeGroupName, String userId) { public boolean addMember(String completeGroupName, String userId) {
...@@ -17,19 +19,12 @@ public class AddMemberCall extends BaseGmsCall { ...@@ -17,19 +19,12 @@ public class AddMemberCall extends BaseGmsCall {
endpoint += "/" + completeGroupName; endpoint += "/" + completeGroupName;
} }
HttpRequest groupsRequest = newHttpRequest(endpoint) HttpRequest groupsRequest = client.newRequest(endpoint)
.header("Accept", "text/plain") .header("Accept", "text/plain")
.header("Content-Type", "application/x-www-form-urlencoded") .header("Content-Type", "application/x-www-form-urlencoded")
.POST(BodyPublishers.ofString("user_id=" + userId)) .POST(BodyPublishers.ofString("user_id=" + userId))
.build(); .build();
return getClient().sendAsync(groupsRequest, HttpResponse.BodyHandlers.ofInputStream()) return client.call(groupsRequest, BodyHandlers.ofInputStream(), 200, res -> true);
.thenApply(response -> {
if (response.statusCode() == 200) {
return true;
}
logServerErrorInputStream(groupsRequest, response);
throw new IllegalStateException("Unable to add member to group");
}).join();
} }
} }
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/AddPermissionCall.java → gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddPermissionCall.java
+ 35
− 0
View file @ d313d3e9
package it.inaf.ia2.gms.client.call; package it.inaf.ia2.gms.client.call;
import it.inaf.ia2.client.BaseCall;
import it.inaf.ia2.gms.client.GmsClient;
import it.inaf.ia2.gms.client.model.Permission; import it.inaf.ia2.gms.client.model.Permission;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
import java.net.http.HttpRequest.BodyPublisher; import java.net.http.HttpRequest.BodyPublisher;
import java.net.http.HttpRequest.BodyPublishers; import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers;
public class AddPermissionCall extends BaseGmsCall { public class AddPermissionCall extends BaseCall<GmsClient> {
public AddPermissionCall(HttpClientWrapper clientWrapper) { public AddPermissionCall(GmsClient client) {
super(clientWrapper); super(client);
} }
public boolean addPermission(String completeGroupName, String userId, Permission permission) { public String addPermission(String completeGroupName, String userId, Permission permission) {
String endpoint = "permission"; String endpoint = "permission";
if (completeGroupName != null && !completeGroupName.isBlank()) { if (completeGroupName != null && !completeGroupName.isBlank()) {
...@@ -22,19 +24,12 @@ public class AddPermissionCall extends BaseGmsCall { ...@@ -22,19 +24,12 @@ public class AddPermissionCall extends BaseGmsCall {
BodyPublisher requestBody = BodyPublishers.ofString( BodyPublisher requestBody = BodyPublishers.ofString(
"user_id=" + userId + "&permission=" + permission); "user_id=" + userId + "&permission=" + permission);
HttpRequest groupsRequest = newHttpRequest(endpoint) HttpRequest groupsRequest = client.newRequest(endpoint)
.header("Accept", "text/plain") .header("Accept", "text/plain")
.header("Content-Type", "application/x-www-form-urlencoded") .header("Content-Type", "application/x-www-form-urlencoded")
.POST(requestBody) .POST(requestBody)
.build(); .build();
return getClient().sendAsync(groupsRequest, HttpResponse.BodyHandlers.ofInputStream()) return client.call(groupsRequest, BodyHandlers.ofString(), 200, res -> res);
.thenApply(response -> {
if (response.statusCode() == 200) {
return true;
}
logServerErrorInputStream(groupsRequest, response);
throw new IllegalStateException("Unable to add permission");
}).join();
} }
} }
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/CreateGroupCall.java → gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/CreateGroupCall.java
+ 25
− 0
View file @ d313d3e9
package it.inaf.ia2.gms.client.call; package it.inaf.ia2.gms.client.call;
import it.inaf.ia2.client.BaseCall;
import it.inaf.ia2.gms.client.GmsClient;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
import java.net.http.HttpRequest.BodyPublishers; import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers;
public class CreateGroupCall extends BaseGmsCall { public class CreateGroupCall extends BaseCall<GmsClient> {
public CreateGroupCall(HttpClientWrapper clientWrapper) { public CreateGroupCall(GmsClient client) {
super(clientWrapper); super(client);
} }
public boolean createGroup(String completeGroupName, boolean leaf) { public boolean createGroup(String completeGroupName, boolean leaf) {
HttpRequest groupsRequest = newHttpRequest(completeGroupName) HttpRequest groupsRequest = client.newRequest(completeGroupName)
.header("Accept", "text/plain") .header("Accept", "text/plain")
.header("Content-Type", "application/x-www-form-urlencoded") .header("Content-Type", "application/x-www-form-urlencoded")
.POST(BodyPublishers.ofString("leaf=" + leaf)) .POST(BodyPublishers.ofString("leaf=" + leaf))
.build(); .build();
return getClient().sendAsync(groupsRequest, HttpResponse.BodyHandlers.ofInputStream()) return client.call(groupsRequest, BodyHandlers.ofInputStream(), 201, res -> true);
.thenApply(response -> {
if (response.statusCode() == 201) {
return true;
}
logServerErrorInputStream(groupsRequest, response);
throw new IllegalStateException("Unable to create group");
}).join();
} }
} }
gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/DeleteGroupCall.java 0 → 100644
+ 23
− 0
View file @ d313d3e9
package it.inaf.ia2.gms.client.call;
import it.inaf.ia2.client.BaseCall;
import it.inaf.ia2.gms.client.GmsClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse.BodyHandlers;
public class DeleteGroupCall extends BaseCall<GmsClient> {
public DeleteGroupCall(GmsClient client) {
super(client);
}
public boolean deleteGroup(String completeGroupName) {
HttpRequest groupsRequest = client.newRequest(completeGroupName)
.header("Accept", "text/plain")
.DELETE()
.build();
return client.call(groupsRequest, BodyHandlers.ofInputStream(), 204, res -> true);
}
}
gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/GetGroupPermissionsCall.java → gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetGroupPermissionsCall.java
+ 11
− 16
View file @ d313d3e9
package it.inaf.ia2.gms.client.call; package it.inaf.ia2.gms.client.call;
import it.inaf.ia2.client.BaseCall;
import it.inaf.ia2.gms.client.GmsClient;
import it.inaf.ia2.gms.client.model.GroupPermission; import it.inaf.ia2.gms.client.model.GroupPermission;
import it.inaf.ia2.gms.client.model.Permission; import it.inaf.ia2.gms.client.model.Permission;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Scanner; import java.util.Scanner;
public class GetGroupPermissionsCall extends BaseGmsCall { public class GetGroupPermissionsCall extends BaseCall<GmsClient> {
public GetGroupPermissionsCall(HttpClientWrapper clientWrapper) { public GetGroupPermissionsCall(GmsClient client) {
super(clientWrapper); super(client);
} }
public List<GroupPermission> getGroupPermissions(String groupId) { public List<GroupPermission> getGroupPermissions(String groupId) {
...@@ -21,21 +23,14 @@ public class GetGroupPermissionsCall extends BaseGmsCall { ...@@ -21,21 +23,14 @@ public class GetGroupPermissionsCall extends BaseGmsCall {
String endpoint = "permission"; String endpoint = "permission";
endpoint += "/" + groupId; endpoint += "/" + groupId;
HttpRequest groupsRequest = newHttpRequest(endpoint) HttpRequest groupsRequest = client.newRequest(endpoint)
.header("Accept", "text/plain") .header("Accept", "text/plain")
.GET() .GET()
.build(); .build();
return getClient().sendAsync(groupsRequest, HttpResponse.BodyHandlers.ofInputStream()) return client.call(groupsRequest, BodyHandlers.ofInputStream(), 200,
.thenApply(response -> { inputStream -> {
if (response.statusCode() == 200) { try ( Scanner scan = new Scanner(inputStream)) {
return response.body();
}
logServerErrorInputStream(groupsRequest, response);
throw new IllegalStateException("Unable to retrieve groups");
})
.thenApply(inputStream -> {
try (Scanner scan = new Scanner(inputStream)) {
while (scan.hasNextLine()) { while (scan.hasNextLine()) {
String line = scan.nextLine(); String line = scan.nextLine();
if (!line.isEmpty()) { if (!line.isEmpty()) {
...@@ -48,6 +43,6 @@ public class GetGroupPermissionsCall extends BaseGmsCall { ...@@ -48,6 +43,6 @@ public class GetGroupPermissionsCall extends BaseGmsCall {
} }
} }
return groupPermissions; return groupPermissions;
}).join(); });
} }
} }
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