admin: allow Twilio messaging service SID as "from number"

config/config.go

@@ -94,7 +94,7 @@ type Config struct {
 
 		AccountSID string
 		AuthToken  string `password:"true" info:"The primary Auth Token for Twilio. Must be primary (not secondary) for request valiation."`
-		FromNumber string `public:"true" info:"The Twilio number to use for outgoing notifications."`
+		FromNumber string `displayName:"From Number or Messenger SID" public:"true" info:"The Twilio number or Messenger SID to use for outgoing notifications."`
 
 		DisableTwoWaySMS      bool     `info:"Disables SMS reply codes for alert messages."`
 		SMSCarrierLookup      bool     `info:"Perform carrier lookup of SMS contact methods (required for SMSFromNumberOverride). Extra charges may apply."`

devtools/configparams/run.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"text/template"
@@ -39,7 +40,7 @@ import (
 func MapConfigHints(cfg config.Hints) []ConfigHint {
 	return []ConfigHint{
 		{{- range .HintFields }}
-		{ID: {{quote .ID}}, Value: {{.Value}}},
+		{ID: {{quote .ID}}, DisplayName: {{quote .DisplayName}}, Value: {{.Value}}},
 		{{- end}}
 	}
 }
@@ -48,7 +49,7 @@ func MapConfigHints(cfg config.Hints) []ConfigHint {
 func MapConfigValues(cfg config.Config) []ConfigValue {
 	return []ConfigValue{
 		{{- range .ConfigFields }}
-		{ID: {{quote .ID}}, Type: {{.Type}}, Description: {{quote .Desc}}, Value: {{.Value}}{{if .Password}}, Password: true{{end}}},
+		{ID: {{quote .ID}},Type: {{.Type}}, DisplayName: {{quote .DisplayName}}, Description: {{quote .Desc}}, Value: {{.Value}}{{if .Password}}, Password: true{{end}}},
 		{{- end}}
 	}
 }
@@ -58,7 +59,7 @@ func MapPublicConfigValues(cfg config.Config) []ConfigValue {
 	return []ConfigValue{
 		{{- range .ConfigFields }}
 		{{- if .Public}}
-		{ID: {{quote .ID}}, Type: {{.Type}}, Description: {{quote .Desc}}, Value: {{.Value}}{{if .Password}}, Password: true{{end}}},
+		{ID: {{quote .ID}}, Type: {{.Type}}, DisplayName: {{quote .DisplayName}}, Description: {{quote .Desc}}, Value: {{.Value}}{{if .Password}}, Password: true{{end}}},
 		{{- end}}
 		{{- end}}
 	}
@@ -129,8 +130,8 @@ func ApplyConfigValues(cfg config.Config, vals []ConfigValueInput) (config.Confi
 `))
 
 type field struct {
-	ID, Type, Desc, Value string
-	Public, Password      bool
+	ID, DisplayName, Type, Desc, Value string
+	Public, Password                   bool
 }
 
 func main() {
@@ -155,8 +156,8 @@ package graphql2`)
 		ConfigFields []field
 		HintFields   []field
 	}
-	input.ConfigFields = printType("", reflect.TypeOf(config.Config{}), "", false, false)
-	input.HintFields = printType("", reflect.TypeOf(config.Hints{}), "", false, false)
+	input.ConfigFields = printType("", reflect.TypeOf(config.Config{}), "", "", false, false)
+	input.HintFields = printType("", reflect.TypeOf(config.Hints{}), "", "", false, false)
 
 	err := tmpl.Execute(w, input)
 	if err != nil {
@@ -169,9 +170,9 @@ func printField(prefix string, f reflect.StructField) []field {
 	if f.Type.Kind() == reflect.Slice && f.Type.Elem().Kind() == reflect.Struct {
 		fPrefix = prefix + f.Name + "[]."
 	}
-	return printType(fPrefix, f.Type, f.Tag.Get("info"), f.Tag.Get("public") == "true", f.Tag.Get("password") == "true")
+	return printType(fPrefix, f.Type, f.Tag.Get("displayName"), f.Tag.Get("info"), f.Tag.Get("public") == "true", f.Tag.Get("password") == "true")
 }
-func printType(prefix string, v reflect.Type, details string, public, pass bool) []field {
+func printType(prefix string, v reflect.Type, displayName string, info string, public, pass bool) []field {
 	var f []field
 	key := strings.TrimSuffix(prefix, ".")
 
@@ -207,6 +208,35 @@ func printType(prefix string, v reflect.Type, details string, public, pass bool)
 		panic(fmt.Sprintf("not implemented for type %T", v.Kind()))
 	}
 
-	f = append(f, field{ID: key, Type: typ, Desc: details, Value: value, Public: public, Password: pass})
+	f = append(f, field{ID: key, Type: typ, DisplayName: printDisplayName(key, displayName), Desc: info, Value: value, Public: public, Password: pass})
 	return f
 }
+
+func printDisplayName(key, displayName string) string {
+	// format reformats string with spaces, i.e. GoogleAnalyticsID -> Google Analytics ID
+	format := func(str string) string {
+		var formattedStr []string
+		// pattern groups words in string by capital letters
+		pattern := regexp.MustCompile("([A-Z]*)([A-Z][^A-Z]+|$)")
+		for _, subStr := range pattern.FindAllStringSubmatch(str, -1) {
+			if subStr[0] == "URLs" {
+				formattedStr = append(formattedStr, subStr[0])
+				continue
+			}
+			if subStr[1] != "" {
+				formattedStr = append(formattedStr, subStr[1])
+			}
+			if subStr[2] != "" {
+				formattedStr = append(formattedStr, subStr[2])
+			}
+		}
+		return strings.Join(formattedStr, " ")
+	}
+
+	if displayName == "" {
+		fieldKey := strings.Split(key, ".")
+		displayName = format(fieldKey[len(fieldKey)-1])
+	}
+
+	return displayName
+}

devtools/mocktwilio/server.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"math/rand"
 	"net/http"
 	"net/url"
 	"strings"
@@ -47,6 +48,7 @@ type Server struct {
 
 	messages map[string]*SMS
 	calls    map[string]*VoiceCall
+	msgSvc   map[string][]string
 
 	mux *http.ServeMux
 
@@ -71,6 +73,7 @@ func NewServer(cfg Config) *Server {
 		mux:         http.NewServeMux(),
 		messages:    make(map[string]*SMS),
 		calls:       make(map[string]*VoiceCall),
+		msgSvc:      make(map[string][]string),
 		smsCh:       make(chan *SMS),
 		smsInCh:     make(chan *SMS),
 		callCh:      make(chan *VoiceCall),
@@ -196,6 +199,45 @@ func (s *Server) SetCarrierInfo(number string, info twilio.CarrierInfo) {
 	s.carrierInfo[number] = info
 }
 
+// getFromNumber will return a random number from the messaging service if ID is a
+// messaging SID, or the value itself otherwise.
+func (s *Server) getFromNumber(id string) string {
+	if !strings.HasPrefix(id, "MG") {
+		return id
+	}
+
+	s.mx.Lock()
+	defer s.mx.Unlock()
+
+	// select a random number from the message service
+	if len(s.msgSvc[id]) == 0 {
+		return ""
+	}
+
+	return s.msgSvc[id][rand.Intn(len(s.msgSvc[id]))]
+}
+
+// NewMessagingService registers a new Messaging SID for the given numbers.
+func (s *Server) NewMessagingService(smsURL, voiceURL string, numbers ...string) (string, error) {
+	err := validate.Many(
+		validate.URL("SMS URL", smsURL),
+		validate.URL("Voice URL", voiceURL),
+	)
+	if err != nil {
+		return "", err
+	}
+	svcID := s.id("MG")
+
+	s.mx.Lock()
+	defer s.mx.Unlock()
+	for _, num := range numbers {
+		s.callbacks["SMS:"+num] = smsURL
+		s.callbacks["VOICE:"+num] = voiceURL
+	}
+
+	return svcID, nil
+}
+
 // RegisterSMSCallback will set/update a callback URL for SMS calls made to the given number.
 func (s *Server) RegisterSMSCallback(number, url string) error {
 	err := validate.URL("URL", url)

devtools/mocktwilio/sms.go

@@ -29,7 +29,8 @@ type SMS struct {
 	doneCh   chan struct{}
 }
 
-func (s *Server) sendSMS(from, to, body, statusURL, destURL string) (*SMS, error) {
+func (s *Server) sendSMS(fromValue, to, body, statusURL, destURL string) (*SMS, error) {
+	fromNumber := s.getFromNumber(fromValue)
 	if statusURL != "" {
 		err := validate.URL("StatusCallback", statusURL)
 		if err != nil {
@@ -39,7 +40,7 @@ func (s *Server) sendSMS(from, to, body, statusURL, destURL string) (*SMS, error
 			}
 		}
 		s.mx.RLock()
-		_, hasCallback := s.callbacks["SMS:"+from]
+		_, hasCallback := s.callbacks["SMS:"+fromNumber]
 		s.mx.RUnlock()
 
 		if !hasCallback {
@@ -63,7 +64,7 @@ func (s *Server) sendSMS(from, to, body, statusURL, destURL string) (*SMS, error
 		s: s,
 		msg: twilio.Message{
 			To:     to,
-			From:   from,
+			From:   fromNumber,
 			Status: twilio.MessageStatusAccepted,
 			SID:    s.id("SM"),
 		},

devtools/mocktwilio/voicecall.go

@@ -150,7 +150,7 @@ func (s *Server) serveNewCall(w http.ResponseWriter, req *http.Request) {
 		hangupCh:  make(chan struct{}),
 	}
 
-	vc.call.From = req.FormValue("From")
+	vc.call.From = s.getFromNumber(req.FormValue("From"))
 	s.mx.RLock()
 	_, hasCallback := s.callbacks["VOICE:"+vc.call.From]
 	s.mx.RUnlock()