Skip to content

Commit db8bcb0

Browse files
authored
Merge pull request #1200 from Adyen/1199-revert-changes-to-contains-value-T-check-in-webhook-handler
Revert changes to WebhookHandler to introduce the null-check
2 parents e3bae0d + f147ce5 commit db8bcb0

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

Adyen/Webhooks/BalancePlatformWebhookHandler.cs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,21 @@ private static bool ContainsValue<T>(string jsonPayload) where T : struct, IConv
236236
// Retrieve type from payload
237237
JToken typeToken = JObject.Parse(jsonPayload).GetValue("type");
238238
string type = typeToken?.Value<string>();
239-
List<MemberInfo> memberInfos = typeof(T).GetTypeInfo().DeclaredMembers.ToList();
240-
return memberInfos.Any(memberInfo => memberInfo?.GetCustomAttribute<EnumMemberAttribute>()?.Value == type);
239+
240+
// Search for type in <T>.TypeEnum
241+
List<string> list = new List<string>();
242+
var members = typeof(T)
243+
.GetTypeInfo()
244+
.DeclaredMembers;
245+
246+
foreach (var member in members)
247+
{
248+
var val = member?.GetCustomAttribute<EnumMemberAttribute>(false)?.Value;
249+
if (!string.IsNullOrEmpty(val))
250+
list.Add(val);
251+
}
252+
253+
return list.Contains(type);
241254
}
242255
}
243-
}
256+
}

0 commit comments

Comments
 (0)