nik/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/bbernhard/signal-cli-rest-api.git synced 2026-05-16 13:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle InvalidTransportModeException error

Browse Source 
see #837
This commit is contained in:
Bernhard B 2026-04-20 23:33:19 +02:00
parent 1b1873ce17
commit 40232de0d0
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/api.go
View File

@ -324,8 +324,14 @@ func (a *Api) RegisterNumber(c *gin.Context) {
err = a.signalClient.RegisterNumber(number, req.UseVoice, req.Captcha) err = a.signalClient.RegisterNumber(number, req.UseVoice, req.Captcha)
if err != nil { if err != nil {
c.JSON(400, gin.H{"error": err.Error()}) switch err.(type) {
return case *client.InvalidTransportError:
c.JSON(400, Error{Msg: "Couldn't use SMS verification to register the specified number. Wait 60 seconds and try again with {\"use_voice\": true}"})
return
default:
c.JSON(400, Error{Msg: err.Error()})
return
}
} }
c.Writer.WriteHeader(201) c.Writer.WriteHeader(201)
} }

16
src/client/client.go
View File

@ -749,6 +749,8 @@ func (s *SignalClient) About() About {
} }
func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha string) error { func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha string) error {
var err error
var jsonRpc2Client *JsonRpc2Client
if s.signalCliMode == JsonRpc { if s.signalCliMode == JsonRpc {
type Request struct { type Request struct {
UseVoice bool `json:"voice,omitempty"` UseVoice bool `json:"voice,omitempty"`
@ -765,12 +767,11 @@ func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha stri
request.Captcha = captcha request.Captcha = captcha
} }
jsonRpc2Client, err := s.getJsonRpc2Client() jsonRpc2Client, err = s.getJsonRpc2Client()
if err != nil { if err != nil {
return err return err
} }
_, err = jsonRpc2Client.getRaw("register", nil, request) _, err = jsonRpc2Client.getRaw("register", nil, request)
return err
} else { } else {
command := []string{"--config", s.signalCliConfig, "-a", number, "register"} command := []string{"--config", s.signalCliConfig, "-a", number, "register"}
@ -782,9 +783,16 @@ func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha stri
command = append(command, []string{"--captcha", captcha}...) command = append(command, []string{"--captcha", captcha}...)
} }
_, err := s.cliClient.Execute(true, command, "") _, err = s.cliClient.Execute(true, command, "")
return err
} }
if err != nil {
if !useVoice && strings.Contains(err.Error(), "StatusCode: 400 (InvalidTransportModeException)") {
return &InvalidTransportError{Description: "Couldn't use SMS verification to register number."}
}
}
return err
} }
func (s *SignalClient) UnregisterNumber(number string, deleteAccount bool, deleteLocalData bool) error { func (s *SignalClient) UnregisterNumber(number string, deleteAccount bool, deleteLocalData bool) error {

8
src/client/errors.go
View File

@ -23,3 +23,11 @@ type InternalError struct {
func (e *InternalError) Error() string { func (e *InternalError) Error() string {
return e.Description return e.Description
} }
type InvalidTransportError struct {
Description string
}
func (e *InvalidTransportError) Error() string {
return e.Description
}