Update gradle

[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 971e4dd18000bc0ea17e8af4f38172a208ae3a72..e51129b6b70c73b940342a35b6cb7bb320c36bbf 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -1,18 +1,33 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

+import com.fasterxml.jackson.core.type.TypeReference;
+

 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

+import org.asamk.signal.OutputType;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;

+import org.asamk.signal.commands.exceptions.RateLimitErrorException;

 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.RegistrationManager;

-import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.util.CommandUtil;

 
 import java.io.IOException;
 
 import java.io.IOException;

+import java.util.List;
+
+public class RegisterCommand implements RegistrationCommand, JsonRpcRegistrationCommand<RegisterCommand.RegistrationParams> {

 
 

-public class RegisterCommand implements RegistrationCommand {
+    @Override
+    public String getName() {
+        return "register";
+    }

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {


@@ -22,28 +37,66 @@ public class RegisterCommand implements RegistrationCommand {
                 .action(Arguments.storeTrue());
         subparser.addArgument("--captcha")
                 .help("The captcha token, required if registration failed with a captcha required error.");
                 .action(Arguments.storeTrue());
         subparser.addArgument("--captcha")
                 .help("The captcha token, required if registration failed with a captcha required error.");

+        subparser.addArgument("--reregister")
+                .action(Arguments.storeTrue())
+                .help("Register even if account is already registered");

     }
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {
     }
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {

-        final boolean voiceVerification = ns.getBoolean("voice");
-        final var captcha = ns.getString("captcha").replace("signalcaptcha://", "");
+        final boolean voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));
+        final var captcha = ns.getString("captcha");
+        final var reregister = Boolean.TRUE.equals(ns.getBoolean("reregister"));
+
+        register(m, voiceVerification, captcha, reregister);
+    }
+
+    @Override
+    public TypeReference<RegistrationParams> getRequestType() {
+        return new TypeReference<>() {};
+    }
+
+    @Override
+    public List<OutputType> getSupportedOutputTypes() {
+        return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    }

 
 

+    @Override
+    public void handleCommand(
+            final RegistrationParams request,
+            final RegistrationManager m,
+            final JsonWriter jsonWriter
+    ) throws CommandException {
+        register(m, Boolean.TRUE.equals(request.voice()), request.captcha(), Boolean.TRUE.equals(request.reregister()));
+    }
+
+    private void register(
+            final RegistrationManager m,
+            final boolean voiceVerification,
+            final String captcha,
+            final boolean reregister
+    ) throws CommandException {

         try {
         try {

-            m.register(voiceVerification, captcha);
+            m.register(voiceVerification, captcha, reregister);
+        } catch (RateLimitException e) {
+            final var message = CommandUtil.getRateLimitMessage(e);
+            throw new RateLimitErrorException(message, e);

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

-            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.";
-            }
+            final var message = CommandUtil.getCaptchaRequiredMessage(e, captcha != null);

             throw new UserErrorException(message);
             throw new UserErrorException(message);

+        } catch (NonNormalizedPhoneNumberException e) {
+            throw new UserErrorException("Failed to register: " + e.getMessage(), e);

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

-            throw new IOErrorException("Request verify error: " + e.getMessage());
+            throw new IOErrorException("Failed to register: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);
+        } catch (VerificationMethodNotAvailableException e) {
+            throw new UserErrorException("Failed to register: " + e.getMessage() + (
+                    voiceVerification
+                            ? ": Before requesting voice verification you need to request SMS verification and wait a minute."
+                            : ""
+            ), e);

         }
     }
         }
     }

+
+    public record RegistrationParams(Boolean voice, String captcha, Boolean reregister) {}

 }
 }