You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/11/17 03:37:24 UTC
[james-project] 05/06: JAMES-3400 Add user delete command
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a8509f8ce3c04da7e68b712626e4b819c25cdea7
Author: quanth <hq...@linagora.com>
AuthorDate: Mon Nov 16 10:27:44 2020 +0700
JAMES-3400 Add user delete command
---
.../org/apache/james/cli/user/UserCommand.java | 3 +-
.../{UserCommand.java => UserDeleteCommand.java} | 46 ++++++++++++----------
.../org/apache/james/httpclient/UserClient.java | 3 ++
.../java/org/apache/james/cli/UserManageTest.java | 25 ++++++++++++
4 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
index fdd7da1..6d42722 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
@@ -31,7 +31,8 @@ import picocli.CommandLine;
description = "Manage Users",
subcommands = {
UserListCommand.class,
- UserCreateCommand.class
+ UserCreateCommand.class,
+ UserDeleteCommand.class
})
public class UserCommand implements Callable<Integer> {
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserDeleteCommand.java
similarity index 61%
copy from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
copy to server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserDeleteCommand.java
index fdd7da1..b5adab1 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserDeleteCommand.java
@@ -19,35 +19,41 @@
package org.apache.james.cli.user;
-import java.io.PrintStream;
import java.util.concurrent.Callable;
import org.apache.james.cli.WebAdminCli;
+import org.apache.james.httpclient.UserClient;
+import feign.Feign;
+import feign.Response;
import picocli.CommandLine;
@CommandLine.Command(
- name = "user",
- description = "Manage Users",
- subcommands = {
- UserListCommand.class,
- UserCreateCommand.class
- })
-public class UserCommand implements Callable<Integer> {
-
- protected final WebAdminCli webAdminCli;
- protected final PrintStream out;
- protected final PrintStream err;
-
- public UserCommand(PrintStream out, WebAdminCli webAdminCli, PrintStream err) {
- this.out = out;
- this.webAdminCli = webAdminCli;
- this.err = err;
- }
+ name = "delete",
+ description = "Delete a user")
+public class UserDeleteCommand implements Callable<Integer> {
+
+ public static final int DELETED_CODE = 204;
+
+ @CommandLine.ParentCommand UserCommand userCommand;
+
+ @CommandLine.Parameters String userName;
@Override
public Integer call() {
- return WebAdminCli.CLI_FINISHED_SUCCEED;
+ try {
+ UserClient userClient = Feign.builder()
+ .target(UserClient.class, userCommand.webAdminCli.jamesUrl + "/users");
+ Response rs = userClient.deleteAUser(userName);
+ if (rs.status() == DELETED_CODE) {
+ return WebAdminCli.CLI_FINISHED_SUCCEED;
+ } else {
+ return WebAdminCli.CLI_FINISHED_FAILED;
+ }
+ } catch (Exception e) {
+ e.printStackTrace(userCommand.err);
+ return WebAdminCli.CLI_FINISHED_FAILED;
+ }
}
-}
\ No newline at end of file
+}
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java b/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java
index 90b134b..a85da6d 100644
--- a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java
+++ b/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java
@@ -38,4 +38,7 @@ public interface UserClient {
@Headers("Content-Type: application/json")
Response createAUser(@Param("userName") String userName, UserPassword password);
+ @RequestLine("DELETE /{userToBeDeleted}")
+ Response deleteAUser(@Param("userToBeDeleted") String userName);
+
}
\ No newline at end of file
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java b/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java
index 6804ec3..fb3821f 100644
--- a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java
+++ b/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java
@@ -108,4 +108,29 @@ public class UserManageTest {
assertThat(dataProbe.listUsers()).isEmpty();
}
+ @Test
+ void userDeleteWithAddedUserShouldSucceed(GuiceJamesServer server) throws Exception {
+ Port port = server.getProbe(WebAdminGuiceProbe.class).getWebAdminPort();
+ dataProbe = server.getProbe(DataProbeImpl.class);
+ dataProbe.fluent().addDomain("linagora.com")
+ .addUser("hqtran@linagora.com", "123456");
+
+ int exitCode = WebAdminCli.executeFluent(new PrintStream(outputStreamCaptor), new PrintStream(errorStreamCaptor),
+ "--url", "http://127.0.0.1:" + port.getValue(), "user", "delete", "hqtran@linagora.com");
+
+ assertThat(exitCode).isEqualTo(0);
+ assertThat(dataProbe.listUsers()).isEmpty();
+ }
+
+ @Test
+ void userDeleteWithNonExistingUserShouldSucceed(GuiceJamesServer server) throws Exception {
+ Port port = server.getProbe(WebAdminGuiceProbe.class).getWebAdminPort();
+ dataProbe = server.getProbe(DataProbeImpl.class);
+
+ int exitCode = WebAdminCli.executeFluent(new PrintStream(outputStreamCaptor), new PrintStream(errorStreamCaptor),
+ "--url", "http://127.0.0.1:" + port.getValue(), "user", "delete", "hqtran@linagora.com");
+
+ assertThat(exitCode).isEqualTo(0);
+ assertThat(dataProbe.listUsers()).doesNotContain("hqtran@linagora.com");
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org