tsk-54: Tweak instant message endpoint to save contact and message identification (#56)
Closes #54 Reviewed-on: phoenix/textsender-api#56 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
+12
-12
@@ -14,11 +14,11 @@ import (
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
DBConnString string
|
||||
ServerPort string
|
||||
ResetDB bool
|
||||
JWTSecret string `env:"JWT_SECRET" required:"true"`
|
||||
TwilioConfig *config.TwiloConfig
|
||||
DBConnString string
|
||||
ServerPort string
|
||||
ResetDB bool
|
||||
JWTSecret string `env:"JWT_SECRET" required:"true"`
|
||||
TwilioConfig *config.TwilioConfig
|
||||
AllowedOrigins []string
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ func PrintName() {
|
||||
fmt.Println(version.String())
|
||||
}
|
||||
|
||||
func Load() (*Config, *config.TwiloConfig, error) {
|
||||
func Load() (*Config, *config.TwilioConfig, error) {
|
||||
versionFlag := flag.Bool("version", false, "Print version information")
|
||||
resetDb := flag.Bool("reset-db", false, "Reset the database schema and exit")
|
||||
port := flag.String("port", PORT, "Server port")
|
||||
@@ -72,10 +72,10 @@ func Load() (*Config, *config.TwiloConfig, error) {
|
||||
} else {
|
||||
allowedOrigins := unpackAllowedOrigins()
|
||||
return &Config{
|
||||
DBConnString: dbConnString,
|
||||
ServerPort: *port,
|
||||
ResetDB: *resetDb,
|
||||
JWTSecret: os.Getenv("JWT_SECRET"),
|
||||
DBConnString: dbConnString,
|
||||
ServerPort: *port,
|
||||
ResetDB: *resetDb,
|
||||
JWTSecret: os.Getenv("JWT_SECRET"),
|
||||
AllowedOrigins: allowedOrigins,
|
||||
}, cfg, nil
|
||||
}
|
||||
@@ -138,7 +138,7 @@ func unpackAllowedOrigins() []string {
|
||||
return allowedOriginsSplit
|
||||
}
|
||||
|
||||
func TwilioConfig() (*config.TwiloConfig, error) {
|
||||
func TwilioConfig() (*config.TwilioConfig, error) {
|
||||
authSid := os.Getenv("TWILIO_AUTH_SID")
|
||||
serviceSid := os.Getenv("TWILIO_SERVICE_SID")
|
||||
authToken := os.Getenv("TWILIO_AUTH_TOKEN")
|
||||
@@ -153,7 +153,7 @@ func TwilioConfig() (*config.TwiloConfig, error) {
|
||||
} else if len(phoneNumber) == 0 {
|
||||
return nil, fmt.Errorf("Twilio config phone number not found")
|
||||
} else {
|
||||
var cfg config.TwiloConfig
|
||||
var cfg config.TwilioConfig
|
||||
cfg.AccountSID = authSid
|
||||
cfg.ServiceSID = serviceSid
|
||||
cfg.AuthToken = authToken
|
||||
|
||||
Reference in New Issue
Block a user