Add CommandException to abstract cli return codes for errors

[signal-cli] / src / main / java / org / asamk / signal / commands / RegisterCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index e95487bfe0eaee33667d447f469e8aea5b2f8328..a4c613afc09a0e78c525eebf8665aeb21203220f 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -4,31 +4,45 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.Manager;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.RegistrationManager;

 import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
 
 import java.io.IOException;
 
 import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
 
 import java.io.IOException;
 

-public class RegisterCommand implements LocalCommand {
+public class RegisterCommand implements RegistrationCommand {

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-v", "--voice")
                 .help("The verification should be done over voice, not sms.")
                 .action(Arguments.storeTrue());
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-v", "--voice")
                 .help("The verification should be done over voice, not sms.")
                 .action(Arguments.storeTrue());

+        subparser.addArgument("--captcha")
+                .help("The captcha token, required if registration failed with a captcha required error.");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {
+        final boolean voiceVerification = ns.getBoolean("voice");
+        final var captcha = ns.getString("captcha");
+

         try {
         try {

-            m.register(ns.getBoolean("voice"));
-            return 0;
+            m.register(voiceVerification, captcha);

         } catch (CaptchaRequiredException e) {
         } catch (CaptchaRequiredException e) {

-            System.err.println("Captcha required for verification (" + e.getMessage() + ")");
-            return 1;
+            String message;
+            if (captcha == null) {
+                message = "Captcha required for verification, use --captcha CAPTCHA\n"
+                        + "To get the token, go to https://signalcaptchas.org/registration/generate.html\n"
+                        + "Check the developer tools (F12) console for a failed redirect to signalcaptcha://\n"
+                        + "Everything after signalcaptcha:// is the captcha token.";
+            } else {
+                message = "Invalid captcha given.";
+            }
+            throw new UserErrorException(message);

         } catch (IOException e) {
         } catch (IOException e) {

-            System.err.println("Request verify error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Request verify error: " + e.getMessage());

         }
     }
 }
         }
     }
 }