Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some Sendcloud configuration validation not applied #16

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Fix some Sendcloud configuration validation not applied #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/lib/config/sendcloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ var _ = RootSchema.Add("SendCloudTemplateAssignment", `
"by_languages": {
"type": "array",
"minItems": 1,
"items": { "$ref": "#/defs/SendCloudTemplateAssignmentByLanguage"}
"items": { "$ref": "#/$defs/SendCloudTemplateAssignmentByLanguage"}
}
},
"required": ["authgear_template_name", "default_template_idd"]
"required": ["authgear_template_name", "default_template_id"]
}
`)

Expand All @@ -136,12 +136,12 @@ var _ = RootSchema.Add("ProviderConfigSendCloud", `
"templates": {
"type": "array",
"minItems": 1,
"items": { "$refs": "#/$defs/SendCloudTemplate" }
"items": { "$ref": "#/$defs/SendCloudTemplate" }
},
"template_assignments": {
"type": "array",
"minItems": 1,
"items": { "$refs": "#/$defs/SendCloudTemplateAssignment" }
"items": { "$ref": "#/$defs/SendCloudTemplateAssignment" }
}
},
"required": ["sms_user", "sms_key", "templates", "template_assignments"]
Expand Down
77 changes: 70 additions & 7 deletions pkg/lib/config/testdata/authgear-sms-gateway.tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ config:
- authgear_template_name: "verficiation_sms.txt"
default_template_id: "919888"
by_languages:
- authgear_languag: en
- authgear_language: en
template_id: "919888"
- authgear_template_name: "authenticate_primary_oob_sms.txt"
default_template_id: "919888"
provider_selector:
switch:
- type: match_app_id_and_phone_number_alpha2
Expand Down Expand Up @@ -137,7 +139,7 @@ config:
- authgear_template_name: "verficiation_sms.txt"
default_template_id: "919888"
by_languages:
- authgear_languag: en
- authgear_language: en
template_id: "919888"
provider_selector:
switch:
Expand All @@ -156,11 +158,67 @@ config:
use_provider: sendcloud
phone_number_alpha2: CN
---
name: failed-sendcloud-config
name: failed-sendcloud-config-json-schema
error: |-
invalid configuration:
/providers/2/sendcloud/templates/0/template_variable_key_mappings: minItems
map[actual:0 expected:1]
/providers/2/sendcloud/templates/1: required
map[actual:[template_id template_msg_type] expected:[template_id template_msg_type template_variable_key_mappings] missing:[template_variable_key_mappings]]
config:
providers:
- name: twilio
type: twilio
twilio:
account_sid: "my-account-sid"
auth_token: "my-auth-token"
messaging_service_sid: "my-messaging-service-sid"
- name: accessyou
type: accessyou
accessyou:
accountno: "my-accountno"
user: "my-user"
pwd: "my-pwd"
from: "my-sender"
- name: sendcloud
type: sendcloud
sendcloud:
sms_user: "my-sms-user"
sms_key: "my-sms-key"
templates:
- template_id: "919888"
template_msg_type: "2"
template_variable_key_mappings: []
- template_id: "919879"
template_msg_type: "2"
template_assignments:
- authgear_template_name: "verficiation_sms.txt"
default_template_id: "919889"
by_languages:
- authgear_language: en
template_id: "919890"
provider_selector:
switch:
- type: match_app_id_and_phone_number_alpha2
use_provider: accessyou
phone_number_alpha2: HK
app_id: "123"
- type: match_app_id_and_phone_number_alpha2
use_provider: sendcloud
phone_number_alpha2: CN
app_id: "123"
- type: match_phone_number_alpha2
use_provider: accessyou
phone_number_alpha2: HK
- type: match_phone_number_alpha2
use_provider: sendcloud
phone_number_alpha2: CN
- type: default
use_provider: twilio
---
name: failed-sendcloud-config-custom-validation
error: |-
invalid configuration:
/providers/2/sendcloud/templates/0/template_variable_key_mappings: missing template_variable_key_mappings
/providers/2/sendcloud/templates/1/template_variable_key_mappings: missing template_variable_key_mappings
/providers/2/sendcloud/template_assignments/0/default_template_id: template_id 919889 not found
/providers/2/sendcloud/template_assignments/0/by_languages/0/template_id: template_id 919890 not found
config:
Expand All @@ -186,14 +244,19 @@ config:
templates:
- template_id: "919888"
template_msg_type: "2"
template_variable_key_mappings: []
template_variable_key_mappings:
- from: code
to: code
- template_id: "919879"
template_msg_type: "2"
template_variable_key_mappings:
- from: code
to: code
template_assignments:
- authgear_template_name: "verficiation_sms.txt"
default_template_id: "919889"
by_languages:
- authgear_languag: en
- authgear_language: en
template_id: "919890"
provider_selector:
switch:
Expand Down
Loading