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

Remove support for HSM template support #663

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Remove support for HSM template support #663

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
43 changes: 14 additions & 29 deletions handlers/whatsapp_legacy/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,39 +724,24 @@ func buildPayloads(msg courier.MsgOut, h *handler, clog *courier.ChannelLog) ([]
return nil, errors.Errorf("cannot send template message without Facebook namespace for channel: %s", msg.Channel().UUID())
}

if msg.Channel().BoolConfigForKey(configHSMSupport, false) {
payload := hsmPayload{
To: msg.URN().Path(),
Type: "hsm",
}
payload.HSM.Namespace = namespace
payload.HSM.ElementName = templating.Template.Name
payload.HSM.Language.Policy = "deterministic"
payload.HSM.Language.Code = langCode
for _, v := range templating.Variables {
payload.HSM.LocalizableParams = append(payload.HSM.LocalizableParams, LocalizableParam{Default: v})
}
payloads = append(payloads, payload)
} else {
payload := templatePayload{
To: msg.URN().Path(),
Type: "template",
}
payload.Template.Namespace = namespace
payload.Template.Name = templating.Template.Name
payload.Template.Language.Policy = "deterministic"
payload.Template.Language.Code = langCode

payload := templatePayload{
To: msg.URN().Path(),
Type: "template",
}
payload.Template.Namespace = namespace
payload.Template.Name = templating.Template.Name
payload.Template.Language.Policy = "deterministic"
payload.Template.Language.Code = langCode
component := &Component{Type: "body"}

component := &Component{Type: "body"}
for _, v := range templating.Variables {
component.Parameters = append(component.Parameters, Param{Type: "text", Text: v})
}
payload.Template.Components = append(payload.Template.Components, *component)

for _, v := range templating.Variables {
component.Parameters = append(component.Parameters, Param{Type: "text", Text: v})
}
payload.Template.Components = append(payload.Template.Components, *component)
payloads = append(payloads, payload)

payloads = append(payloads, payload)
}
} else {

if isInteractiveMsg {
Expand Down
25 changes: 0 additions & 25 deletions handlers/whatsapp_legacy/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,21 +1070,6 @@ var mediaCacheSendTestCases = []OutgoingTestCase{
},
}

var hsmSupportSendTestCases = []OutgoingTestCase{
{
Label: "Template Send",
MsgText: "templated message",
MsgURN: "whatsapp:250788123123",
MsgMetadata: json.RawMessage(`{ "templating": { "template": { "name": "revive_issue", "uuid": "171f8a4d-f725-46d7-85a6-11aceff0bfe3" }, "language": "eng", "variables": ["Chef", "tomorrow"]}}`),
MockResponseBody: `{ "messages": [{"id": "157b5e14568e8"}] }`,
MockResponseStatus: 200,
ExpectedRequestBody: `{"to":"250788123123","type":"hsm","hsm":{"namespace":"waba_namespace","element_name":"revive_issue","language":{"policy":"deterministic","code":"en"},"localizable_params":[{"default":"Chef"},{"default":"tomorrow"}]}}`,
ExpectedMsgStatus: "W",
ExpectedExternalID: "157b5e14568e8",
SendPrep: setSendURL,
},
}

func mockAttachmentURLs(mediaServer *httptest.Server, testCases []OutgoingTestCase) []OutgoingTestCase {
casesWithMockedUrls := make([]OutgoingTestCase, len(testCases))

Expand All @@ -1108,15 +1093,6 @@ func TestOutgoing(t *testing.T) {
"version": "v2.35.2",
})

var hsmSupportChannel = test.NewMockChannel("8eb23e93-5ecb-45ba-b726-3b064e0c56ab", "WA", "250788383383", "US",
map[string]any{
"auth_token": "token123",
"base_url": "https://foo.bar/",
"fb_namespace": "waba_namespace",
"hsm_support": true,
"version": "v2.35.2",
})

var d3Channel = test.NewMockChannel("8eb23e93-5ecb-45ba-b726-3b064e0c56ab", "D3", "250788383383", "US",
map[string]any{
"auth_token": "token123",
Expand All @@ -1134,7 +1110,6 @@ func TestOutgoing(t *testing.T) {
})

RunOutgoingTestCases(t, defaultChannel, newWAHandler(courier.ChannelType("WA"), "WhatsApp"), defaultSendTestCases, []string{"token123"}, nil)
RunOutgoingTestCases(t, hsmSupportChannel, newWAHandler(courier.ChannelType("WA"), "WhatsApp"), hsmSupportSendTestCases, []string{"token123"}, nil)
RunOutgoingTestCases(t, d3Channel, newWAHandler(courier.ChannelType("D3"), "360Dialog"), defaultSendTestCases, []string{"token123"}, nil)
RunOutgoingTestCases(t, txwChannel, newWAHandler(courier.ChannelType("TXW"), "TextIt"), defaultSendTestCases, []string{"token123"}, nil)

Expand Down