diff --git a/bridgeconfig/imessagego.tpl.yaml b/bridgeconfig/imessagego.tpl.yaml index 6c10b2a..09eaddd 100644 --- a/bridgeconfig/imessagego.tpl.yaml +++ b/bridgeconfig/imessagego.tpl.yaml @@ -112,7 +112,7 @@ bridge: {{ .BeeperDomain }}: "as_token:{{ .ASToken }}" # A URL to fetch validation data from. Use this option or the nac_plist option - nac_validation_data_url: {{ .Params.nac_url }} + nac_validation_data_url: {{ or .Params.nac_url "https://registration-relay.beeper.com" }} # Optional auth token to use when fetching validation data. If null, defaults to passing the as_token. nac_validation_data_token: {{ .Params.nac_token }} nac_validation_is_relay: true diff --git a/cmd/bbctl/config.go b/cmd/bbctl/config.go index 4c48078..19774fd 100644 --- a/cmd/bbctl/config.go +++ b/cmd/bbctl/config.go @@ -68,23 +68,11 @@ func simpleDescriptions(descs map[string]string) func(string, int) string { var askParams = map[string]func(map[string]string) (bool, error){ "imessagego": func(extraParams map[string]string) (bool, error) { - nacURL := extraParams["nac_url"] nacToken := extraParams["nac_token"] var didAddParams bool - if nacURL == "" { - err := survey.AskOne(&survey.Input{ - Message: "Enter registration relay address", - Default: "https://registration-relay.beeper.com", - }, &nacURL) - if err != nil { - return didAddParams, err - } - extraParams["nac_url"] = nacURL - didAddParams = true - } if nacToken == "" { err := survey.AskOne(&survey.Input{ - Message: "Enter iMessage registration token", + Message: "Enter iMessage registration code", }, &nacToken) if err != nil { return didAddParams, err