mirror of
https://github.com/bitwarden/server
synced 2025-12-13 14:53:34 +00:00
Add template properties for Datadog (#6528)
* Add template properites for Datadog * Add test and implementation for including User and ActingUser when only the Type is referenced * Refactored database calls to fetch the user details in a single DB call * Refactor to use a dedicated stored procedure for Dapper * Remove TOP 1 from stored procedure * Accept Claude's optimization of SingleOrDefaultAsync to unify Dapper/EF Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * Revert earlier change and add TOP 1 back into stored procedure * Change go to GO * Revert back to version that assumes uniqueness, remove TOP 1 --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
This commit is contained in:
@@ -26,7 +26,7 @@ public static partial class IntegrationTemplateProcessor
|
||||
return match.Value; // Return unknown keys as keys - i.e. #Key#
|
||||
}
|
||||
|
||||
return property?.GetValue(values)?.ToString() ?? "";
|
||||
return property.GetValue(values)?.ToString() ?? string.Empty;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -38,7 +38,8 @@ public static partial class IntegrationTemplateProcessor
|
||||
}
|
||||
|
||||
return template.Contains("#UserName#", StringComparison.Ordinal)
|
||||
|| template.Contains("#UserEmail#", StringComparison.Ordinal);
|
||||
|| template.Contains("#UserEmail#", StringComparison.Ordinal)
|
||||
|| template.Contains("#UserType#", StringComparison.Ordinal);
|
||||
}
|
||||
|
||||
public static bool TemplateRequiresActingUser(string template)
|
||||
@@ -49,7 +50,18 @@ public static partial class IntegrationTemplateProcessor
|
||||
}
|
||||
|
||||
return template.Contains("#ActingUserName#", StringComparison.Ordinal)
|
||||
|| template.Contains("#ActingUserEmail#", StringComparison.Ordinal);
|
||||
|| template.Contains("#ActingUserEmail#", StringComparison.Ordinal)
|
||||
|| template.Contains("#ActingUserType#", StringComparison.Ordinal);
|
||||
}
|
||||
|
||||
public static bool TemplateRequiresGroup(string template)
|
||||
{
|
||||
if (string.IsNullOrEmpty(template))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return template.Contains("#GroupName#", StringComparison.Ordinal);
|
||||
}
|
||||
|
||||
public static bool TemplateRequiresOrganization(string template)
|
||||
|
||||
Reference in New Issue
Block a user