devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

Merge branch 'main' into feat/add-email-template-apis

Browse Source
This commit is contained in:
Lakhan Samani 2022-07-17 10:39:02 +05:30
commit 97b1d8d66f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/resolvers/update_webhook.go
View File

@ -70,11 +70,7 @@ func UpdateWebhookResolver(ctx context.Context, params model.UpdateWebhookReques
} }
if params.Headers != nil { if params.Headers != nil {
for key, val := range params.Headers { headerBytes, err := json.Marshal(params.Headers)
webhook.Headers[key] = val
}
headerBytes, err := json.Marshal(webhook.Headers)
if err != nil { if err != nil {
log.Debug("failed to marshall headers: ", err) log.Debug("failed to marshall headers: ", err)
return nil, err return nil, err

2
server/test/resolvers_test.go
View File

@ -13,7 +13,7 @@ import (
func TestResolvers(t *testing.T) { func TestResolvers(t *testing.T) {
databases := map[string]string{ databases := map[string]string{
constants.DbTypeSqlite: "../../data.db", constants.DbTypeSqlite: "../../test.db",
// constants.DbTypeArangodb: "http://localhost:8529", // constants.DbTypeArangodb: "http://localhost:8529",
// constants.DbTypeMongodb: "mongodb://localhost:27017", // constants.DbTypeMongodb: "mongodb://localhost:27017",
// constants.DbTypeScyllaDB: "127.0.0.1:9042", // constants.DbTypeScyllaDB: "127.0.0.1:9042",

10
server/test/update_webhook_test.go
View File

@ -27,7 +27,10 @@ func updateWebhookTest(t *testing.T, s TestSetup) {
webhook, err := db.Provider.GetWebhookByEventName(ctx, constants.UserDeletedWebhookEvent) webhook, err := db.Provider.GetWebhookByEventName(ctx, constants.UserDeletedWebhookEvent)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, webhook) assert.NotNil(t, webhook)
webhook.Headers["x-new-test"] = "new-test" // it should completely replace headers
webhook.Headers = map[string]interface{}{
"x-new-test": "test",
}
res, err := resolvers.UpdateWebhookResolver(ctx, model.UpdateWebhookRequest{ res, err := resolvers.UpdateWebhookResolver(ctx, model.UpdateWebhookRequest{
ID: webhook.ID, ID: webhook.ID,
@ -45,8 +48,11 @@ func updateWebhookTest(t *testing.T, s TestSetup) {
assert.Equal(t, webhook.ID, updatedWebhook.ID) assert.Equal(t, webhook.ID, updatedWebhook.ID)
assert.Equal(t, refs.StringValue(webhook.EventName), refs.StringValue(updatedWebhook.EventName)) assert.Equal(t, refs.StringValue(webhook.EventName), refs.StringValue(updatedWebhook.EventName))
assert.Equal(t, refs.StringValue(webhook.Endpoint), refs.StringValue(updatedWebhook.Endpoint)) assert.Equal(t, refs.StringValue(webhook.Endpoint), refs.StringValue(updatedWebhook.Endpoint))
assert.Len(t, updatedWebhook.Headers, 2) assert.Len(t, updatedWebhook.Headers, 1)
assert.False(t, refs.BoolValue(updatedWebhook.Enabled)) assert.False(t, refs.BoolValue(updatedWebhook.Enabled))
for key, val := range updatedWebhook.Headers {
assert.Equal(t, val, webhook.Headers[key])
}
res, err = resolvers.UpdateWebhookResolver(ctx, model.UpdateWebhookRequest{ res, err = resolvers.UpdateWebhookResolver(ctx, model.UpdateWebhookRequest{
ID: webhook.ID, ID: webhook.ID,