Skip to content

Commit 418564a

Browse files
elpetegithub-actions[bot]
elpete
authored and
github-actions[bot]
committed
Apply cfformat changes
1 parent 5fef3d5 commit 418564a

File tree

4 files changed

+115
-84
lines changed

4 files changed

+115
-84
lines changed

‎modules/sendgrid-sdk/ModuleConfig.cfc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ component {
66
this.entrypoint = "/sendgrid";
77

88
function configure() {
9-
routes = [ { pattern = "/webhooks", handler = "webhooks", action = "handle" } ];
9+
routes = [ { pattern: "/webhooks", handler: "webhooks", action: "handle" } ];
1010

1111
interceptorSettings = {
12-
customInterceptionPoints = [
12+
customInterceptionPoints: [
1313
"onSendgridEventProcessed",
1414
"onSendgridEventDropped",
1515
"onSendgridEventDelivered",

‎modules/sendgrid-sdk/handlers/webhooks.cfc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ component {
2929
return event.renderData( statusCode = 500, data = "Invalid auth configuration" );
3030
}
3131
if ( isInvalidAuthCredentials( event ) ) {
32-
log.info( "Invalid incoming credentials detected for SendGrid webhook endpoint", {
33-
"incomingCredentials": event.getHTTPBasicCredentials(),
34-
"sendgridSettings": sendgridSettings
35-
} );
32+
log.info(
33+
"Invalid incoming credentials detected for SendGrid webhook endpoint",
34+
{ "incomingCredentials": event.getHTTPBasicCredentials(), "sendgridSettings": sendgridSettings }
35+
);
3636
return event.renderData( statusCode = 401, data = "Invalid credentials" );
3737
}
3838
}
@@ -41,10 +41,7 @@ component {
4141
log.debug( "Converting incoming webhook events to interception points", webhookEvents );
4242
for ( var webhookEvent in webhookEvents ) {
4343
log.debug( "Announcing #generateStateName( webhookEvent )# SendGrid event", webhookEvent );
44-
interceptorService.processState(
45-
generateStateName( webhookEvent ),
46-
webhookEvent
47-
);
44+
interceptorService.processState( generateStateName( webhookEvent ), webhookEvent );
4845
}
4946

5047
log.debug( "All events announced. Returning 200 to SendGrid" );
@@ -79,8 +76,8 @@ component {
7976
* @returns True if the authentication credentials are only partially configured.
8077
*/
8178
private function isPartialAuthCredentials() {
82-
return ( structKeyExists( sendgridSettings, "username" ) && ! structKeyExists( sendgridSettings, "password" ) ) ||
83-
( ! structKeyExists( sendgridSettings, "username" ) && structKeyExists( sendgridSettings, "password" ) );
79+
return ( structKeyExists( sendgridSettings, "username" ) && !structKeyExists( sendgridSettings, "password" ) ) ||
80+
( !structKeyExists( sendgridSettings, "username" ) && structKeyExists( sendgridSettings, "password" ) );
8481
}
8582

8683
/**
@@ -90,7 +87,7 @@ component {
9087
*/
9188
private function needsAuth() {
9289
return structKeyExists( sendgridSettings, "username" ) ||
93-
structKeyExists( sendgridSettings, "password" );
90+
structKeyExists( sendgridSettings, "password" );
9491
}
9592

9693
/**
@@ -102,8 +99,10 @@ component {
10299
*/
103100
private function isInvalidAuthCredentials( event ) {
104101
var basicAuth = event.getHTTPBasicCredentials();
105-
return ( basicAuth.username != sendgridSettings.username ||
106-
basicAuth.password != sendgridSettings.password );
102+
return (
103+
basicAuth.username != sendgridSettings.username ||
104+
basicAuth.password != sendgridSettings.password
105+
);
107106
}
108107

109108
}

‎tests/resources/ModuleIntegrationSpec.cfc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ component extends="coldbox.system.testing.BaseTestCase" {
55

66
getWireBox().autowire( this );
77

8-
getController().getModuleService()
9-
.registerAndActivateModule( "sendgrid-sdk" );
8+
getController().getModuleService().registerAndActivateModule( "sendgrid-sdk" );
109
}
1110

1211
/**
13-
* @beforeEach
14-
*/
12+
* @beforeEach
13+
*/
1514
function setupIntegrationTest() {
1615
setup();
1716
}

‎tests/specs/integration/WebhooksToInterceptorsSpec.cfc‎

Lines changed: 98 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
44

55
function beforeAll() {
66
super.beforeAll();
7-
interceptorService.registerInterceptor(
8-
interceptorObject = this
9-
);
7+
interceptorService.registerInterceptor( interceptorObject = this );
108
}
119

1210
function run() {
@@ -15,12 +13,10 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
1513
variables.interceptionExecutions = [];
1614

1715
prepareMock( getRequestContext() )
18-
.$( "getHTTPBasicCredentials", { "username" = "foo", "password" = "bar" } )
16+
.$( "getHTTPBasicCredentials", { "username": "foo", "password": "bar" } )
1917
.$( "getHTTPContent" )
2018
.$args( json = true )
21-
.$results( deserializeJSON(
22-
fileRead( expandPath( "/tests/resources/stubs/request-1.json" ) )
23-
) );
19+
.$results( deserializeJSON( fileRead( expandPath( "/tests/resources/stubs/request-1.json" ) ) ) );
2420

2521
expect( variables.interceptionExecutions ).toBeEmpty();
2622
var event = execute( route = "/sendgrid/webhooks", renderResults = true );
@@ -48,9 +44,7 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
4844
prepareMock( getRequestContext() )
4945
.$( "getHTTPContent" )
5046
.$args( json = true )
51-
.$results( deserializeJSON(
52-
fileRead( expandPath( "/tests/resources/stubs/request-1.json" ) )
53-
) );
47+
.$results( deserializeJSON( fileRead( expandPath( "/tests/resources/stubs/request-1.json" ) ) ) );
5448

5549
expect( variables.interceptionExecutions ).toBeEmpty();
5650
var event = execute( route = "/sendgrid/webhooks", renderResults = true );
@@ -62,71 +56,110 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
6256
} );
6357
}
6458

65-
function onSendgridEventProcessed( event, interceptData, buffer, rc, prc ) {
66-
arrayAppend( variables.interceptionExecutions, {
67-
name = "onSendgridEventProcessed",
68-
payload = interceptData
69-
} );
59+
function onSendgridEventProcessed(
60+
event,
61+
interceptData,
62+
buffer,
63+
rc,
64+
prc
65+
) {
66+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventProcessed", payload: interceptData } );
7067
}
71-
function onSendgridEventDeferred( event, interceptData, buffer, rc, prc ) {
72-
arrayAppend( variables.interceptionExecutions, {
73-
name = "onSendgridEventDeferred",
74-
payload = interceptData
75-
} );
68+
function onSendgridEventDeferred(
69+
event,
70+
interceptData,
71+
buffer,
72+
rc,
73+
prc
74+
) {
75+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventDeferred", payload: interceptData } );
7676
}
77-
function onSendgridEventDelivered( event, interceptData, buffer, rc, prc ) {
78-
arrayAppend( variables.interceptionExecutions, {
79-
name = "onSendgridEventDelivered",
80-
payload = interceptData
81-
} );
77+
function onSendgridEventDelivered(
78+
event,
79+
interceptData,
80+
buffer,
81+
rc,
82+
prc
83+
) {
84+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventDelivered", payload: interceptData } );
8285
}
83-
function onSendgridEventOpen( event, interceptData, buffer, rc, prc ) {
84-
arrayAppend( variables.interceptionExecutions, {
85-
name = "onSendgridEventOpen",
86-
payload = interceptData
87-
} );
86+
function onSendgridEventOpen(
87+
event,
88+
interceptData,
89+
buffer,
90+
rc,
91+
prc
92+
) {
93+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventOpen", payload: interceptData } );
8894
}
89-
function onSendgridEventClick( event, interceptData, buffer, rc, prc ) {
90-
arrayAppend( variables.interceptionExecutions, {
91-
name = "onSendgridEventClick",
92-
payload = interceptData
93-
} );
95+
function onSendgridEventClick(
96+
event,
97+
interceptData,
98+
buffer,
99+
rc,
100+
prc
101+
) {
102+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventClick", payload: interceptData } );
94103
}
95-
function onSendgridEventBounce( event, interceptData, buffer, rc, prc ) {
96-
arrayAppend( variables.interceptionExecutions, {
97-
name = "onSendgridEventBounce",
98-
payload = interceptData
99-
} );
104+
function onSendgridEventBounce(
105+
event,
106+
interceptData,
107+
buffer,
108+
rc,
109+
prc
110+
) {
111+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventBounce", payload: interceptData } );
100112
}
101-
function onSendgridEventDropped( event, interceptData, buffer, rc, prc ) {
102-
arrayAppend( variables.interceptionExecutions, {
103-
name = "onSendgridEventDropped",
104-
payload = interceptData
105-
} );
113+
function onSendgridEventDropped(
114+
event,
115+
interceptData,
116+
buffer,
117+
rc,
118+
prc
119+
) {
120+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventDropped", payload: interceptData } );
106121
}
107-
function onSendgridEventSpamreport( event, interceptData, buffer, rc, prc ) {
108-
arrayAppend( variables.interceptionExecutions, {
109-
name = "onSendgridEventSpamreport",
110-
payload = interceptData
111-
} );
122+
function onSendgridEventSpamreport(
123+
event,
124+
interceptData,
125+
buffer,
126+
rc,
127+
prc
128+
) {
129+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventSpamreport", payload: interceptData } );
112130
}
113-
function onSendgridEventUnsubscribe( event, interceptData, buffer, rc, prc ) {
114-
arrayAppend( variables.interceptionExecutions, {
115-
name = "onSendgridEventUnsubscribe",
116-
payload = interceptData
117-
} );
131+
function onSendgridEventUnsubscribe(
132+
event,
133+
interceptData,
134+
buffer,
135+
rc,
136+
prc
137+
) {
138+
arrayAppend( variables.interceptionExecutions, { name: "onSendgridEventUnsubscribe", payload: interceptData } );
118139
}
119-
function onSendgridEventGroupUnsubscribe( event, interceptData, buffer, rc, prc ) {
120-
arrayAppend( variables.interceptionExecutions, {
121-
name = "onSendgridEventGroupUnsubscribe",
122-
payload = interceptData
123-
} );
140+
function onSendgridEventGroupUnsubscribe(
141+
event,
142+
interceptData,
143+
buffer,
144+
rc,
145+
prc
146+
) {
147+
arrayAppend(
148+
variables.interceptionExecutions,
149+
{ name: "onSendgridEventGroupUnsubscribe", payload: interceptData }
150+
);
124151
}
125-
function onSendgridEventGroupResubscribe( event, interceptData, buffer, rc, prc ) {
126-
arrayAppend( variables.interceptionExecutions, {
127-
name = "onSendgridEventGroupResubscribe",
128-
payload = interceptData
129-
} );
152+
function onSendgridEventGroupResubscribe(
153+
event,
154+
interceptData,
155+
buffer,
156+
rc,
157+
prc
158+
) {
159+
arrayAppend(
160+
variables.interceptionExecutions,
161+
{ name: "onSendgridEventGroupResubscribe", payload: interceptData }
162+
);
130163
}
131164

132165
}

0 commit comments

Comments
 (0)