Allowed JWT usage on all endpoints and refactoring

gms-client/gms-cli/src/main/resources/application.properties

-spring.main.banner-mode=off
-logging.level.root=OFF
\ No newline at end of file

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddMemberCall.java

@@ -14,7 +14,7 @@ public class AddMemberCall extends BaseCall<GmsClient> {
 
     public boolean addMember(String completeGroupName, String userId) {
 
-        String endpoint = "membership";
+        String endpoint = "ws/jwt/membership";
         if (completeGroupName != null && !completeGroupName.isBlank()) {
             endpoint += "/" + completeGroupName;
         }

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddPermissionCall.java

@@ -16,7 +16,7 @@ public class AddPermissionCall extends BaseCall<GmsClient> {
 
     public String addPermission(String completeGroupName, String userId, Permission permission) {
 
-        String endpoint = "permission";
+        String endpoint = "ws/jwt/permission";
         if (completeGroupName != null && !completeGroupName.isBlank()) {
             endpoint += "/" + completeGroupName;
         }

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/CreateGroupCall.java

@@ -14,7 +14,7 @@ public class CreateGroupCall extends BaseCall<GmsClient> {
 
     public boolean createGroup(String completeGroupName, boolean leaf) {
 
-        HttpRequest groupsRequest = client.newRequest(completeGroupName)
+        HttpRequest groupsRequest = client.newRequest("ws/jwt/" + completeGroupName)
                 .header("Accept", "text/plain")
                 .header("Content-Type", "application/x-www-form-urlencoded")
                 .POST(BodyPublishers.ofString("leaf=" + leaf))

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/DeleteGroupCall.java

@@ -13,7 +13,7 @@ public class DeleteGroupCall extends BaseCall<GmsClient> {
 
     public boolean deleteGroup(String completeGroupName) {
 
-        HttpRequest groupsRequest = client.newRequest(completeGroupName)
+        HttpRequest groupsRequest = client.newRequest("ws/jwt/" + completeGroupName)
                 .header("Accept", "text/plain")
                 .DELETE()
                 .build();

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetGroupPermissionsCall.java

@@ -20,7 +20,7 @@ public class GetGroupPermissionsCall extends BaseCall<GmsClient> {
 
         List<GroupPermission> groupPermissions = new ArrayList<>();
 
-        String endpoint = "permission";
+        String endpoint = "ws/jwt/permission";
         endpoint += "/" + groupId;
 
         HttpRequest groupsRequest = client.newRequest(endpoint)

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetUserGroupsCall.java

@@ -22,7 +22,7 @@ public class GetUserGroupsCall extends BaseCall<GmsClient> {
 
         List<String> groups = new ArrayList<>();
 
-        HttpRequest groupsRequest = client.newRequest("search")
+        HttpRequest groupsRequest = client.newRequest("vo/search")
                 .header("Accept", "text/plain")
                 .GET()
                 .build();
@@ -52,7 +52,7 @@ public class GetUserGroupsCall extends BaseCall<GmsClient> {
 
         List<String> groups = new ArrayList<>();
 
-        String endpoint = "membership";
+        String endpoint = "ws/jwt/membership";
         if (prefix != null && !prefix.isBlank()) {
             endpoint += "/" + prefix;
         }

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetUserPermissionsCall.java

@@ -20,7 +20,7 @@ public class GetUserPermissionsCall extends BaseCall<GmsClient> {
 
         List<UserPermission> userPermissions = new ArrayList<>();
 
-        String endpoint = "permission";
+        String endpoint = "ws/jwt/permission";
         endpoint += "?user_id=" + userId;
 
         HttpRequest groupsRequest = client.newRequest(endpoint)

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/ListGroupsCall.java

@@ -23,7 +23,7 @@ public class ListGroupsCall extends BaseCall<GmsClient> {
 
         List<String> groups = new ArrayList<>();
 
-        String uri = "list";
+        String uri = "ws/jwt/list";
         if (prefix != null && !prefix.isBlank()) {
             uri += "/" + prefix;
         }

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/RemoveMemberCall.java

@@ -13,7 +13,7 @@ public class RemoveMemberCall extends BaseCall<GmsClient> {
 
     public boolean removeMember(String completeGroupName, String userId) {
 
-        String endpoint = "membership";
+        String endpoint = "ws/jwt/membership";
         if (completeGroupName != null && !completeGroupName.isBlank()) {
             endpoint += "/" + completeGroupName;
         }

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/RemovePermissionCall.java

@@ -13,7 +13,7 @@ public class RemovePermissionCall extends BaseCall<GmsClient> {
 
     public boolean removePermission(String completeGroupName, String userId) {
 
-        String endpoint = "permission";
+        String endpoint = "ws/jwt/permission";
         if (completeGroupName != null && !completeGroupName.isBlank()) {
             endpoint += "/" + completeGroupName;
         }

gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/SetPermissionCall.java

@@ -14,7 +14,7 @@ public class SetPermissionCall extends BaseCall<GmsClient> {
 
     public String setPermission(String completeGroupName, String userId, Permission permission) {
 
-        String endpoint = "permission";
+        String endpoint = "ws/jwt/permission";
         if (completeGroupName != null && !completeGroupName.isBlank()) {
             endpoint += "/" + completeGroupName;
         }

gms-client/gms-client/src/test/java/it/inaf/ia2/gms/client/call/AddMemberTest.java

@@ -28,6 +28,6 @@ public class AddMemberTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         gmsClient.addMember("LBT.INAF", "user");
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("POST", "membership/LBT.INAF"), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("POST", "ws/jwt/membership/LBT.INAF"), any());
     }
 }

gms-client/gms-client/src/test/java/it/inaf/ia2/gms/client/call/AddPermissionTest.java

@@ -29,6 +29,6 @@ public class AddPermissionTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         gmsClient.addPermission("LBT.INAF", "user", Permission.ADMIN);
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("POST", "permission/LBT.INAF"), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("POST", "ws/jwt/permission/LBT.INAF"), any());
     }
 }

gms-client/gms-client/src/test/java/it/inaf/ia2/gms/client/call/CreateGroupTest.java

@@ -28,6 +28,6 @@ public class CreateGroupTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         gmsClient.createGroup("LBT.INAF", false);
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("POST", "LBT.INAF"), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("POST", "ws/jwt/LBT.INAF"), any());
     }
 }

gms-client/gms-client/src/test/java/it/inaf/ia2/gms/client/call/DeleteGroupTest.java

@@ -28,6 +28,6 @@ public class DeleteGroupTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         gmsClient.deleteGroup("LBT.INAF");
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("DELETE", "LBT.INAF"), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("DELETE", "ws/jwt/LBT.INAF"), any());
     }
 }

gms-client/gms-client/src/test/java/it/inaf/ia2/gms/client/call/GetUserGroupsTest.java

@@ -34,7 +34,7 @@ public class GetUserGroupsTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         List<String> groups = gmsClient.getMyGroups("LBT.");
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("GET", "search"), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("GET", "vo/search"), any());
 
         assertEquals(2, groups.size());
         assertEquals("INAF", groups.get(0));
@@ -52,7 +52,7 @@ public class GetUserGroupsTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         List<String> groups = gmsClient.listGroups("LBT.");
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("GET", "list/LBT."), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("GET", "ws/jwt/list/LBT."), any());
 
         assertEquals(2, groups.size());
         assertEquals("INAF", groups.get(0));

gms-client/gms-client/src/test/java/it/inaf/ia2/gms/client/call/RemoveMemberTest.java

@@ -28,6 +28,6 @@ public class RemoveMemberTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         gmsClient.removeMember("LBT.INAF", "user");
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("DELETE", "membership/LBT.INAF?user_id=user"), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("DELETE", "ws/jwt/membership/LBT.INAF?user_id=user"), any());
     }
 }

gms-client/gms-client/src/test/java/it/inaf/ia2/gms/client/call/RemovePermissionTest.java

@@ -28,6 +28,6 @@ public class RemovePermissionTest extends BaseGmsClientTest {
         when(httpClient.sendAsync(any(), any())).thenReturn(response);
         gmsClient.removePermission("LBT.INAF", "user");
 
-        verify(httpClient, times(1)).sendAsync(endpointEq("DELETE", "permission/LBT.INAF?user_id=user"), any());
+        verify(httpClient, times(1)).sendAsync(endpointEq("DELETE", "ws/jwt/permission/LBT.INAF?user_id=user"), any());
     }
 }

gms/pom.xml

@@ -68,8 +68,10 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>build-gui</id>
             <build>
-        <finalName>gms</finalName>
                 <plugins>
                     <plugin>
                         <groupId>com.github.eirslett</groupId>
@@ -98,6 +100,14 @@
                             </execution>
                         </executions>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <finalName>gms</finalName>
+        <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.1.0</version>